Qt6: Update to 6.7.0

Qt 6.7 is out with lots of large and small improvements for all of us
who like to have fun when building modern applications and user
experiences, focusing on the expansion of supported platforms and
industry standards. This makes code written with Qt more sustainable
and brings more value in Qt as a long-term investment.

www/qt6-webengine is now based on Chromium version 118.0.5993.220.

Announcement: https://www.qt.io/blog/qt-6.7-released
Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md

PySide6: Update to 6.7.0

PySide6 and its related components have been updated alongside the Qt
release for compatibility. Older versions will not build with Qt 6.7.x.

Announcement: https://www.qt.io/blog/qt-for-python-release-6.7

PyQt6: Update to 6.7.0

Minor Makefile cleanups and simplification of MASTER_SITES in pyqt.mk.
As with PySide6, older versions of PyQt6 will not build with Qt 6.7.x.

Announcement: https://www.riverbankcomputing.com/news/PyQt_v6.7.0_Released

PR:		278658
Exp-run by:	antoine
MFH:		2024Q2
Security:	e79cc4e2-12d7-11ef-83d8-4ccc6adda413,
		c6f03ea6-12de-11ef-83d8-4ccc6adda413
This commit is contained in:
Jason E. Hale 2024-04-30 02:06:40 -04:00
parent e40c4fb1d0
commit bef8e408ff
823 changed files with 16195 additions and 3792 deletions

View file

@ -50,28 +50,35 @@ _PYQT_VERSION= 0
PYQT_MAINTAINER= kde@FreeBSD.org
MASTER_SITE_RIVERBANK= https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
MASTER_SITE_RBDEV= https://www.riverbankcomputing.com/pypi/packages/%SUBDIR%/
MASTER_SITES_SIP= https://pypi.python.org/packages/source/s/sip/
MASTER_SITES_PYQT5= https://pypi.python.org/packages/source/P/PyQt5/
MASTER_SITES_PYQT6= https://pypi.python.org/packages/source/P/PyQt6/
MASTER_SITES_SIP= PYPI/source/s/sip
MASTER_SITES_PYQT5= PYPI/source/P/PyQt5
MASTER_SITES_PYQT6= PYPI/source/P/PyQt6 \
RBDEV/PyQt6
MASTER_SITES_PYQT= ${MASTER_SITES_PYQT${_PYQT_VERSION}}
MASTER_SITES_PYQT5SIP= https://pypi.python.org/packages/source/P/PyQt5-sip/
MASTER_SITES_PYQT6SIP= https://pypi.python.org/packages/source/P/PyQt6-sip/
MASTER_SITES_PYQT5SIP= PYPI/source/P/PyQt5-sip
MASTER_SITES_PYQT6SIP= PYPI/source/P/PyQt6-sip
MASTER_SITES_PYQTSIP= ${MASTER_SITES_PYQT${_PYQT_VERSION}SIP}
MASTER_SITES_PYQT63D= https://pypi.python.org/packages/source/P/PyQt6-3D/
MASTER_SITES_PYQT63D= PYPI/source/P/PyQt6-3D \
RBDEV/PyQt6-3D
MASTER_SITES_PYQT3D= ${MASTER_SITES_PYQT${_PYQT_VERSION}3D}
MASTER_SITES_PYQT5CHART= https://pypi.python.org/packages/source/P/PyQtChart/
MASTER_SITES_PYQT6CHART= https://pypi.python.org/packages/source/P/PyQt6-Charts/
MASTER_SITES_PYQT5CHART= PYPI/source/P/PyQtChart
MASTER_SITES_PYQT6CHART= PYPI/source/P/PyQt6-Charts \
RBDEV/PyQt6-Charts
MASTER_SITES_PYQTCHART= ${MASTER_SITES_PYQT${_PYQT_VERSION}CHART}
MASTER_SITES_PYQT6DATAVIS3D= https://pypi.python.org/packages/source/P/PyQt6-DataVisualization/
MASTER_SITES_PYQT6DATAVIS3D= PYPI/source/P/PyQt6-DataVisualization \
RBDEV/PyQt6-DataVisualization
MASTER_SITES_PYQTDATAVIS3D= ${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D}
MASTER_SITES_PYQT5NETWORKAUTH= https://pypi.python.org/packages/source/P/PyQtNetworkAuth/
MASTER_SITES_PYQT6NETWORKAUTH= https://pypi.python.org/packages/source/P/PyQt6-NetworkAuth/
MASTER_SITES_PYQTNETWORKAUTH= ${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
MASTER_SITES_PYQTBUILDER= https://pypi.io/packages/source/P/PyQt-builder/
MASTER_SITES_PYQT5WEBENGINE= https://pypi.python.org/packages/source/P/PyQtWebEngine/
MASTER_SITES_PYQT6WEBENGINE= https://pypi.python.org/packages/source/P/PyQt6-WebEngine/
MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
MASTER_SITES_PYQT5NETWORKAUTH= PYPI/source/P/PyQtNetworkAuth
MASTER_SITES_PYQT6NETWORKAUTH= PYPI/source/P/PyQt6-NetworkAuth \
RBDEV/PyQt6-NetworkAuth
MASTER_SITES_PYQTNETWORKAUTH= ${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
MASTER_SITES_PYQTBUILDER= PYPI/source/P/PyQt-builder
MASTER_SITES_PYQT5WEBENGINE= PYPI/source/P/PyQtWebEngine
MASTER_SITES_PYQT6WEBENGINE= PYPI/source/P/PyQt6-WebEngine \
RBDEV/PyQt6-WebEngine
MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
#https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz
MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \
SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
@ -89,17 +96,19 @@ SIP_VERSION= 6.8.3 # ,1
SIP4_VERSION= 4.19.25
QSCI2_VERSION= 2.14.1
PYQT5_VERSION= 5.15.10
PYQT6_VERSION= 6.6.1
PYQT63D_VERSION= 6.6.0
PYQT6_VERSION= 6.7.0
PYQT63D_VERSION= 6.7.0
PYQT5CHART_VERSION= 5.15.6
PYQT6CHART_VERSION= 6.6.0
PYQT6DATAVIS3D_VERSION= 6.6.0
PYQT6CHART_VERSION= 6.7.0
PYQT6DATAVIS3D_VERSION= 6.7.0
PYQT5NETWORKAUTH_VERSION=5.15.5
PYQT6NETWORKAUTH_VERSION=6.6.0
PYQT6NETWORKAUTH_VERSION=6.7.0
PYQT5WEBENGINE_VERSION= 5.15.6
PYQT6WEBENGINE_VERSION= 6.6.0
PYQT6WEBENGINE_VERSION= 6.7.0
PYQT5SIP_VERSION= 12.13.0
PYQT6SIP_VERSION= 13.6.0
# PyQt-builder >= 1.16.0 requires setuptools >= 64
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358
PYQTBUILDER_VERSION= 1.15.4
SIP4_DISTNAME= sip-${SIP4_VERSION}
@ -160,10 +169,9 @@ py-webengine_PATH= ${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION}
# PORT
py-sip_PORT= devel/py-sip
py-qtbuilder_PORT= devel/py-qtbuilder
py-pysip_PORT= devel/${PYQT_RELNAME}-sip
py-qscintilla2_PORT= devel/${PYQT_RELNAME}-qscintilla2
py-positioning_PORT= devel/${PYQT_RELNAME}-positioning
py-qtbuilder_PORT= devel/py-qtbuilder
py-pyqt5_PORT= devel/${PYQT_RELNAME}-pyqt
py-pyqt6_PORT= devel/${PYQT_RELNAME}-pyqt
py-3d_PORT= graphics/${PYQT_RELNAME}-3d

View file

@ -83,8 +83,8 @@ _QT5_MASTER_SITES= ${MASTER_SITE_QT}
_QT5_MASTER_SITE_SUBDIR= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
# Qt6 specific master sites
_QT6_MASTER_SITES= ${MASTER_SITE_QT}
_QT6_MASTER_SITE_SUBDIR= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules \
official_releases/additional_libraries/${_QT_VERSION:R}/${_QT_VERSION}/
_QT6_MASTER_SITE_SUBDIR= ${_QT6_RELEASE_TYPE}_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules
# Qt5 specific distnames
. if ${_QT_DIST} == webengine
_QT5_DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-opensource-src-${DISTVERSION},}

View file

@ -23,8 +23,17 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5 6
QT5_VERSION?= 5.15.13
QT6_VERSION?= 6.6.3
PYSIDE6_VERSION?= 6.6.2
QT6_VERSION?= 6.7.0
PYSIDE6_VERSION?= 6.7.0
# Support for intermediate Qt6 releases. This partially defines
# _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
# but misc/qt6-examples needs this too.
. if ${QT6_VERSION:M*beta*} || ${QT6_VERSION:M*rc*}
_QT6_RELEASE_TYPE= development
. else
_QT6_RELEASE_TYPE= official
. endif
# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711660905
SHA256 (KDE/Qt/6.6.3/qtspeech-everywhere-src-6.6.3.tar.xz) = e628f746efb17155f89c72a34f62b0c69c21b8d8d14c7ff493933fb87ec903fa
SIZE (KDE/Qt/6.6.3/qtspeech-everywhere-src-6.6.3.tar.xz) = 261976
TIMESTAMP = 1712112642
SHA256 (KDE/Qt/6.7.0/qtspeech-everywhere-src-6.7.0.tar.xz) = 44768eba837d48c2233ef12aab562acf2d3c531b489f4ec70124e2bb313d1f11
SIZE (KDE/Qt/6.7.0/qtspeech-everywhere-src-6.7.0.tar.xz) = 261732

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711660910
SHA256 (KDE/Qt/6.6.3/qtconnectivity-everywhere-src-6.6.3.tar.xz) = 091aba91a0ab4081bad880b1adfd97d38b7a6ba87ba1cce3e63e20651a71d518
SIZE (KDE/Qt/6.6.3/qtconnectivity-everywhere-src-6.6.3.tar.xz) = 1060952
TIMESTAMP = 1712112647
SHA256 (KDE/Qt/6.7.0/qtconnectivity-everywhere-src-6.7.0.tar.xz) = 07afd6aac19ff73c8ba1471057f43d4ef2737d6a8a772393ec907988dd71244c
SIZE (KDE/Qt/6.7.0/qtconnectivity-everywhere-src-6.7.0.tar.xz) = 1060904

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711660915
SHA256 (KDE/Qt/6.6.3/qtsensors-everywhere-src-6.6.3.tar.xz) = b235af8042250a4212a6df400c4b7899fc2905897126bc9388f2a6122a1d3765
SIZE (KDE/Qt/6.6.3/qtsensors-everywhere-src-6.6.3.tar.xz) = 1494016
TIMESTAMP = 1712112654
SHA256 (KDE/Qt/6.7.0/qtsensors-everywhere-src-6.7.0.tar.xz) = 1c3015200a30a64f760818e40794df719e068fc25179e96e88993dff38f7bcab
SIZE (KDE/Qt/6.7.0/qtsensors-everywhere-src-6.7.0.tar.xz) = 1494212

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711660918
SHA256 (KDE/Qt/6.6.3/qtserialbus-everywhere-src-6.6.3.tar.xz) = 143e5afcb81a2e2a92d5c0f16679295349d0b8e1ee398230a391ca5be00ad0fb
SIZE (KDE/Qt/6.6.3/qtserialbus-everywhere-src-6.6.3.tar.xz) = 545820
TIMESTAMP = 1712112659
SHA256 (KDE/Qt/6.7.0/qtserialbus-everywhere-src-6.7.0.tar.xz) = 498193a9860664f8a55f676656c45af179ac13d48184af43fc58ddf795bb76dd
SIZE (KDE/Qt/6.7.0/qtserialbus-everywhere-src-6.7.0.tar.xz) = 546788

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711660920
SHA256 (KDE/Qt/6.6.3/qtserialport-everywhere-src-6.6.3.tar.xz) = e1656579e555da61cb81cbbb5ee6d31835cea110b3a5dd9e14b16fa71e55dc37
SIZE (KDE/Qt/6.6.3/qtserialport-everywhere-src-6.6.3.tar.xz) = 270704
TIMESTAMP = 1712112663
SHA256 (KDE/Qt/6.7.0/qtserialport-everywhere-src-6.7.0.tar.xz) = b1f02a3d8c9cc8ba2ffa7cca3749f1f147d327e8dfc633fd4ec3cb770d7981c9
SIZE (KDE/Qt/6.7.0/qtserialport-everywhere-src-6.7.0.tar.xz) = 270604

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711660995
SHA256 (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
SIZE (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 48784716
TIMESTAMP = 1712112752
SHA256 (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254
SIZE (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 49314276

View file

@ -1,12 +1,12 @@
PORTNAME= pyqt
PORTVERSION= ${PYQT_VERSION}
DISTVERSION= ${PYQT_VERSION}
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT}
PKGNAMEPREFIX= ${PYQT_PY_RELNAME}-
DISTNAME= ${PYQT_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt6 toolkit, QtCore module
COMMENT= Python bindings for the Qt6 toolkit
WWW= https://riverbankcomputing.com/software/pyqt
PYQT_DIST= yes
@ -17,8 +17,7 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
USES= gl pkgconfig python pyqt:6 qt:6
USE_GL+= gl opengl
USE_LOCALE= C.UTF-8
USE_GL= opengl
USE_PYTHON= concurrent flavors
USE_PYQT= pysip qtbuilder sip
USE_QT= base connectivity declarative imageformats multimedia \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1701802289
SHA256 (PyQt6-6.6.1.tar.gz) = 9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379
SIZE (PyQt6-6.6.1.tar.gz) = 1043203
TIMESTAMP = 1714270793
SHA256 (PyQt6-6.7.0.tar.gz) = 3d31b2c59dc378ee26e16586d9469842483588142fc377280aad22aaf2fa6235
SIZE (PyQt6-6.7.0.tar.gz) = 1050408

View file

@ -1,2 +1,8 @@
PyQt6 is a set of Python bindings for Qt6 application framework.
This package provides the QtCore module.
PyQt6 is a comprehensive set of Python bindings for Qt6. It is
implemented as more than 35 extension modules and enables Python
to be used as an alternative application development language to
C++ on all supported platforms.
PyQt6 may also be embedded in C++ based applications to allow users
of those applications to configure or enhance the functionality of
those applications.

View file

@ -154,6 +154,7 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qlist.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qmap.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qset.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_optional.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_pair.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_virtual_error_handler.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qrandom.sip
@ -195,6 +196,7 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtranslator.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtransposeproxymodel.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtversion.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtyperevision.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtypes.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qurl.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qurlquery.sip
@ -205,6 +207,7 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qwaitcondition.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qwineventnotifier.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qxmlstream.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qyieldcpu.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/QtDBus.toml
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/QtDBusmod.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/qdbusabstractadaptor.sip
@ -378,6 +381,7 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qpymultimedia_qlist.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qscreencapture.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qsoundeffect.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qtvideo.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframe.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframeformat.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideosink.sip
@ -397,6 +401,7 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhstspolicy.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttp1configuration.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttp2configuration.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttpheaders.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttpmultipart.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qlocalserver.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qlocalsocket.sip
@ -563,6 +568,7 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgrendernode.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgsimplerectnode.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgsimpletexturenode.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtextnode.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexture.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexture_platform.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexturematerial.sip
@ -634,6 +640,7 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/QtSvgmod.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qsvggenerator.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qsvgrenderer.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qtsvgglobal.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/QtSvgWidgets.toml
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/QtSvgWidgetsmod.sip
%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/qgraphicssvgitem.sip
@ -878,6 +885,8 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qscintilla%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtcharts%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtcharts%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtopenglwidgets%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtopenglwidgets%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtprintsupport%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtprintsupport%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtquickwidgets%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@ -887,6 +896,7 @@ bin/pyuic6
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qaxcontainer.py
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qscintilla.py
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtcharts.py
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtopenglwidgets.py
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtprintsupport.py
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtquickwidgets.py
%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtwebenginewidgets.py

View file

@ -18,15 +18,15 @@ LIB_DEPENDS= libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR}
libxkbcommon.so:x11/libxkbcommon \
libzstd.so:archivers/zstd
USES= cmake gl llvm:lib python qt:6 shebangfix tar:xz
USE_GL= gl
USES= cmake gl llvm:lib,noexport python qt:6 shebangfix tar:xz
USE_GL= opengl
USE_PYTHON= flavors
USE_QT= base declarative languageserver tools
SHEBANG_FILES= pyside_tool.py qtpy2cpp_lib/tests/baseline/basic_test.py
PLIST_SUB= PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL}
WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside-tools
WRKSRC_SUBDIR= sources/pyside-tools
PYSIDE_RELNAME= ${PORTNAME}
PYSIDE_BINDIR_REL?= bin/${PYSIDE_RELNAME}
@ -41,6 +41,7 @@ post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}
@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME} ${STAGEDIR}${PREFIX}/bin
# These directories contain templates that should not be byte-compiled.
# Temporarily relocate them to avoid errors.
@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android/recipes ${WRKDIR}
.for d in deploy_lib project qtpy2cpp_lib
@ -52,6 +53,8 @@ post-install:
${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/${d}
.endfor
# Move the aforementioned templates back into STAGEDIR after the byte-compiling
# operation has finished.
@${MV} ${WRKDIR}/recipes ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1708228813
SHA256 (pyside-setup-everywhere-src-6.6.2.tar.xz) = 14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0
SIZE (pyside-setup-everywhere-src-6.6.2.tar.xz) = 13975896
TIMESTAMP = 1714321552
SHA256 (pyside-setup-everywhere-src-6.7.0.tar.xz) = 82eae370737df5ecf539c165d09d7c81d5fc6153a541b8d3d37b11275f9e3e8f
SIZE (pyside-setup-everywhere-src-6.7.0.tar.xz) = 14382456

View file

@ -8,6 +8,8 @@
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/commands%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/dependency_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/dependency_util%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.pyc
%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@ -31,6 +33,7 @@
%%PYSIDE_BINDIR_REL%%/deploy_lib/commands.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/config.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/default.spec
%%PYSIDE_BINDIR_REL%%/deploy_lib/dependency_util.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/deploy_util.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/nuitka_helper.py
%%PYSIDE_BINDIR_REL%%/deploy_lib/pyside_icon.icns

View file

@ -5,28 +5,33 @@ MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyside-setup-everywhere-src-${DISTVERSION}
PATCH_SITES= https://github.com/qtproject/pyside-pyside-setup/commit/
PATCHFILES+= 3b2ad15ec75b082699dbde6c695c19b467eb0008.patch:-p1 # Adapt to revert of QAudio->QtAudio namespace renaming
MAINTAINER= kde@FreeBSD.org
COMMENT= Python Qt bindings for Qt 6
WWW= https://wiki.qt.io/Qt_for_Python
LICENSE= LGPL3
BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
LIB_DEPENDS= libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR} \
libxkbcommon.so:x11/libxkbcommon
USES= cmake gl llvm:lib python qt:6 tar:xz
USE_GL= gl
USES= cmake gl llvm:lib,noexport python qt:6 tar:xz
USE_GL= opengl
USE_LDCONFIG= yes
USE_PYTHON= flavors
USE_QT= 3d base charts connectivity datavis3d declarative doc graphs \
httpserver imageformats location multimedia networkauth pdf \
positioning quick3d quicktimeline remoteobjects scxml sensors \
serialbus serialport shadertools speech svg tools translations \
wayland webchannel websockets
webchannel websockets
CMAKE_ARGS= -DPYTHON_EXECUTABLE=${PYTHON_CMD}
CONFIGURE_ENV= LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm"
WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside6
PATCH_WRKSRC= ${WRKSRC:H:H}
WRKSRC_SUBDIR= sources/pyside6
PLIST_SUB= DISTVERSION=${DISTVERSION}
.include <bsd.port.pre.mk>

View file

@ -1,3 +1,5 @@
TIMESTAMP = 1708228795
SHA256 (pyside-setup-everywhere-src-6.6.2.tar.xz) = 14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0
SIZE (pyside-setup-everywhere-src-6.6.2.tar.xz) = 13975896
TIMESTAMP = 1714344956
SHA256 (pyside-setup-everywhere-src-6.7.0.tar.xz) = 82eae370737df5ecf539c165d09d7c81d5fc6153a541b8d3d37b11275f9e3e8f
SIZE (pyside-setup-everywhere-src-6.7.0.tar.xz) = 14382456
SHA256 (3b2ad15ec75b082699dbde6c695c19b467eb0008.patch) = 9fe5ce2d8e8fa1d90069dc9c9ccf86ef40e2fbf393c348822eea9afe697b2ec6
SIZE (3b2ad15ec75b082699dbde6c695c19b467eb0008.patch) = 10764

View file

@ -1,5 +1,5 @@
--- cmake/Macros/PySideModules.cmake.orig 2023-11-27 12:04:49 UTC
+++ cmake/Macros/PySideModules.cmake
--- sources/pyside6/cmake/Macros/PySideModules.cmake.orig 2023-11-27 12:04:49 UTC
+++ sources/pyside6/cmake/Macros/PySideModules.cmake
@@ -107,7 +107,7 @@ macro(create_pyside_module)
get_target_property(qt_core_includes Qt${QT_MAJOR_VERSION}::Core
INTERFACE_INCLUDE_DIRECTORIES)

View file

@ -8,6 +8,7 @@ include/PySide6/QtBluetooth/pyside6_qtbluetooth_python.h
include/PySide6/QtCharts/pyside6_qtcharts_python.h
include/PySide6/QtConcurrent/pyside6_qtconcurrent_python.h
include/PySide6/QtCore/pyside6_qtcore_python.h
include/PySide6/QtCore/qiopipe.h
include/PySide6/QtCore/qtcorehelper.h
include/PySide6/QtDBus/pyside6_qtdbus_python.h
include/PySide6/QtDBus/qtdbushelper.h
@ -38,6 +39,7 @@ include/PySide6/QtQml/pyside6_qtqml_python.h
include/PySide6/QtQuick/pyside6_qtquick_python.h
include/PySide6/QtQuick3D/pyside6_qtquick3d_python.h
include/PySide6/QtQuickControls2/pyside6_qtquickcontrols2_python.h
include/PySide6/QtQuickTest/pyside6_qtquicktest_python.h
include/PySide6/QtQuickWidgets/pyside6_qtquickwidgets_python.h
include/PySide6/QtRemoteObjects/pyside6_qtremoteobjects_python.h
include/PySide6/QtScxml/pyside6_qtscxml_python.h
@ -117,10 +119,10 @@ lib/cmake/PySide6Qml/PySide6QmlConfigVersion.cmake
lib/cmake/PySide6Qml/PySide6QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/PySide6Qml/PySide6QmlTargets.cmake
lib/libpyside6.abi3.so
lib/libpyside6.abi3.so.6.6
lib/libpyside6.abi3.so.6.7
lib/libpyside6.abi3.so.%%DISTVERSION%%
lib/libpyside6qml.abi3.so
lib/libpyside6qml.abi3.so.6.6
lib/libpyside6qml.abi3.so.6.7
lib/libpyside6qml.abi3.so.%%DISTVERSION%%
%%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.abi3.so
%%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.pyi
@ -201,6 +203,8 @@ lib/libpyside6qml.abi3.so.%%DISTVERSION%%
%%PYTHON_SITELIBDIR%%/PySide6/QtQuick3D.pyi
%%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.abi3.so
%%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.pyi
%%PYTHON_SITELIBDIR%%/PySide6/QtQuickTest.abi3.so
%%PYTHON_SITELIBDIR%%/PySide6/QtQuickTest.pyi
%%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.abi3.so
%%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.pyi
%%PYTHON_SITELIBDIR%%/PySide6/QtRemoteObjects.abi3.so
@ -273,9 +277,11 @@ share/PySide6/glue/qtmultimedia.cpp
share/PySide6/glue/qtnetwork.cpp
share/PySide6/glue/qtnetworkauth.cpp
share/PySide6/glue/qtopengl.cpp
share/PySide6/glue/qtpositioning.cpp
share/PySide6/glue/qtprintsupport.cpp
share/PySide6/glue/qtqml.cpp
share/PySide6/glue/qtquick.cpp
share/PySide6/glue/qtquicktest.cpp
share/PySide6/glue/qtserialbus.cpp
share/PySide6/glue/qtsql.cpp
share/PySide6/glue/qtstatemachine.cpp
@ -360,6 +366,7 @@ share/PySide6/typesystems/typesystem_qml.xml
share/PySide6/typesystems/typesystem_quick.xml
share/PySide6/typesystems/typesystem_quick3d.xml
share/PySide6/typesystems/typesystem_quickcontrols2.xml
share/PySide6/typesystems/typesystem_quicktest.xml
share/PySide6/typesystems/typesystem_quickwidgets.xml
share/PySide6/typesystems/typesystem_remoteobjects.xml
share/PySide6/typesystems/typesystem_scxml.xml

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661020
SHA256 (KDE/Qt/6.6.3/qt5compat-everywhere-src-6.6.3.tar.xz) = 68c2cf4e5eabfea27626fe40d088cb0dbb2c0414d3961ef132b7e06c60ceec0b
SIZE (KDE/Qt/6.6.3/qt5compat-everywhere-src-6.6.3.tar.xz) = 14634848
TIMESTAMP = 1712112788
SHA256 (KDE/Qt/6.7.0/qt5compat-everywhere-src-6.7.0.tar.xz) = 9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5
SIZE (KDE/Qt/6.7.0/qt5compat-everywhere-src-6.7.0.tar.xz) = 14629204

View file

@ -3,6 +3,9 @@ DISTVERSION= ${QT6_VERSION}
CATEGORIES= devel
PKGNAMEPREFIX= qt6-
PATCH_SITES= https://github.com/qt/qtbase/commit/
PATCHFILES+= 7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch:-p1 # CVE-2024-33861
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt base (core, gui, widgets, network,...)
@ -55,7 +58,6 @@ CMAKE_OFF+= FEATURE_sql_mysql \
SHEBANG_FILES= ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \
${WRKSRC}/mkspecs/features/uikit/devices.py \
${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \
${WRKSRC}/util/android/android_emulator_launcher.sh \
${WRKSRC}/util/testrunner/qt-testrunner.py \
${WRKSRC}/util/testrunner/sanitizer-testrunner.py
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View file

@ -1,3 +1,5 @@
TIMESTAMP = 1711661021
SHA256 (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
SIZE (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 48784716
TIMESTAMP = 1715748396
SHA256 (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254
SIZE (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 49314276
SHA256 (KDE/Qt/6.7.0/7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch) = fa921cb0eb73ed23a0a5c6cfaf10da2116511b60f2e49c8c406eef516363d228
SIZE (KDE/Qt/6.7.0/7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch) = 6164

View file

@ -1,4 +1,4 @@
--- cmake/QtBuildPathsHelpers.cmake.orig 2024-02-08 16:01:05 UTC
--- cmake/QtBuildPathsHelpers.cmake.orig 2023-09-15 10:20:51 UTC
+++ cmake/QtBuildPathsHelpers.cmake
@@ -100,7 +100,7 @@ function(qt_internal_setup_build_and_install_paths)
if(QT_CONFIG_INSTALL_DIR)

View file

@ -1,6 +1,6 @@
--- cmake/QtFlagHandlingHelpers.cmake.orig 2023-11-15 13:58:42 UTC
--- cmake/QtFlagHandlingHelpers.cmake.orig 2023-09-15 10:20:51 UTC
+++ cmake/QtFlagHandlingHelpers.cmake
@@ -132,6 +132,10 @@ function(qt_internal_add_link_flags_no_undefined targe
@@ -167,6 +167,10 @@ function(qt_internal_add_link_flags_no_undefined targe
set(no_undefined_flag "-Wl,--no-undefined")
endif()

View file

@ -0,0 +1,37 @@
Also disable spurious zero as null pointer constant warnings for Clang which
are errors in www/dooble due to -Werror being passed.
--- src/corelib/global/qcompare.h.orig 2024-01-22 10:20:09 UTC
+++ src/corelib/global/qcompare.h
@@ -195,6 +195,7 @@ class partial_ordering (private)
QT_WARNING_PUSH
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903
+ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant")
QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
friend constexpr bool is_eq (partial_ordering o) noexcept { return o == 0; }
friend constexpr bool is_neq (partial_ordering o) noexcept { return o != 0; }
@@ -380,6 +381,7 @@ class weak_ordering (private)
QT_WARNING_PUSH
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903
+ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant")
QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
friend constexpr bool is_eq (weak_ordering o) noexcept { return o == 0; }
friend constexpr bool is_neq (weak_ordering o) noexcept { return o != 0; }
@@ -575,6 +577,7 @@ class strong_ordering (public)
QT_WARNING_PUSH
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903
+ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant")
QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
friend constexpr bool is_eq (strong_ordering o) noexcept { return o == 0; }
friend constexpr bool is_neq (strong_ordering o) noexcept { return o != 0; }
@@ -859,6 +862,7 @@ class QPartialOrdering (private)
QT_WARNING_PUSH
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903
+ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant")
QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
friend constexpr bool is_eq (QPartialOrdering o) noexcept { return o == 0; }
friend constexpr bool is_neq (QPartialOrdering o) noexcept { return o != 0; }

View file

@ -0,0 +1,49 @@
Suppress spurious zero as null pointer constant warnings which cause errors
in www/dooble due to -Werror being passed. This is the same problem as in
qcompare.h that upstream suppresses for GCC.
/usr/local/include/qt6/QtCore/qfloat16.h:209:5: error: zero as null pointer constant [-Werror,-Wzero-as-null-pointer-constant]
...
/usr/local/include/qt6/QtCore/qcomparehelpers.h:211:43: note: expanded from macro 'QT_DECLARE_ORDERING_HELPER_TEMPLATE'
211 | { return compareThreeWay(lhs, rhs) >= 0; }
--- src/corelib/global/qcomparehelpers.h.orig 2024-01-22 10:20:09 UTC
+++ src/corelib/global/qcomparehelpers.h
@@ -197,6 +197,8 @@ template <typename In> constexpr auto to_Qt(In in) noe
{ return !comparesEqual(rhs, lhs); }
#define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \
+ QT_WARNING_PUSH \
+ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \
friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) \
noexcept(noexcept(compareThreeWay(lhs, rhs))) \
{ return compareThreeWay(lhs, rhs) < 0; } \
@@ -208,7 +210,8 @@ template <typename In> constexpr auto to_Qt(In in) noe
{ return compareThreeWay(lhs, rhs) <= 0; } \
friend Constexpr bool operator>=(LeftType const &lhs, RightType const &rhs) \
noexcept(noexcept(compareThreeWay(lhs, rhs))) \
- { return compareThreeWay(lhs, rhs) >= 0; }
+ { return compareThreeWay(lhs, rhs) >= 0; } \
+ QT_WARNING_POP
#define QT_DECLARE_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \
QT_DECLARE_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr)
@@ -225,6 +228,8 @@ template <typename In> constexpr auto to_Qt(In in) noe
// Helpers for reversed ordering, using the existing compareThreeWay() function.
#define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \
+ QT_WARNING_PUSH \
+ QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \
friend Constexpr bool operator<(RightType const &lhs, LeftType const &rhs) \
noexcept(noexcept(compareThreeWay(rhs, lhs))) \
{ return compareThreeWay(rhs, lhs) > 0; } \
@@ -236,7 +241,8 @@ template <typename In> constexpr auto to_Qt(In in) noe
{ return compareThreeWay(rhs, lhs) >= 0; } \
friend Constexpr bool operator>=(RightType const &lhs, LeftType const &rhs) \
noexcept(noexcept(compareThreeWay(rhs, lhs))) \
- { return compareThreeWay(rhs, lhs) <= 0; }
+ { return compareThreeWay(rhs, lhs) <= 0; } \
+ QT_WARNING_POP
#define QT_DECLARE_REVERSED_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \
QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr)

View file

@ -0,0 +1,18 @@
Suppress warnings when -pedantic is passed and using std < c++20, which could
also be errors if -Werror is also passed as is the case with www/dooble.
error: use of the 'nodiscard' attribute is a C++20 extension
https://github.com/llvm/llvm-project/issues/32865
--- src/corelib/global/qcompilerdetection.h.orig 2024-01-22 10:20:09 UTC
+++ src/corelib/global/qcompilerdetection.h
@@ -964,7 +964,7 @@
# define Q_REQUIRED_RESULT [[nodiscard]]
#endif
-#if __has_cpp_attribute(nodiscard) >= 201907L /* used for both P1771 and P1301... */
+#if __has_cpp_attribute(nodiscard) >= 201907L && (!defined(Q_CC_CLANG) || __cplusplus >= 201907L) /* used for both P1771 and P1301... */
// [[nodiscard]] constructor (P1771)
# ifndef Q_NODISCARD_CTOR
# define Q_NODISCARD_CTOR [[nodiscard]]

View file

@ -0,0 +1,15 @@
Fix warning which causes error in www/dooble due to -Werror being set.
/usr/local/include/qt6/QtCore/qspan.h:278:5: error: '__cpp_lib_span' is not defined, evaluates to 0
--- src/corelib/tools/qspan.h.orig 2024-01-22 10:20:09 UTC
+++ src/corelib/tools/qspan.h
@@ -275,7 +275,7 @@ class QSpanBase<T, q20::dynamic_extent> : protected QS
: QSpanBase(other.data(), other.size())
{}
-#if __cpp_lib_span
+#ifdef __cpp_lib_span
template <typename S, size_t N, if_qualification_conversion<S> = true>
Q_IMPLICIT constexpr QSpanBase(std::span<S, N> other) noexcept
: QSpanBase(other.data(), other.size())

View file

@ -1,6 +1,6 @@
--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2023-09-21 19:24:26 UTC
--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2023-09-15 10:20:51 UTC
+++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
@@ -17,11 +17,7 @@
@@ -19,11 +19,7 @@
#include <mutex>

View file

@ -1,4 +1,4 @@
--- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2023-09-21 19:24:26 UTC
--- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2023-09-15 10:20:51 UTC
+++ src/plugins/tls/openssl/qsslcontext_openssl.cpp
@@ -49,9 +49,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, cons
}
@ -41,7 +41,7 @@
#if QT_CONFIG(dtls)
// DTLS cookies:
@@ -758,6 +760,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
@@ -760,6 +762,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
}
#endif // ocsp
@ -49,7 +49,7 @@
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {
q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
@@ -804,7 +807,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
@@ -806,7 +809,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
sslContext->errorCode = QSslError::UnspecifiedError;
}

View file

@ -1,4 +1,4 @@
--- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig 2023-09-13 16:02:48 UTC
--- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig 2023-09-15 10:20:51 UTC
+++ src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h
@@ -46,6 +46,13 @@ QT_BEGIN_NAMESPACE
@ -78,7 +78,7 @@
void q_SSL_free(SSL *a);
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
@@ -536,14 +568,26 @@ void q_PKCS12_free(PKCS12 *pkcs12);
@@ -537,14 +569,26 @@ void q_PKCS12_free(PKCS12 *pkcs12);
#define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
#define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
#define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
@ -105,7 +105,7 @@
#define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
#define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
@@ -645,7 +689,11 @@ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash
@@ -646,7 +690,11 @@ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash
int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
ASN1_INTEGER **pserial, OCSP_CERTID *cid);
@ -117,7 +117,7 @@
OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
void q_OCSP_CERTID_free(OCSP_CERTID *cid);
int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
@@ -664,8 +712,15 @@ void *q_CRYPTO_malloc(size_t num, const char *file, in
@@ -665,8 +713,15 @@ void *q_CRYPTO_malloc(size_t num, const char *file, in
void *q_CRYPTO_malloc(size_t num, const char *file, int line);
#define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0)
@ -133,7 +133,7 @@
int q_CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len);
void q_SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val));
@@ -729,7 +784,11 @@ int q_RSA_bits(RSA *a);
@@ -730,7 +785,11 @@ int q_RSA_bits(RSA *a);
int q_DH_bits(DH *dh);
int q_RSA_bits(RSA *a);

View file

@ -30,7 +30,6 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractitemmodel_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractproxymodel_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qatomicscopedvaluerollback_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
@ -42,6 +41,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreapplication_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcorecmdlineargs_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreevent_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatastream_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdataurl_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetime_p.h
@ -72,6 +72,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutex_freebsd_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutex_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutureinterface_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h
@ -144,6 +145,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsharedmemory_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_x86_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsingleshottimer_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qspan_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringalgorithms_p.h
@ -200,6 +202,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/QAtomicInt
%%QT_INCDIR%%/QtCore/QAtomicInteger
%%QT_INCDIR%%/QtCore/QAtomicPointer
%%QT_INCDIR%%/QtCore/QAtomicScopedValueRollback
%%QT_INCDIR%%/QtCore/QBEInteger
%%QT_INCDIR%%/QtCore/QBaseIterator
%%QT_INCDIR%%/QtCore/QBasicMutex
@ -252,7 +255,6 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/QDeadlineTimer
%%QT_INCDIR%%/QtCore/QDebug
%%QT_INCDIR%%/QtCore/QDebugStateSaver
%%QT_INCDIR%%/QtCore/QDeferredDeleteEvent
%%QT_INCDIR%%/QtCore/QDir
%%QT_INCDIR%%/QtCore/QDirIterator
%%QT_INCDIR%%/QtCore/QDynamicPropertyChangeEvent
@ -461,11 +463,13 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/QSocketDescriptor
%%QT_INCDIR%%/QtCore/QSocketNotifier
%%QT_INCDIR%%/QtCore/QSortFilterProxyModel
%%QT_INCDIR%%/QtCore/QSpan
%%QT_INCDIR%%/QtCore/QSpecialInteger
%%QT_INCDIR%%/QtCore/QStack
%%QT_INCDIR%%/QtCore/QStandardPaths
%%QT_INCDIR%%/QtCore/QStaticByteArrayMatcher
%%QT_INCDIR%%/QtCore/QStaticByteArrayMatcherBase
%%QT_INCDIR%%/QtCore/QStaticLatin1StringMatcher
%%QT_INCDIR%%/QtCore/QStaticPlugin
%%QT_INCDIR%%/QtCore/QStorageInfo
%%QT_INCDIR%%/QtCore/QString
@ -487,6 +491,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/QSystemSemaphore
%%QT_INCDIR%%/QtCore/QTaggedIterator
%%QT_INCDIR%%/QtCore/QTaggedPointer
%%QT_INCDIR%%/QtCore/QTemplatedMetaMethodReturnArgument
%%QT_INCDIR%%/QtCore/QTemporaryDir
%%QT_INCDIR%%/QtCore/QTemporaryFile
%%QT_INCDIR%%/QtCore/QTextBoundaryFinder
@ -589,8 +594,10 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/q20chrono.h
%%QT_INCDIR%%/QtCore/q20functional.h
%%QT_INCDIR%%/QtCore/q20iterator.h
%%QT_INCDIR%%/QtCore/q20map.h
%%QT_INCDIR%%/QtCore/q20memory.h
%%QT_INCDIR%%/QtCore/q20type_traits.h
%%QT_INCDIR%%/QtCore/q20vector.h
%%QT_INCDIR%%/QtCore/q23functional.h
%%QT_INCDIR%%/QtCore/q23utility.h
%%QT_INCDIR%%/QtCore/qabstractanimation.h
@ -609,6 +616,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/qassociativeiterable.h
%%QT_INCDIR%%/QtCore/qatomic.h
%%QT_INCDIR%%/QtCore/qatomic_cxx11.h
%%QT_INCDIR%%/QtCore/qatomicscopedvaluerollback.h
%%QT_INCDIR%%/QtCore/qbasicatomic.h
%%QT_INCDIR%%/QtCore/qbasictimer.h
%%QT_INCDIR%%/QtCore/qbindingstorage.h
@ -634,6 +642,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/qcommandlineparser.h
%%QT_INCDIR%%/QtCore/qcompare.h
%%QT_INCDIR%%/QtCore/qcompare_impl.h
%%QT_INCDIR%%/QtCore/qcomparehelpers.h
%%QT_INCDIR%%/QtCore/qcompilerdetection.h
%%QT_INCDIR%%/QtCore/qconcatenatetablesproxymodel.h
%%QT_INCDIR%%/QtCore/qconfig.h
@ -765,8 +774,10 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/qsize.h
%%QT_INCDIR%%/QtCore/qsocketnotifier.h
%%QT_INCDIR%%/QtCore/qsortfilterproxymodel.h
%%QT_INCDIR%%/QtCore/qspan.h
%%QT_INCDIR%%/QtCore/qstack.h
%%QT_INCDIR%%/QtCore/qstandardpaths.h
%%QT_INCDIR%%/QtCore/qstaticlatin1stringmatcher.h
%%QT_INCDIR%%/QtCore/qstorageinfo.h
%%QT_INCDIR%%/QtCore/qstring.h
%%QT_INCDIR%%/QtCore/qstringalgorithms.h
@ -813,6 +824,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/qtransposeproxymodel.h
%%QT_INCDIR%%/QtCore/qtresource.h
%%QT_INCDIR%%/QtCore/qtsan_impl.h
%%QT_INCDIR%%/QtCore/qtsymbolmacros.h
%%QT_INCDIR%%/QtCore/qttranslation.h
%%QT_INCDIR%%/QtCore/qttypetraits.h
%%QT_INCDIR%%/QtCore/qtversion.h
@ -838,6 +850,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/qxmlstream.h
%%QT_INCDIR%%/QtCore/qxpfunctional.h
%%QT_INCDIR%%/QtCore/qxptype_traits.h
%%QT_INCDIR%%/QtCore/qyieldcpu.h
%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/dbus_minimal_p.h
%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbus_symbols_p.h
%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractadaptor_p.h
@ -892,7 +905,6 @@ bin/qmake6
%%QT_INCDIR%%/QtDBus/qdbuserror.h
%%QT_INCDIR%%/QtDBus/qdbusextratypes.h
%%QT_INCDIR%%/QtDBus/qdbusinterface.h
%%QT_INCDIR%%/QtDBus/qdbusmacros.h
%%QT_INCDIR%%/QtDBus/qdbusmessage.h
%%QT_INCDIR%%/QtDBus/qdbusmetatype.h
%%QT_INCDIR%%/QtDBus/qdbuspendingcall.h
@ -1129,6 +1141,7 @@ bin/qmake6
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegration.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegrationfactory_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegrationplugin.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformkeymapper.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformmenu.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformmenu_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformnativeinterface.h
@ -1192,6 +1205,7 @@ bin/qmake6
%%QT_INCDIR%%/QtGui/QBrush
%%QT_INCDIR%%/QtGui/QBrushData
%%QT_INCDIR%%/QtGui/QBrushDataPointerDeleter
%%QT_INCDIR%%/QtGui/QChildWindowEvent
%%QT_INCDIR%%/QtGui/QClipboard
%%QT_INCDIR%%/QtGui/QCloseEvent
%%QT_INCDIR%%/QtGui/QColor
@ -1462,6 +1476,7 @@ bin/qmake6
%%QT_INCDIR%%/QtGui/qrgba64.h
%%QT_INCDIR%%/QtGui/qrgbafloat.h
%%QT_INCDIR%%/QtGui/qscreen.h
%%QT_INCDIR%%/QtGui/qscreen_platform.h
%%QT_INCDIR%%/QtGui/qsessionmanager.h
%%QT_INCDIR%%/QtGui/qshortcut.h
%%QT_INCDIR%%/QtGui/qstandarditemmodel.h
@ -1544,6 +1559,7 @@ bin/qmake6
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhostinfo_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhsts_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhstsstore_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2connection_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2protocolhandler_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpheaderparser_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpmultipart_p.h
@ -1581,8 +1597,11 @@ bin/qmake6
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyhttpimpl_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequestfactory_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocsp_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocspresponse_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qrestaccessmanager_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qrestreply_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocks5socketengine_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qssl_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificate_p.h
@ -1612,6 +1631,7 @@ bin/qmake6
%%QT_INCDIR%%/QtNetwork/QDnsTextRecord
%%DTLS%%%%QT_INCDIR%%/QtNetwork/QDtls
%%DTLS%%%%QT_INCDIR%%/QtNetwork/QDtlsClientVerifier
%%QT_INCDIR%%/QtNetwork/QHttpHeaders
%%QT_INCDIR%%/QtNetwork/QHostAddress
%%QT_INCDIR%%/QtNetwork/QHostInfo
%%QT_INCDIR%%/QtNetwork/QHstsPolicy
@ -1636,8 +1656,10 @@ bin/qmake6
%%QT_INCDIR%%/QtNetwork/QNetworkProxyQuery
%%QT_INCDIR%%/QtNetwork/QNetworkReply
%%QT_INCDIR%%/QtNetwork/QNetworkRequest
%%QT_INCDIR%%/QtNetwork/QNetworkRequestFactory
%%QT_INCDIR%%/QtNetwork/QOcspResponse
%%QT_INCDIR%%/QtNetwork/QPasswordDigestor
%%QT_INCDIR%%/QtNetwork/QRestReply
%%QT_INCDIR%%/QtNetwork/QSsl
%%QT_INCDIR%%/QtNetwork/QSslCertificate
%%QT_INCDIR%%/QtNetwork/QSslCertificateExtension
@ -1667,6 +1689,7 @@ bin/qmake6
%%QT_INCDIR%%/QtNetwork/qhstspolicy.h
%%QT_INCDIR%%/QtNetwork/qhttp1configuration.h
%%QT_INCDIR%%/QtNetwork/qhttp2configuration.h
%%QT_INCDIR%%/QtNetwork/qhttpheaders.h
%%QT_INCDIR%%/QtNetwork/qhttpmultipart.h
%%QT_INCDIR%%/QtNetwork/qlocalserver.h
%%QT_INCDIR%%/QtNetwork/qlocalsocket.h
@ -1680,8 +1703,11 @@ bin/qmake6
%%QT_INCDIR%%/QtNetwork/qnetworkproxy.h
%%QT_INCDIR%%/QtNetwork/qnetworkreply.h
%%QT_INCDIR%%/QtNetwork/qnetworkrequest.h
%%QT_INCDIR%%/QtNetwork/qnetworkrequestfactory.h
%%QT_INCDIR%%/QtNetwork/qocspresponse.h
%%QT_INCDIR%%/QtNetwork/qpassworddigestor.h
%%QT_INCDIR%%/QtNetwork/qrestaccessmanager.h
%%QT_INCDIR%%/QtNetwork/qrestreply.h
%%QT_INCDIR%%/QtNetwork/qssl.h
%%QT_INCDIR%%/QtNetwork/qsslcertificate.h
%%QT_INCDIR%%/QtNetwork/qsslcertificateextension.h
@ -1887,7 +1913,6 @@ bin/qmake6
%%QT_INCDIR%%/QtSql/QtSql
%%QT_INCDIR%%/QtSql/QtSqlDepends
%%QT_INCDIR%%/QtSql/QtSqlVersion
%%QT_INCDIR%%/QtSql/qsql.h
%%QT_INCDIR%%/QtSql/qsqldatabase.h
%%QT_INCDIR%%/QtSql/qsqldriver.h
%%QT_INCDIR%%/QtSql/qsqldriverplugin.h
@ -1913,6 +1938,7 @@ bin/qmake6
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkmetric_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkperfevents_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcomparisontesthelper_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qemulationdetector_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qjunittestlogger_p.h
@ -1959,7 +1985,6 @@ bin/qmake6
%%QT_INCDIR%%/QtTest/qbenchmarkmetric.h
%%QT_INCDIR%%/QtTest/qsignalspy.h
%%QT_INCDIR%%/QtTest/qtest.h
%%QT_INCDIR%%/QtTest/qtest_global.h
%%QT_INCDIR%%/QtTest/qtest_gui.h
%%QT_INCDIR%%/QtTest/qtest_network.h
%%QT_INCDIR%%/QtTest/qtest_widgets.h
@ -2052,6 +2077,7 @@ bin/qmake6
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qplaintextedit_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qproxystyle_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpushbutton_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qrhiwidget_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscrollarea_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscrollbar_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscroller_p.h
@ -2205,6 +2231,7 @@ bin/qmake6
%%QT_INCDIR%%/QtWidgets/QProxyStyle
%%QT_INCDIR%%/QtWidgets/QPushButton
%%QT_INCDIR%%/QtWidgets/QRadioButton
%%QT_INCDIR%%/QtWidgets/QRhiWidget
%%QT_INCDIR%%/QtWidgets/QRubberBand
%%QT_INCDIR%%/QtWidgets/QScrollArea
%%QT_INCDIR%%/QtWidgets/QScrollBar
@ -2369,6 +2396,7 @@ bin/qmake6
%%QT_INCDIR%%/QtWidgets/qproxystyle.h
%%QT_INCDIR%%/QtWidgets/qpushbutton.h
%%QT_INCDIR%%/QtWidgets/qradiobutton.h
%%QT_INCDIR%%/QtWidgets/qrhiwidget.h
%%QT_INCDIR%%/QtWidgets/qrubberband.h
%%QT_INCDIR%%/QtWidgets/qscrollarea.h
%%QT_INCDIR%%/QtWidgets/qscrollbar.h
@ -2478,6 +2506,7 @@ lib/cmake/Qt6/FindMySQL.cmake
lib/cmake/Qt6/FindOracle.cmake
lib/cmake/Qt6/FindPPS.cmake
lib/cmake/Qt6/FindPostgreSQL.cmake
lib/cmake/Qt6/FindRenderDoc.cmake
lib/cmake/Qt6/FindSlog2.cmake
lib/cmake/Qt6/FindTslib.cmake
lib/cmake/Qt6/FindWrapAtomic.cmake
@ -2667,6 +2696,7 @@ lib/cmake/Qt6Core/Qt6CoreConfigureFileTemplate.in
lib/cmake/Qt6Core/Qt6CoreDependencies.cmake
lib/cmake/Qt6Core/Qt6CoreDeploySupport.cmake
lib/cmake/Qt6Core/Qt6CoreMacros.cmake
lib/cmake/Qt6Core/Qt6CoreResourceInit.in.cpp
lib/cmake/Qt6Core/Qt6CoreTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Qt6Core/Qt6CoreTargets.cmake
lib/cmake/Qt6Core/Qt6CoreVersionlessTargets.cmake
@ -3074,8 +3104,8 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
%%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons_init.cpp.o
%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons_init.cpp.o
%%QT_MKSPECDIR%%/aix-g++-64/qmake.conf
%%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h
%%QT_MKSPECDIR%%/aix-g++/qmake.conf
@ -3132,6 +3162,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
%%QT_MKSPECDIR%%/common/uikit/clang.conf
%%QT_MKSPECDIR%%/common/uikit/qmake.conf
%%QT_MKSPECDIR%%/common/unix.conf
%%QT_MKSPECDIR%%/common/vxworks/qplatformdefs.h
%%QT_MKSPECDIR%%/common/wasm/qplatformdefs.h
%%QT_MKSPECDIR%%/common/wasm/wasm.conf
%%QT_MKSPECDIR%%/common/watchos.conf
@ -3527,6 +3558,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
%%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
%%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qmake.conf
%%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qplatformdefs.h
%%QT_MKSPECDIR%%/vxworks-clang/qplatformdefs.h
%%QT_MKSPECDIR%%/wasm-emscripten-64/qmake.conf
%%QT_MKSPECDIR%%/wasm-emscripten-64/qplatformdefs.h
%%QT_MKSPECDIR%%/wasm-emscripten/qmake.conf
@ -3582,7 +3614,6 @@ libdata/pkgconfig/Qt6Sql.pc
libdata/pkgconfig/Qt6Test.pc
libdata/pkgconfig/Qt6Widgets.pc
libdata/pkgconfig/Qt6Xml.pc
%%QT_TOOLDIR%%/android_emulator_launcher.sh
%%QT_TOOLDIR%%/cmake_automoc_parser
%%QT_TOOLDIR%%/ensure_pro_file.cmake
%%QT_TOOLDIR%%/moc
@ -3726,6 +3757,7 @@ libdata/pkgconfig/Qt6Xml.pc
%%QT_DOCDIR%%/global/template/style/online.css
%%QT_DOCDIR%%/global/template/style/tech_preview.svg
%%QT_DOCDIR%%/global/template/style/theqtcompany.png
%%QT_DOCDIR%%/global/warninglimit.qdocconf
%%QT_DATADIR%%/modules/Concurrent.json
%%QT_DATADIR%%/modules/Core.json
%%QT_DATADIR%%/modules/DBus.json

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661023
SHA256 (KDE/Qt/6.6.3/qtlanguageserver-everywhere-src-6.6.3.tar.xz) = 1021b4b9024bd23bef86292f4b6c15cc7db620b6c47be8cb6e539bfae7f6cf8c
SIZE (KDE/Qt/6.6.3/qtlanguageserver-everywhere-src-6.6.3.tar.xz) = 145420
TIMESTAMP = 1712112792
SHA256 (KDE/Qt/6.7.0/qtlanguageserver-everywhere-src-6.7.0.tar.xz) = a99ecb342abdf7b7ac24804c89830a7991de95f9402f45a1e337ae851f76c9fc
SIZE (KDE/Qt/6.7.0/qtlanguageserver-everywhere-src-6.7.0.tar.xz) = 145140

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661029
SHA256 (KDE/Qt/6.6.3/qtlocation-everywhere-src-6.6.3.tar.xz) = d7b42920f30a6a3fc4edffae541332fceaa6f5f7a4776c6809e0fd80fff801d1
SIZE (KDE/Qt/6.6.3/qtlocation-everywhere-src-6.6.3.tar.xz) = 3028756
TIMESTAMP = 1712112799
SHA256 (KDE/Qt/6.7.0/qtlocation-everywhere-src-6.7.0.tar.xz) = bb044d66bc17db98f526ec1b52d8e94810e046310f288561380774e5903ad46a
SIZE (KDE/Qt/6.7.0/qtlocation-everywhere-src-6.7.0.tar.xz) = 3165588

View file

@ -6,6 +6,7 @@
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetails_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeojsondata_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomap_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapcopyrightsnotice_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661032
SHA256 (KDE/Qt/6.6.3/qtpositioning-everywhere-src-6.6.3.tar.xz) = 9a37b6502aa00f6caf6701d3d0ed95f6de13a8d0934ec8348e6631ad9bfd3fbb
SIZE (KDE/Qt/6.6.3/qtpositioning-everywhere-src-6.6.3.tar.xz) = 1505028
TIMESTAMP = 1712112802
SHA256 (KDE/Qt/6.7.0/qtpositioning-everywhere-src-6.7.0.tar.xz) = 1d601ba43c26c8a01db81eeaaeea5943c015da98caa59d7905b86e0e9d609ddf
SIZE (KDE/Qt/6.7.0/qtpositioning-everywhere-src-6.7.0.tar.xz) = 658368

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661034
SHA256 (KDE/Qt/6.6.3/qtremoteobjects-everywhere-src-6.6.3.tar.xz) = 5f7e573f64aeb0b9edf4c19ea2064663430435bcf0e283c0fcf43b3fda276d99
SIZE (KDE/Qt/6.6.3/qtremoteobjects-everywhere-src-6.6.3.tar.xz) = 534172
TIMESTAMP = 1712112805
SHA256 (KDE/Qt/6.7.0/qtremoteobjects-everywhere-src-6.7.0.tar.xz) = a0ba60d625c9713fc8396b8db1e283df863bfaa06664d46496bd16fab5e4c695
SIZE (KDE/Qt/6.7.0/qtremoteobjects-everywhere-src-6.7.0.tar.xz) = 536264

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661037
SHA256 (KDE/Qt/6.6.3/qtscxml-everywhere-src-6.6.3.tar.xz) = 0f1b6a4db03d30b8770bc1c0eb11280acb41bfaf91b577928bb9686d31e16cb5
SIZE (KDE/Qt/6.6.3/qtscxml-everywhere-src-6.6.3.tar.xz) = 1167484
TIMESTAMP = 1712112809
SHA256 (KDE/Qt/6.7.0/qtscxml-everywhere-src-6.7.0.tar.xz) = 725b97bbb8766df733d7588488acd92375c218eeb376a95525572b4268a9257c
SIZE (KDE/Qt/6.7.0/qtscxml-everywhere-src-6.7.0.tar.xz) = 1167668

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661051
SHA256 (KDE/Qt/6.6.3/qttools-everywhere-src-6.6.3.tar.xz) = aa6d4c822d8cb74066ef30ab42283ac24e5cc702f33e6d78a9ebef5b0df91bc0
SIZE (KDE/Qt/6.6.3/qttools-everywhere-src-6.6.3.tar.xz) = 8596272
TIMESTAMP = 1712112826
SHA256 (KDE/Qt/6.7.0/qttools-everywhere-src-6.7.0.tar.xz) = c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b
SIZE (KDE/Qt/6.7.0/qttools-everywhere-src-6.7.0.tar.xz) = 9012572

View file

@ -229,23 +229,23 @@ bin/qtplugininfo6
%%QT_INCDIR%%/QtHelp/qthelpversion.h
%%QT_INCDIR%%/QtQDocCatch/QtQDocCatchDepends
%%QT_INCDIR%%/QtQDocCatch/catch/catch.hpp
%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/QtQDocCatchConversionsPrivateDepends
%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/qdoc_catch_conversions.h
%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/qt_catch_conversions.h
%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/std_catch_conversions.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/QtQDocCatchGeneratorsPrivateDepends
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/cycle_generator.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/oneof_generator.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/k_partition_of_r_generator.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/path_generator.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/qchar_generator.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/qstring_generator.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/namespaces.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/copy_value.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/generator_handler.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/move_into_vector.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/distribution.h
%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/percentages.h
%%QT_INCDIR%%/QtQDocCatchConversions/QtQDocCatchConversionsDepends
%%QT_INCDIR%%/QtQDocCatchConversions/catch_conversions/qdoc_catch_conversions.h
%%QT_INCDIR%%/QtQDocCatchConversions/catch_conversions/qt_catch_conversions.h
%%QT_INCDIR%%/QtQDocCatchConversions/catch_conversions/std_catch_conversions.h
%%QT_INCDIR%%/QtQDocCatchGenerators/QtQDocCatchGeneratorsDepends
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/combinators/cycle_generator.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/combinators/oneof_generator.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/k_partition_of_r_generator.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/path_generator.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/qchar_generator.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/qstring_generator.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/namespaces.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/semantics/copy_value.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/semantics/generator_handler.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/semantics/move_into_vector.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/statistics/distribution.h
%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/statistics/percentages.h
%%QT_INCDIR%%/QtTools/%%FULLVER%%/QtTools/private/qttools-config_p.h
%%QT_INCDIR%%/QtTools/QtTools
%%QT_INCDIR%%/QtTools/QtToolsDepends
@ -407,12 +407,9 @@ lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake
%%QT_MKSPECDIR%%/modules/qt_lib_help.pri
%%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_linguist.pri
%%QT_MKSPECDIR%%/modules/qt_lib_linguist_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatch_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchconversionsprivate.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchconversionsprivate_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchgeneratorsprivate.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchgeneratorsprivate_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchconversions_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchgenerators_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_tools_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_uiplugin.pri
%%QT_MKSPECDIR%%/modules/qt_lib_uitools.pri
@ -421,8 +418,6 @@ lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake
libdata/pkgconfig/Qt6Designer.pc
libdata/pkgconfig/Qt6Help.pc
libdata/pkgconfig/Qt6Linguist.pc
libdata/pkgconfig/Qt6QDocCatchConversionsPrivate.pc
libdata/pkgconfig/Qt6QDocCatchGeneratorsPrivate.pc
libdata/pkgconfig/Qt6UiPlugin.pc
libdata/pkgconfig/Qt6UiTools.pc
%%QT_TOOLDIR%%/lprodump

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661068
SHA256 (KDE/Qt/6.6.3/qttranslations-everywhere-src-6.6.3.tar.xz) = 12e35f2ac9a262e41827d95f168d4de6eb85c166bdaf7e5b3291f8f516cf73cf
SIZE (KDE/Qt/6.6.3/qttranslations-everywhere-src-6.6.3.tar.xz) = 1472412
TIMESTAMP = 1712112830
SHA256 (KDE/Qt/6.7.0/qttranslations-everywhere-src-6.7.0.tar.xz) = 26fc8047062ca4bacd1bd953be86fd39c6e0a5f5e9920c72ba9d40876cea4b56
SIZE (KDE/Qt/6.7.0/qttranslations-everywhere-src-6.7.0.tar.xz) = 1475980

View file

@ -14,25 +14,25 @@ LICENSE_COMB= multi
LIB_DEPENDS= libxslt.so:textproc/libxslt
USES= cmake compiler:c++17-lang gnome llvm:lib pathfix python qt:6 \
tar:xz
USES= cmake compiler:c++17-lang gnome llvm:lib,noexport pathfix \
python qt:6 tar:xz
USE_GNOME= libxml2
USE_LDCONFIG= yes
USE_PYTHON= flavors
USE_QT= base
CONFIGURE_ENV= LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm"
CMAKE_ARGS= -DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \
-DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm" \
-DCMAKE_CXX_FLAGS=-lexecinfo \
-DCMAKE_STANDARD_LIBRARIES=-lexecinfo \
-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo \
-DUSE_PYTHON_VERSION=${PYTHON_VER} \
-DBUILD_TESTS:BOOL=false
WRKSRC= ${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/shiboken6
WRKSRC_SUBDIR= sources/shiboken6
PLIST_SUB= DISTVERSION=${DISTVERSION}
OPTIONS_DEFINE= DOCS
OPTIONS_DEFINE= DOCS NUMPY
OPTIONS_DEFAULT= NUMPY
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \
@ -42,6 +42,10 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR}
DOCS_ALL_TARGET= all doc
DOCS_PORTDOCS= *
NUMPY_BUILD_DEPENDS= ${PYNUMPY}
NUMPY_RUN_DEPENDS= ${PYNUMPY}
NUMPY_CMAKE_ON= -DNUMPY_INCLUDE_DIR:PATH="${PYTHON_SITELIBDIR}/numpy/core/include"
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1708228666
SHA256 (pyside-setup-everywhere-src-6.6.2.tar.xz) = 14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0
SIZE (pyside-setup-everywhere-src-6.6.2.tar.xz) = 13975896
TIMESTAMP = 1714321386
SHA256 (pyside-setup-everywhere-src-6.7.0.tar.xz) = 82eae370737df5ecf539c165d09d7c81d5fc6153a541b8d3d37b11275f9e3e8f
SIZE (pyside-setup-everywhere-src-6.7.0.tar.xz) = 14382456

View file

@ -1,8 +1,8 @@
We don't need bash for a simple export command.
--- cmake/ShibokenHelpers.cmake.orig 2023-10-14 09:37:51 UTC
--- cmake/ShibokenHelpers.cmake.orig 2024-04-05 12:14:13 UTC
+++ cmake/ShibokenHelpers.cmake
@@ -772,7 +772,7 @@ $@")
@@ -769,7 +769,7 @@ $@")
$@")
else()
string(REPLACE ";" ":" path_dirs_native "${path_dirs_native}")

View file

@ -1,4 +1,4 @@
--- data/shiboken6.pc.in.orig 2023-10-14 09:37:51 UTC
--- data/shiboken6.pc.in.orig 2024-04-05 12:14:13 UTC
+++ data/shiboken6.pc.in
@@ -8,5 +8,5 @@ Version: @shiboken6_VERSION@
Name: shiboken6
@ -6,4 +6,4 @@
Version: @shiboken6_VERSION@
-Libs: @SHIBOKEN_PYTHON_LIBRARIES@ -L${libdir} -lshiboken6@shiboken6_SUFFIX@@PYTHON_SHARED_LIBRARY_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
+Libs: @SHIBOKEN_PYTHON_LIBRARIES@ -L${libdir} -lshiboken6@shiboken6_SUFFIX@@PYTHON_SHARED_LIBRARY_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@ -lexecinfo
Cflags: -I@PYTHON_INCLUDE_DIRS@ -I${includedir}/@shiboken6_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
Cflags: -I@Python_INCLUDE_DIRS@ -I${includedir}/@shiboken6_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@

View file

@ -0,0 +1,29 @@
--- libshiboken/signature/signature_globals.cpp.orig 2024-04-29 02:02:21 UTC
+++ libshiboken/signature/signature_globals.cpp
@@ -210,7 +210,7 @@ static int init_phase_2(safe_globals_struc *p, PyMetho
////////////////////////////////////////////////////////////////////////////
// a stack trace for linux-like platforms
#include <cstdio>
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) || defined(__FreeBSD__)
# include <execinfo.h>
#endif
#include <signal.h>
@@ -218,7 +218,7 @@ static void handler(int sig) {
#include <unistd.h>
static void handler(int sig) {
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) || defined(__FreeBSD__)
void *array[30];
size_t size;
@@ -228,7 +228,7 @@ static void handler(int sig) {
// print out all the frames to stderr
#endif
std::fprintf(stderr, "Error: signal %d:\n", sig);
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) || defined(__FreeBSD__)
backtrace_symbols_fd(array, size, STDERR_FILENO);
#endif
exit(1);

View file

@ -6,7 +6,9 @@ include/shiboken6/bindingmanager.h
include/shiboken6/bufferprocs_py37.h
include/shiboken6/gilstate.h
include/shiboken6/helper.h
include/shiboken6/pep384ext.h
include/shiboken6/pep384impl.h
include/shiboken6/pyobjectholder.h
include/shiboken6/sbkarrayconverter.h
include/shiboken6/sbkcontainer.h
include/shiboken6/sbkconverter.h
@ -43,7 +45,7 @@ lib/cmake/Shiboken6Tools/Shiboken6ToolsConfigVersion.cmake
lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets.cmake
lib/libshiboken6.abi3.so
lib/libshiboken6.abi3.so.6.6
lib/libshiboken6.abi3.so.6.7
lib/libshiboken6.abi3.so.%%DISTVERSION%%
%%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.abi3.so
%%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.pyi

View file

@ -12,8 +12,7 @@ COMMENT= Python bindings for the Qt6 3D framework
WWW= https://www.riverbankcomputing.com/software/pyqt3d/
USES= gl pyqt:6 python qt:6
USE_GL= gl
USE_LOCALE= C.UTF-8
USE_GL= opengl
USE_PYQT= sip:build pyqt6 qtbuilder:build
USE_PYTHON= concurrent flavors
USE_QT= 3d base

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1698896095
SHA256 (PyQt6_3D-6.6.0.tar.gz) = 372b206eb8185f2b6ff048629d3296cb137c9e5901b113119ffa46a317726988
SIZE (PyQt6_3D-6.6.0.tar.gz) = 7469031
TIMESTAMP = 1714271985
SHA256 (PyQt6_3D-6.7.0.tar.gz) = 3e99bfc801918ab4758dd2660b2d2358e0057c943eb2bd9f8d0ddf156ea5ccd7
SIZE (PyQt6_3D-6.7.0.tar.gz) = 7469641

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661369
SHA256 (KDE/Qt/6.6.3/qt3d-everywhere-src-6.6.3.tar.xz) = a549747f0071542b4a12519e4ae755d2b054922566bc7aa48de4939c78bedf6c
SIZE (KDE/Qt/6.6.3/qt3d-everywhere-src-6.6.3.tar.xz) = 141571616
TIMESTAMP = 1712113036
SHA256 (KDE/Qt/6.7.0/qt3d-everywhere-src-6.7.0.tar.xz) = 803b82a8be8632b79f4fc717b236edba716100ab274a54349add439056896424
SIZE (KDE/Qt/6.7.0/qt3d-everywhere-src-6.7.0.tar.xz) = 141570596

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661377
SHA256 (KDE/Qt/6.6.3/qtimageformats-everywhere-src-6.6.3.tar.xz) = 3ca5ea60176603ce6ffc1bff59a4dcea139375233ce8e5e86c38f4e84c44627c
SIZE (KDE/Qt/6.6.3/qtimageformats-everywhere-src-6.6.3.tar.xz) = 1964752
TIMESTAMP = 1712113041
SHA256 (KDE/Qt/6.7.0/qtimageformats-everywhere-src-6.7.0.tar.xz) = 516ce07ec8dd5a11c59816fe33ddb71d4f691d0ebbc1798ac338f23b86c029a7
SIZE (KDE/Qt/6.7.0/qtimageformats-everywhere-src-6.7.0.tar.xz) = 1968344

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661379
SHA256 (KDE/Qt/6.6.3/qtlottie-everywhere-src-6.6.3.tar.xz) = 9891fad0aef6fbc2f458f6d664698d9180b20255fc83e2c269960304c0920eb4
SIZE (KDE/Qt/6.6.3/qtlottie-everywhere-src-6.6.3.tar.xz) = 83332
TIMESTAMP = 1712113044
SHA256 (KDE/Qt/6.7.0/qtlottie-everywhere-src-6.7.0.tar.xz) = 9c0ffbde3c99e006bd13c844a1d691e275c02db1c3db44d05154c939d23ba2ed
SIZE (KDE/Qt/6.7.0/qtlottie-everywhere-src-6.7.0.tar.xz) = 83008

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661390
SHA256 (KDE/Qt/6.6.3/qtquickeffectmaker-everywhere-src-6.6.3.tar.xz) = bc242a13c9ab2ef4cbe6b739e63d7b8d116058f9056f451179e4c89918282357
SIZE (KDE/Qt/6.6.3/qtquickeffectmaker-everywhere-src-6.6.3.tar.xz) = 4358424
TIMESTAMP = 1712113053
SHA256 (KDE/Qt/6.7.0/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz) = 3d0fec664061ca35cc69162c8eb9ae3bc49628eb417ca9def5fb8946b8bc04d5
SIZE (KDE/Qt/6.7.0/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz) = 4358300

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661401
SHA256 (KDE/Qt/6.6.3/qtsvg-everywhere-src-6.6.3.tar.xz) = 4acb1e576eca55e955cf2b0d15c914a200df290e737accd7c1901fa1e33a25c7
SIZE (KDE/Qt/6.6.3/qtsvg-everywhere-src-6.6.3.tar.xz) = 1643424
TIMESTAMP = 1712113058
SHA256 (KDE/Qt/6.7.0/qtsvg-everywhere-src-6.7.0.tar.xz) = 1518f40e08ff5e6153a6e26e5b95b033413ac143b70795dc1317e7f73ebf922d
SIZE (KDE/Qt/6.7.0/qtsvg-everywhere-src-6.7.0.tar.xz) = 1790244

View file

@ -1,10 +1,13 @@
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfilter_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfont_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvggraphics_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvghandler_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvghelper_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgnode_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstructure_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstyle_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgtinydocument_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgvisitor_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgexports_p.h
%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgglobal_p.h
%%QT_INCDIR%%/QtSvg/QSvgGenerator

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661408
SHA256 (KDE/Qt/6.6.3/qtwayland-everywhere-src-6.6.3.tar.xz) = a96ecc0fecc05f9e18cfb7806fe5ebd7416be94e8f51ebeca75c80412f66553d
SIZE (KDE/Qt/6.6.3/qtwayland-everywhere-src-6.6.3.tar.xz) = 1120056
TIMESTAMP = 1712113061
SHA256 (KDE/Qt/6.7.0/qtwayland-everywhere-src-6.7.0.tar.xz) = d73470e4217da388d8cd2a517ee8bb373853f33c569306e80f04397845157aea
SIZE (KDE/Qt/6.7.0/qtwayland-everywhere-src-6.7.0.tar.xz) = 1121748

View file

@ -12,7 +12,7 @@
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-tablet-unstable-v2.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v1.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v4-wip.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v3.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-viewporter.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
@ -68,6 +68,7 @@
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtextinputinterface_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtextinputv1_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtextinputv2_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtextinputv3_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandviewport_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkaninstance_p.h
@ -86,7 +87,7 @@
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-tablet-unstable-v2-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v1-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v4-wip-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v3-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-viewporter-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
@ -103,7 +104,6 @@
%%QT_INCDIR%%/QtWaylandClient/qtwaylandclientexports.h
%%QT_INCDIR%%/QtWaylandClient/qtwaylandclientglobal.h
%%QT_INCDIR%%/QtWaylandClient/qtwaylandclientversion.h
%%QT_INCDIR%%/QtWaylandClient/qwaylandclientexport.h
%%QT_INCDIR%%/QtWaylandClient/qwaylandclientextension.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositor-config_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositorglobal_p.h
@ -118,7 +118,7 @@
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-scaler.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v2.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v4-wip.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v3.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-touch-extension.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-viewporter.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-wayland.h
@ -154,6 +154,8 @@
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandsurface_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinput_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputmanager_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputmanagerv3_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputv3_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtouch_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandutils_p.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandview_p.h
@ -196,7 +198,7 @@
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-scaler-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-server-buffer-extension-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v2-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v4-wip-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v3-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-touch-extension-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-viewporter-server-protocol.h
%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-wayland-server-protocol.h
@ -242,6 +244,8 @@
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandSurfaceRole
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInput
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInputManager
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInputManagerV3
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInputV3
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTouch
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandView
%%QT_INCDIR%%/QtWaylandCompositor/QWaylandViewporter
@ -268,7 +272,6 @@
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandcompositorextension.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylanddestroylistener.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylanddrag.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandexport.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandidleinhibitv1.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandinputmethodcontrol.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandiviapplication.h
@ -298,6 +301,8 @@
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandsurfacegrabber.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinput.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinputmanager.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinputmanagerv3.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinputv3.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtouch.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandview.h
%%QT_INCDIR%%/QtWaylandCompositor/qwaylandviewporter.h

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711661445
SHA256 (KDE/Qt/6.6.3/qtdoc-everywhere-src-6.6.3.tar.xz) = 08850585ea4cae04909a38bcb1318487c546fa6a0c350afda21ab0f356e3eac8
SIZE (KDE/Qt/6.6.3/qtdoc-everywhere-src-6.6.3.tar.xz) = 13238476
TIMESTAMP = 1712113085
SHA256 (KDE/Qt/6.7.0/qtdoc-everywhere-src-6.7.0.tar.xz) = 991e5e10c04de4b5cc14577adaad69375dd092ee95a1577c0ce377c4b2019c40
SIZE (KDE/Qt/6.7.0/qtdoc-everywhere-src-6.7.0.tar.xz) = 13974180

View file

@ -37,7 +37,7 @@
%%QT_DOCDIR%%/qtdoc/activeqt-testcon.html
%%QT_DOCDIR%%/qtdoc/android-3rdparty-libs.html
%%QT_DOCDIR%%/qtdoc/android-build-environment-variables.html
%%QT_DOCDIR%%/qtdoc/android-building-user-projects.html
%%QT_DOCDIR%%/qtdoc/android-building-projects-from-commandline.html
%%QT_DOCDIR%%/qtdoc/android-building.html
%%QT_DOCDIR%%/qtdoc/android-emojis.html
%%QT_DOCDIR%%/qtdoc/android-environment-variables.html
@ -116,12 +116,14 @@
%%QT_DOCDIR%%/qtdoc/images/btn_prev.png
%%QT_DOCDIR%%/qtdoc/images/bullet_dn.png
%%QT_DOCDIR%%/qtdoc/images/bullet_sq.png
%%QT_DOCDIR%%/qtdoc/images/car_configurator_overview.png
%%QT_DOCDIR%%/qtdoc/images/coffee_machine_modify.png
%%QT_DOCDIR%%/qtdoc/images/coffee_machine_overview.png
%%QT_DOCDIR%%/qtdoc/images/coffee_machine_selection.png
%%QT_DOCDIR%%/qtdoc/images/colorpalette_editing.png
%%QT_DOCDIR%%/qtdoc/images/colorpalette_listing.png
%%QT_DOCDIR%%/qtdoc/images/colorpalette_urlselection.png
%%QT_DOCDIR%%/qtdoc/images/colorpalette_userlisting.png
%%QT_DOCDIR%%/qtdoc/images/controls.png
%%QT_DOCDIR%%/qtdoc/images/deployment-mac-application.png
%%QT_DOCDIR%%/qtdoc/images/deployment-mac-bundlestructure.png
@ -147,6 +149,7 @@
%%QT_DOCDIR%%/qtdoc/images/icon_Tools.png
%%QT_DOCDIR%%/qtdoc/images/integrity-os.png
%%QT_DOCDIR%%/qtdoc/images/layout-examples.png
%%QT_DOCDIR%%/qtdoc/images/lightningviewer.jpg
%%QT_DOCDIR%%/qtdoc/images/logo.png
%%QT_DOCDIR%%/qtdoc/images/mainscreen.png
%%QT_DOCDIR%%/qtdoc/images/maintenancetool.png
@ -156,6 +159,7 @@
%%QT_DOCDIR%%/qtdoc/images/nmvurCcsWos.jpg
%%QT_DOCDIR%%/qtdoc/images/ok.png
%%QT_DOCDIR%%/qtdoc/images/open-project.png
%%QT_DOCDIR%%/qtdoc/images/osmbuildings.jpg
%%QT_DOCDIR%%/qtdoc/images/piemenu.gif
%%QT_DOCDIR%%/qtdoc/images/project-structure.png
%%QT_DOCDIR%%/qtdoc/images/project_structure.png
@ -170,6 +174,7 @@
%%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-opacity.png
%%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-rectangles.png
%%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-transforms.png
%%QT_DOCDIR%%/qtdoc/images/qt-android-architecture.drawio.svg
%%QT_DOCDIR%%/qtdoc/images/qt-codesample.png
%%QT_DOCDIR%%/qtdoc/images/qt-edu-apply.png
%%QT_DOCDIR%%/qtdoc/images/qt-edu-browse-qbsp.png
@ -192,7 +197,6 @@
%%QT_DOCDIR%%/qtdoc/images/qt-edu-qbsp-download.png
%%QT_DOCDIR%%/qtdoc/images/qt-edu-qbsp.png
%%QT_DOCDIR%%/qtdoc/images/qt-embedded-fontfeatures.png
%%QT_DOCDIR%%/qtdoc/images/qt_android_architecture.png
%%QT_DOCDIR%%/qtdoc/images/qtcreator-clazy-checks-for-porting-to-qt6.png
%%QT_DOCDIR%%/qtdoc/images/qtcreator-create-templates.png
%%QT_DOCDIR%%/qtdoc/images/qtcreator-qt-quick-editors.png
@ -279,6 +283,7 @@
%%QT_DOCDIR%%/qtdoc/newclasses64.html
%%QT_DOCDIR%%/qtdoc/newclasses65.html
%%QT_DOCDIR%%/qtdoc/newclasses66.html
%%QT_DOCDIR%%/qtdoc/newclasses67.html
%%QT_DOCDIR%%/qtdoc/obsoleteclasses.html
%%QT_DOCDIR%%/qtdoc/obsoleteqmltypes.html
%%QT_DOCDIR%%/qtdoc/overviews-main.html
@ -325,6 +330,7 @@
%%QT_DOCDIR%%/qtdoc/qtdoc-attribution-thermostatexample-phosphoricons.html
%%QT_DOCDIR%%/qtdoc/qtdoc-attribution-todolistexample-materialicons.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-calqlatr-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-car-configurator-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-clocks-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-coffee-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-colorpaletteclient-example.html
@ -333,7 +339,9 @@
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-documentviewer-plugins-txtviewer-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-fx-material-showroom-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-hangman-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-lightningviewer-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-mediaplayer-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-osmbuildings-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-photosurface-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-robotarm-example.html
%%QT_DOCDIR%%/qtdoc/qtdoc-demos-rssnews-example.html
@ -406,6 +414,7 @@
%%QT_DOCDIR%%/qtdoc/uic.html
%%QT_DOCDIR%%/qtdoc/unicode.html
%%QT_DOCDIR%%/qtdoc/unix-signals.html
%%QT_DOCDIR%%/qtdoc/vxworks.html
%%QT_DOCDIR%%/qtdoc/wasm.html
%%QT_DOCDIR%%/qtdoc/wayland-and-qt.html
%%QT_DOCDIR%%/qtdoc/webos.html
@ -416,6 +425,7 @@
%%QT_DOCDIR%%/qtdoc/whatsnew64.html
%%QT_DOCDIR%%/qtdoc/whatsnew65.html
%%QT_DOCDIR%%/qtdoc/whatsnew66.html
%%QT_DOCDIR%%/qtdoc/whatsnew67.html
%%QT_DOCDIR%%/qtdoc/whatsnewqt6.html
%%QT_DOCDIR%%/qtdoc/why-moc.html
%%QT_DOCDIR%%/qtdoc/windows-building.html

View file

@ -1,7 +1,7 @@
PORTNAME= examples
DISTVERSION= ${QT6_VERSION}
CATEGORIES= misc
MASTER_SITES= QT/official_releases/qt/${QT6_VERSION:R}/${QT6_VERSION}/single
MASTER_SITES= QT/${_QT6_RELEASE_TYPE}_releases/qt/${QT6_VERSION:R}/${QT6_VERSION}/single
PKGNAMEPREFIX= qt6-
DISTNAME= qt-everywhere-src-${QT6_VERSION}
DIST_SUBDIR= KDE/Qt/${QT6_VERSION}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711663435
SHA256 (KDE/Qt/6.6.3/qt-everywhere-src-6.6.3.tar.xz) = 69d0348fef415da98aa890a34651e9cfb232f1bffcee289b7b4e21386bf36104
SIZE (KDE/Qt/6.6.3/qt-everywhere-src-6.6.3.tar.xz) = 801192112
TIMESTAMP = 1712114556
SHA256 (KDE/Qt/6.7.0/qt-everywhere-src-6.7.0.tar.xz) = bf5089912364f99cf9baf6c109de76a3172eec6267f148c69800575c47f90087
SIZE (KDE/Qt/6.7.0/qt-everywhere-src-6.7.0.tar.xz) = 934507900

File diff suppressed because it is too large Load diff

View file

@ -3,6 +3,9 @@ DISTVERSION= ${QT6_VERSION}
CATEGORIES= multimedia
PKGNAMEPREFIX= qt6-
PATCH_SITES= https://github.com/qt/qtmultimedia/commit/
PATCHFILES+= 7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch:-p1
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt audio, video, radio and camera support module

View file

@ -1,3 +1,5 @@
TIMESTAMP = 1711663460
SHA256 (KDE/Qt/6.6.3/qtmultimedia-everywhere-src-6.6.3.tar.xz) = be00f830d2b14c9a12f3b6812ba3a23fdaaceb2dd9c1c6394c329c8bf6e53ab2
SIZE (KDE/Qt/6.6.3/qtmultimedia-everywhere-src-6.6.3.tar.xz) = 8266612
TIMESTAMP = 1712784204
SHA256 (KDE/Qt/6.7.0/qtmultimedia-everywhere-src-6.7.0.tar.xz) = f394bae49e3d4ee6a3b0c9e1e5e31bb870cc04a4b44f4cda3615baf7bd078c70
SIZE (KDE/Qt/6.7.0/qtmultimedia-everywhere-src-6.7.0.tar.xz) = 8315312
SHA256 (KDE/Qt/6.7.0/7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch) = ccaf3db6425e43ae19354ae797dbff66176e63a7c31238bbeb90dd10cf940e03
SIZE (KDE/Qt/6.7.0/7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch) = 8797

View file

@ -45,7 +45,6 @@
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtvideo_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconverter_p.h
@ -81,6 +80,7 @@
%%QT_INCDIR%%/QtMultimedia/QVideoSink
%%QT_INCDIR%%/QtMultimedia/QWaveDecoder
%%QT_INCDIR%%/QtMultimedia/QWindowCapture
%%QT_INCDIR%%/QtMultimedia/QtAudio
%%QT_INCDIR%%/QtMultimedia/QtMultimedia
%%QT_INCDIR%%/QtMultimedia/QtMultimediaDepends
%%QT_INCDIR%%/QtMultimedia/QtMultimediaVersion
@ -107,11 +107,12 @@
%%QT_INCDIR%%/QtMultimedia/qmediatimerange.h
%%QT_INCDIR%%/QtMultimedia/qscreencapture.h
%%QT_INCDIR%%/QtMultimedia/qsoundeffect.h
%%QT_INCDIR%%/QtMultimedia/qtaudio.h
%%QT_INCDIR%%/QtMultimedia/qtmultimedia-config.h
%%QT_INCDIR%%/QtMultimedia/qtmultimediadefs.h
%%QT_INCDIR%%/QtMultimedia/qtmultimediaexports.h
%%QT_INCDIR%%/QtMultimedia/qtmultimediaglobal.h
%%QT_INCDIR%%/QtMultimedia/qtmultimediaversion.h
%%QT_INCDIR%%/QtMultimedia/qtvideo.h
%%QT_INCDIR%%/QtMultimedia/qvideoframe.h
%%QT_INCDIR%%/QtMultimedia/qvideoframeformat.h
%%QT_INCDIR%%/QtMultimedia/qvideosink.h
@ -139,7 +140,6 @@
%%QT_INCDIR%%/QtMultimediaWidgets/QtMultimediaWidgetsDepends
%%QT_INCDIR%%/QtMultimediaWidgets/QtMultimediaWidgetsVersion
%%QT_INCDIR%%/QtMultimediaWidgets/qgraphicsvideoitem.h
%%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetdefs.h
%%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsexports.h
%%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsglobal.h
%%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsversion.h

View file

@ -11,11 +11,8 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt6 toolkit, QtNetworkAuth module
WWW= https://riverbankcomputing.com/software/pyqt
LIB_DEPENDS= libqscintilla2_qt6.so:devel/qscintilla2-qt6
USES= gl pyqt:6 python qt:6
USE_GL= gl
USE_LOCALE= C.UTF-8
USE_GL= opengl
USE_PYQT= sip:build pyqt6 qtbuilder
USE_PYTHON= concurrent flavors
USE_QT= base networkauth

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1698901185
SHA256 (PyQt6_NetworkAuth-6.6.0.tar.gz) = cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb
SIZE (PyQt6_NetworkAuth-6.6.0.tar.gz) = 20114
TIMESTAMP = 1714272075
SHA256 (PyQt6_NetworkAuth-6.7.0.tar.gz) = 974983525437633a0f016c0ffa0dc311847089f253dfe6840b0ec8ce21dc8685
SIZE (PyQt6_NetworkAuth-6.7.0.tar.gz) = 20275

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711663462
SHA256 (KDE/Qt/6.6.3/qt-qtcoap-v6.6.3_GH0.tar.gz) = ae5b67fc48f13da0a2353527fb0c6e6ac9f56374f0d17a66208116c3f3e1ae71
SIZE (KDE/Qt/6.6.3/qt-qtcoap-v6.6.3_GH0.tar.gz) = 183074
TIMESTAMP = 1712114578
SHA256 (KDE/Qt/6.7.0/qt-qtcoap-v6.7.0_GH0.tar.gz) = fb3c8b7b49a642139840130a603c05f9d8413e963d644b0c897de863baad118e
SIZE (KDE/Qt/6.7.0/qt-qtcoap-v6.7.0_GH0.tar.gz) = 183108

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711663464
SHA256 (KDE/Qt/6.6.3/qtnetworkauth-everywhere-src-6.6.3.tar.xz) = 5db9a30b42d7ff22ce1a0048474c36b3b84e1e55f3af991ba3cc8e0dc9bb7594
SIZE (KDE/Qt/6.6.3/qtnetworkauth-everywhere-src-6.6.3.tar.xz) = 143676
TIMESTAMP = 1712114580
SHA256 (KDE/Qt/6.7.0/qtnetworkauth-everywhere-src-6.7.0.tar.xz) = 993105616ff0223d3d826e2a497440035721c6e1acdae232935fae3bcfa74a45
SIZE (KDE/Qt/6.7.0/qtnetworkauth-everywhere-src-6.7.0.tar.xz) = 143660

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711663491
SHA256 (KDE/Qt/6.6.3/qtquick3dphysics-everywhere-src-6.6.3.tar.xz) = 67e19b482ea1ac8ba14afda8f804e90e0a68ff68e7da58b454deffda3051f546
SIZE (KDE/Qt/6.6.3/qtquick3dphysics-everywhere-src-6.6.3.tar.xz) = 4692928
TIMESTAMP = 1712114589
SHA256 (KDE/Qt/6.7.0/qtquick3dphysics-everywhere-src-6.7.0.tar.xz) = 80045f261109f3f3807c0b405d056e935210a36499c3a9aff78296d8940e04e6
SIZE (KDE/Qt/6.7.0/qtquick3dphysics-everywhere-src-6.7.0.tar.xz) = 4702492

View file

@ -12,7 +12,7 @@ COMMENT= Python bindings for the Qt6 toolkit, QtWebEngine module
WWW= https://riverbankcomputing.com/software/pyqt
USES= gl python pyqt:6 qt:6
USE_GL= gl
USE_GL= opengl
USE_PYQT= sip:build pyqt6
USE_PYTHON= concurrent flavors
USE_QT= base declarative positioning webchannel webengine

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1698900348
SHA256 (PyQt6_WebEngine-6.6.0.tar.gz) = d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487
SIZE (PyQt6_WebEngine-6.6.0.tar.gz) = 31817
TIMESTAMP = 1714272046
SHA256 (PyQt6_WebEngine-6.7.0.tar.gz) = 68edc7adb6d9e275f5de956881e79cca0d71fad439abeaa10d823bff5ac55001
SIZE (PyQt6_WebEngine-6.7.0.tar.gz) = 32593

View file

@ -7,6 +7,7 @@
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecontextmenurequest.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecookiestore.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginedesktopmediarequest.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginedownloadrequest.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefilesystemaccessrequest.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefindtextresult.sip
@ -30,6 +31,7 @@
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestjob.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlscheme.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlschemehandler.sip
%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginewebauthuxrequest.sip
%%PYQT_SIPDIR%%/QtWebEngineQuick/QtWebEngineQuick.toml
%%PYQT_SIPDIR%%/QtWebEngineQuick/QtWebEngineQuickmod.sip
%%PYQT_SIPDIR%%/QtWebEngineQuick/qquickwebengineprofile.sip

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711663494
SHA256 (KDE/Qt/6.6.3/qthttpserver-everywhere-src-6.6.3.tar.xz) = 41ac78d745d00eef1c3866dda5119d3649a64fa08d44d72d89b83aeecde87835
SIZE (KDE/Qt/6.6.3/qthttpserver-everywhere-src-6.6.3.tar.xz) = 162228
TIMESTAMP = 1712114591
SHA256 (KDE/Qt/6.7.0/qthttpserver-everywhere-src-6.7.0.tar.xz) = c2e2e38b2b21537eeef20d097bb5f216081462c44b78d63045e60d6fd9f89bfa
SIZE (KDE/Qt/6.7.0/qthttpserver-everywhere-src-6.7.0.tar.xz) = 163044

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711663498
SHA256 (KDE/Qt/6.6.3/qtwebchannel-everywhere-src-6.6.3.tar.xz) = 7c7b2ae5d1b496f76a7ece3ac5728a8d209af4ac7853207dbc01a4982f718c33
SIZE (KDE/Qt/6.6.3/qtwebchannel-everywhere-src-6.6.3.tar.xz) = 206396
TIMESTAMP = 1712114594
SHA256 (KDE/Qt/6.7.0/qtwebchannel-everywhere-src-6.7.0.tar.xz) = 26bfbd404e0c82bfbeeaef81796eb7a7cf931c5c1a5e942a315ca7126322efff
SIZE (KDE/Qt/6.7.0/qtwebchannel-everywhere-src-6.7.0.tar.xz) = 206600

View file

@ -12,7 +12,7 @@
PORTNAME?= webengine
DISTVERSION= ${QT6_VERSION}
PORTREVISION?= 1 # Master port for print/qt6-pdf. Please keep this line.
PORTREVISION?= 0 # Master port for print/qt6-pdf. Please keep this line.
CATEGORIES?= www
PKGNAMEPREFIX= qt6-
@ -101,10 +101,11 @@ DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} -j1 $
BINARY_ALIAS= python3=${PYTHON_CMD}
.if !defined(BUILD_QTPDF)
OPTIONS_DEFINE= CUPS
OPTIONS_DEFAULT= ALSA CUPS
OPTIONS_DEFINE= CUPS DRIVER
OPTIONS_DEFAULT= ALSA CUPS DRIVER
OPTIONS_SINGLE= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO
OPTIONS_SUB= yes
AUDIO_DESC= Audio backend
@ -122,6 +123,10 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups \
CUPS_CMAKE_ON= -DQT_FEATURE_webengine_printing_and_pdf:BOOL=ON
CUPS_CMAKE_OFF= -DQT_FEATURE_webengine_printing_and_pdf:BOOL=OFF
DRIVER_DESC= Install WebEngineDriver
DRIVER_CMAKE_ON= -DQT_FEATURE_webenginedriver:BOOL=ON
DRIVER_CMAKE_OFF= -DQT_FEATURE_webenginedriver:BOOL=OFF
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_ON= -DQT_FEATURE_webengine_system_pulseaudio:BOOL=ON
PULSEAUDIO_CMAKE_OFF= -DQT_FEATURE_webengine_system_pulseaudio:BOOL=OFF
@ -165,4 +170,15 @@ pre-configure:
./build/linux/unbundle/replace_gn_files.py --system-libraries \
${SYS_LIBS} || ${FALSE}
.if !defined(BUILD_QTPDF)
post-install:
# Fix for deskutils/calibre, perhaps others, where this empty directory
# is created during build causing a fs-violation.
${MKDIR} ${STAGEDIR}${QT_DATADIR}/resources/locales
post-install-DRIVER-on:
${STRIP_CMD} ${STAGEDIR}${QT_TOOLDIR}/webenginedriver
.endif
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1711664649
SHA256 (KDE/Qt/6.6.3/qtwebengine-everywhere-src-6.6.3.tar.xz) = 7c2bdc83b21b82a179a7bf098df47ebf66ba7693d67ebda55a4a28d9eadad804
SIZE (KDE/Qt/6.6.3/qtwebengine-everywhere-src-6.6.3.tar.xz) = 421076320
TIMESTAMP = 1712115499
SHA256 (KDE/Qt/6.7.0/qtwebengine-everywhere-src-6.7.0.tar.xz) = 1a5ba443635dc1f439ab802ac6d761b8def5ebb24e5219bb7289288e72c147de
SIZE (KDE/Qt/6.7.0/qtwebengine-everywhere-src-6.7.0.tar.xz) = 550907592

View file

@ -1,4 +1,4 @@
--- cmake/Functions.cmake.orig 2024-02-10 00:23:21 UTC
--- cmake/Functions.cmake.orig 2024-02-10 00:27:53 UTC
+++ cmake/Functions.cmake
@@ -416,7 +416,7 @@ function(add_linker_options target buildDir completeSt
set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp")
@ -9,7 +9,7 @@
get_gn_arch(cpu ${TEST_architecture_arch})
if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm" AND ${config} STREQUAL "Debug")
target_link_options(${cmakeTarget} PRIVATE "LINKER:--long-plt")
@@ -673,6 +673,8 @@ function(get_gn_os result)
@@ -675,6 +675,8 @@ function(get_gn_os result)
set(${result} "mac" PARENT_SCOPE)
elseif(IOS)
set(${result} "ios" PARENT_SCOPE)
@ -18,7 +18,7 @@
else()
message(DEBUG "Unrecognized OS")
endif()
@@ -865,7 +867,7 @@ macro(append_build_type_setup)
@@ -878,7 +880,7 @@ macro(append_build_type_setup)
extend_gn_list(gnArgArg
ARGS enable_precompiled_headers
@ -27,7 +27,7 @@
)
extend_gn_list(gnArgArg
ARGS dcheck_always_on
@@ -917,7 +919,7 @@ macro(append_compiler_linker_sdk_setup)
@@ -932,7 +934,7 @@ macro(append_compiler_linker_sdk_setup)
use_libcxx=true
)
endif()
@ -36,7 +36,7 @@
extend_gn_list(gnArgArg ARGS use_libcxx
CONDITION QT_FEATURE_stdlib_libcpp
)
@@ -955,7 +957,7 @@ macro(append_compiler_linker_sdk_setup)
@@ -970,7 +972,7 @@ macro(append_compiler_linker_sdk_setup)
)
endif()
get_gn_arch(cpu ${TEST_architecture_arch})
@ -45,7 +45,7 @@
extend_gn_list_cflag(gnArgArg
ARG arm_tune
@@ -1040,7 +1042,7 @@ macro(append_toolchain_setup)
@@ -1060,7 +1062,7 @@ macro(append_toolchain_setup)
host_cpu="${cpu}"
)
endif()
@ -54,16 +54,7 @@
get_gn_arch(cpu ${TEST_architecture_arch})
list(APPEND gnArgArg
custom_toolchain="${buildDir}/target_toolchain:target"
@@ -1073,7 +1075,7 @@ macro(append_pkg_config_setup)
macro(append_pkg_config_setup)
- if(LINUX)
+ if(LINUX OR FREEBSD)
list(APPEND gnArgArg
pkg_config="${PKG_CONFIG_EXECUTABLE}"
host_pkg_config="${PKG_CONFIG_HOST_EXECUTABLE}"
@@ -1166,6 +1168,20 @@ function(add_gn_build_artifacts_to_target)
@@ -1198,6 +1200,20 @@ function(add_gn_build_artifacts_to_target)
set_target_properties(${arg_CMAKE_TARGET} PROPERTIES
LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP}
)
@ -84,7 +75,7 @@
if(QT_IS_MACOS_UNIVERSAL)
add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC})
elseif(IOS)
@@ -1283,7 +1299,7 @@ function(check_for_ulimit)
@@ -1313,7 +1329,7 @@ function(check_for_ulimit)
function(check_for_ulimit)
message("-- Checking 'ulimit -n'")
@ -93,7 +84,7 @@
OUTPUT_VARIABLE ulimitOutput
)
string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}")
@@ -1292,7 +1308,7 @@ function(check_for_ulimit)
@@ -1322,7 +1338,7 @@ function(check_for_ulimit)
if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0")
message(" -- Creating linker launcher")
file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh

View file

@ -1,6 +1,6 @@
--- configure.cmake.orig 2024-02-10 00:23:21 UTC
--- configure.cmake.orig 2023-12-12 22:08:45 UTC
+++ configure.cmake
@@ -67,7 +67,7 @@ endif()
@@ -68,7 +68,7 @@ endif()
endif()
#### Tests
@ -9,7 +9,7 @@
check_for_ulimit()
endif()
@@ -427,7 +427,7 @@ qt_feature("webengine-ozone-x11" PRIVATE
@@ -428,7 +428,7 @@ qt_feature("webengine-ozone-x11" PRIVATE
qt_feature("webengine-ozone-x11" PRIVATE
LABEL "Support GLX on qpa-xcb"
@ -18,7 +18,7 @@
AND TARGET Qt::Gui
AND QT_FEATURE_xcb
AND X11_FOUND
@@ -464,12 +464,12 @@ add_check_for_support(
@@ -465,12 +465,12 @@ add_check_for_support(
)
add_check_for_support(
MODULES QtWebEngine
@ -28,9 +28,9 @@
)
add_check_for_support(
MODULES QtPdf
- CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR (ANDROID AND NOT CMAKE_HOST_WIN32)
+ CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR (ANDROID AND NOT CMAKE_HOST_WIN32) OR FREEBSD
MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android(on non-Windows hosts only)."
- CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR ANDROID
+ CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR ANDROID OR FREEBSD
MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android."
)
if(LINUX AND CMAKE_CROSSCOMPILING)
@@ -492,13 +492,6 @@ add_check_for_support(

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/BUILD.gn.orig 2023-08-16 19:50:41 UTC
--- src/3rdparty/chromium/BUILD.gn.orig 2023-12-12 22:08:45 UTC
+++ src/3rdparty/chromium/BUILD.gn
@@ -61,7 +61,7 @@ declare_args() {
@@ -62,7 +62,7 @@ declare_args() {
qtwebengine_target = "//tools/gn"
}
@ -9,25 +9,58 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -428,7 +428,7 @@ if (!is_qtwebengine){
@@ -96,7 +96,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
- "//infra/orchestrator:orchestrator_all",
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
@@ -418,7 +417,7 @@ group("gn_all") {
}
}
}
- if (is_linux || is_chromeos || is_android) {
+ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -1098,7 +1098,7 @@ if (!is_ios && !is_qtwebengine) {
- if (is_linux || is_chromeos || is_android) {
+ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -618,6 +617,15 @@ group("gn_all") {
}
}
+ if (is_bsd) {
+ deps -= [
+ "//third_party/breakpad:dump_syms($host_toolchain)",
+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
+ "//third_party/breakpad:minidump_dump($host_toolchain)",
+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
+ ]
+ }
+
if (is_mac) {
deps += [
"//third_party/breakpad:dump_syms",
@@ -667,7 +675,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
- } else if (!is_android && !is_ios && !is_fuchsia) {
+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -1095,7 +1103,7 @@ if (use_blink && !is_cronet_build) {
]
}
- if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
+ if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
@@ -1198,7 +1198,7 @@ if (!is_ios && !is_qtwebengine) {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
@@ -1185,7 +1193,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -36,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1207,7 +1207,7 @@ if (!is_ios && !is_qtwebengine) {
@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -45,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1675,7 +1675,7 @@ group("chromium_builder_perf") {
@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/BUILD.gn.orig 2023-08-16 19:50:41 UTC
--- src/3rdparty/chromium/base/BUILD.gn.orig 2023-12-12 22:08:45 UTC
+++ src/3rdparty/chromium/base/BUILD.gn
@@ -189,7 +189,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -199,7 +199,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@ -9,24 +9,32 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1009,7 +1009,6 @@ jumbo_component("base") {
"threading/thread_type_delegate.cc",
"threading/thread_type_delegate.h",
]
- jumbo_excluded_sources += [ "process/memory_linux.cc" ]
@@ -1117,11 +1117,23 @@ jumbo_component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
- if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
+ if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) &&
host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ]
}
if (is_linux || is_chromeos || is_android || is_fuchsia) {
@@ -1132,7 +1131,7 @@ jumbo_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
- if (is_chromeos || is_linux) {
+ if (is_chromeos || (is_linux && !is_bsd)) {
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
@@ -1173,7 +1172,7 @@ jumbo_component("base") {
+ # *BSD needs libkvm
+ if (is_bsd) {
+ libs += [ "kvm" ]
+ }
+
+ if (is_freebsd) {
+ libs += [
+ "execinfo",
+ "util",
+ ]
+ }
+
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1141,7 +1153,7 @@ jumbo_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -35,31 +43,10 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -2119,6 +2118,43 @@ jumbo_component("base") {
}
@@ -2091,6 +2103,22 @@ jumbo_component("base") {
]
}
+ if (is_bsd) {
+ sources -= [
+ "files/file_path_watcher_inotify.cc",
+ "files/scoped_file_linux.cc",
+ "process/process_linux.cc",
+ "system/sys_info_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_metrics_linux.cc",
+ "process/process_handle_linux.cc",
+ "profiler/stack_copier_signal.cc",
+ "profiler/stack_copier_signal.h",
+ "profiler/thread_delegate_posix.cc",
+ "profiler/thread_delegate_posix.h",
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
+ "files/file_path_watcher_kqueue.h",
+ "files/file_path_watcher_bsd.cc",
+ ]
+ }
+
+ if (is_openbsd) {
+ sources += [
+ "process/process_handle_openbsd.cc",
@ -79,7 +66,37 @@
# iOS
if (is_ios) {
sources += [
@@ -2214,7 +2250,7 @@ jumbo_component("base") {
@@ -2223,6 +2251,29 @@ jumbo_component("base") {
}
}
+ if (is_bsd) {
+ sources -= [
+ "files/file_path_watcher_inotify.cc",
+ "files/scoped_file_linux.cc",
+ "system/sys_info_linux.cc",
+ "process/process_iterator_linux.cc",
+ "process/process_linux.cc",
+ "process/process_metrics_linux.cc",
+ "process/process_handle_linux.cc",
+ "profiler/stack_copier_signal.cc",
+ "profiler/stack_copier_signal.h",
+ "profiler/thread_delegate_posix.cc",
+ "profiler/thread_delegate_posix.h",
+ "threading/platform_thread_linux.cc",
+ ]
+ sources += [
+ "files/file_path_watcher_kqueue.cc",
+ "files/file_path_watcher_kqueue.h",
+ "files/file_path_watcher_bsd.cc",
+ "threading/platform_thread_bsd.cc",
+ ]
+ }
+
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2233,7 +2284,7 @@ jumbo_component("base") {
}
if (dep_libevent) {
@ -88,7 +105,7 @@
}
if (use_libevent) {
@@ -3482,7 +3518,7 @@ test("base_unittests") {
@@ -3607,7 +3658,7 @@ test("base_unittests") {
]
}
@ -97,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3531,7 +3567,7 @@ test("base_unittests") {
@@ -3628,7 +3679,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@ -106,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3542,7 +3578,7 @@ test("base_unittests") {
@@ -3639,7 +3690,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@ -115,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
@@ -3763,7 +3799,7 @@ test("base_unittests") {
@@ -3895,7 +3946,7 @@ test("base_unittests") {
}
}

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig 2023-02-08 09:03:45 UTC
--- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig 2023-05-31 08:12:17 UTC
+++ src/3rdparty/chromium/base/allocator/dispatcher/tls.h
@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator {
@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
partition_alloc::PartitionPageSize();
#elif BUILDFLAG(IS_APPLE)
constexpr static size_t AllocationChunkSize = 16384;

View file

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/BUILD.gn.orig 2023-10-11 18:22:24 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/BUILD.gn
@@ -562,7 +562,7 @@ source_set("allocator_shim") {
]
configs += [ ":mac_no_default_new_delete_symbols" ]
}
- if (is_chromeos || is_linux) {
+ if ((is_chromeos || is_linux) && !is_bsd) {
sources += [
"shim/allocator_shim_override_cpp_symbols.h",
"shim/allocator_shim_override_glibc_weak_symbols.h",

View file

@ -1,11 +1,11 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-09 06:31:50 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig 2023-09-13 12:11:42 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
#if defined(ARCH_CPU_64_BITS)
- #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD)
+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD)
// We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig 2022-11-30 08:12:58 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig 2023-09-13 12:11:42 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h
@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address,
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {

View file

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-09-24 10:57:32 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-09-13 12:11:42 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h
@@ -25,7 +25,7 @@
// elimination.
@ -9,7 +9,7 @@
// This should work for all POSIX (if needed), but currently all other
// supported OS/architecture combinations use either hard-coded values
// (such as x86) or have means to determine these values without needing
@@ -81,7 +81,7 @@ PageAllocationGranularityShift() {
@@ -92,7 +92,7 @@ PageAllocationGranularityShift() {
return 14; // 16kB
#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
return static_cast<size_t>(vm_page_shift);
@ -18,7 +18,7 @@
// arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
// page sizes. Retrieve from or initialize cache.
size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
@@ -102,7 +102,7 @@ PageAllocationGranularity() {
@@ -113,7 +113,7 @@ PageAllocationGranularity() {
// This is literally equivalent to |1 << PageAllocationGranularityShift()|
// below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
return vm_page_size;
@ -27,8 +27,8 @@
// arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
// initialize cache.
size_t size = page_characteristics.size.load(std::memory_order_relaxed);
@@ -141,7 +141,7 @@ SystemPageShift() {
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
@@ -152,7 +152,7 @@ SystemPageShift() {
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
SystemPageSize() {
#if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-04-05 11:05:06 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-09-13 12:11:42 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -380,8 +380,12 @@ bool TryRecommitSystemPagesInternal(
@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-05 11:05:06 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig 2023-07-16 15:47:57 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc
@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
}
#endif

View file

@ -1,11 +1,11 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-05 11:05:06 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni.orig 2023-10-11 18:22:24 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni
@@ -276,7 +276,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")
declare_args() {
- enable_pkeys = is_linux && target_cpu == "x64"
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64"
@@ -328,7 +328,7 @@ declare_args() {
# pkeys support is explicitly disabled in all Cronet builds, as some test
# dependencies that use partition_allocator are compiled in AOSP against a
# version of glibc that does not include pkeys syscall numbers.
- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
}
assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
"Pkeys are only supported on x64 linux")

View file

@ -0,0 +1,32 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h.orig 2023-04-28 17:01:32 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
@@ -24,9 +24,9 @@
// Annotate a function indicating it should not be inlined.
// Use like:
// NOINLINE void DoStuff() { ... }
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline)
+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(noinline)
#define PA_NOINLINE [[clang::noinline]]
-#elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline)
+#elif (defined(COMPILER_GCC) || defined(__clang__)) && PA_HAS_ATTRIBUTE(noinline)
#define PA_NOINLINE __attribute__((noinline))
#elif defined(COMPILER_MSVC)
#define PA_NOINLINE __declspec(noinline)
@@ -34,7 +34,7 @@
#define PA_NOINLINE
#endif
-#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
#define PA_ALWAYS_INLINE [[clang::always_inline]] inline
#elif defined(COMPILER_GCC) && defined(NDEBUG) && \
PA_HAS_ATTRIBUTE(always_inline)
@@ -53,7 +53,7 @@
// prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
// Use like:
// void NOT_TAIL_CALLED FooBar();
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called)
+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(not_tail_called)
#define PA_NOT_TAIL_CALLED [[clang::not_tail_called]]
#else
#define PA_NOT_TAIL_CALLED

View file

@ -0,0 +1,34 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-10-11 18:22:24 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc
@@ -12,11 +12,11 @@
#include <string.h>
#include <unistd.h>
-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE)
+#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
#include <link.h> // For ElfW() macro.
#endif
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
#define HAVE_DLADDR
#include <dlfcn.h>
#endif
@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug {
namespace {
-#if !BUILDFLAG(IS_APPLE)
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
constexpr size_t kBufferSize = 4096u;
@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_
}
#endif // !BUILDFLAG(IS_APPLE)
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
// Since /proc/self/maps is not available, use dladdr() to obtain module
// names and offsets inside the modules from the given addresses.
void PrintStackTraceInternal(void* const* trace, size_t size) {

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-07-22 17:30:31 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2023-09-13 12:11:42 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) {
@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) {
if (getentropy(output, output_length) == 0) {
return;
}
@ -9,5 +9,5 @@
+ return;
+ }
#endif
// If the OS-specific mechanisms didn't work, fall through to reading from
// If getrandom(2) above returned with an error and the /dev/urandom fallback
// took place on Linux/ChromeOS bots, they would fail with a CHECK in

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-04-05 11:05:06 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-10-11 18:22:24 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
#define PA_CONFIG_HAS_LINUX_KERNEL() \
@ -9,7 +9,7 @@
// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
@@ -237,7 +237,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
@ -18,7 +18,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
@@ -296,7 +296,7 @@ constexpr bool kUseLazyCommit = false;
@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false;
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \

View file

@ -1,20 +1,21 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-04-05 11:05:06 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-09-13 12:11:42 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
@@ -92,7 +92,7 @@ PartitionPageShift() {
@@ -95,7 +95,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -296,7 +296,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// When pointer compression is enabled, we cannot use large pools (at most
@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
- BUILDFLAG(ENABLE_POINTER_COMPRESSION)
+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \
+ BUILDFLAG(IS_BSD)
constexpr size_t kPoolMaxSize = 8 * kGiB;
#else
constexpr size_t kPoolMaxSize = 16 * kGiB;

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-03-09 06:31:50 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-08-17 07:33:31 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h
@@ -27,9 +27,13 @@ namespace internal {
@@ -28,9 +28,13 @@ namespace internal {
// the second one 16. We could technically return something different for
// malloc() and operator new(), but this would complicate things, and most of
// our allocations are presumably coming from operator new() anyway.

View file

@ -1,11 +0,0 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h.orig 2023-04-05 11:05:06 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h
@@ -143,7 +143,7 @@ struct SlotSpanMetadata {
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan =
4 * (1 << 14) / kSmallestBucket;
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
// so we use the 16 kiB maximum (64 kiB will crash).

View file

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page_constants.h.orig 2023-08-17 07:33:31 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_page_constants.h
@@ -16,7 +16,7 @@ namespace partition_alloc::internal {
// (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
// so we use the 16 kiB maximum (64 kiB will crash).

View file

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig 2023-04-05 11:05:06 UTC
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig 2023-10-11 18:22:24 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc
@@ -42,7 +42,7 @@
@@ -47,7 +47,7 @@
#include "wow64apiset.h"
#endif
@ -9,7 +9,7 @@
#include <pthread.h>
#endif
@@ -245,7 +245,7 @@ void PartitionAllocMallocInitOnce() {
@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -339,7 +339,7 @@ static size_t PartitionPurgeSlotSpan(
@@ -379,7 +379,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
@@ -811,7 +811,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
@@ -948,7 +948,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));

Some files were not shown because too many files have changed in this diff Show more