diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2023-12-01 00:18:14 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2023-12-01 18:16:47 +0000 |
| commit | 8adbabc798f51c5d8bc6433d30b7c6c5c5c96eba (patch) | |
| tree | 3eaee83703eab98efeebc1848df8ce80c5040a8b | |
| parent | 895d7f8424c3541efaf0117ad25729836c829fa2 (diff) | |
| download | ports-8adbabc798f51c5d8bc6433d30b7c6c5c5c96eba.tar.gz ports-8adbabc798f51c5d8bc6433d30b7c6c5c5c96eba.zip | |
Qt6: Update to 6.6.1
As a patch release, Qt 6.6.1 does not introduce any new features but
contains more than 400 bug fixes, security updates, and other
improvements to the top of the Qt 6.6.0 release. See more information
about the most important changes and bug fixes from the Qt 6.6.1 release
note.
To allow building www/qt6-webengine without CUPS, a CUPS option has been
added and the Pdf module has been split out to a new port: print/qt6-pdf.
This also allows building devel/py-qt6-pyqt without pulling in the unused
WebEngine module. Fixes [1].
Remove a lot of unused dependencies. Fixes [2]. Also remove inconsistent
WWW lines from the individual Makefiles as WWW is alreay defined in
Mk/Uses/qt-dist.mk. [3]
Announcement: https://www.qt.io/blog/qt-6.6.1-released
Rel note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md
PR: 271111 [1], 268692 [2]
Reported by: echoxxzz <echoxxzz@gmail.com> [1],
Matthieu Volat <mazhe@alkumuna.eu> [2],
lwhsu (via #freebsd-desktop IRC) [3]
MFH: 2023Q4
Security: 6d9c6aae-5eb1-11ee-8290-a8a1599412c6,
07ee8c14-68f1-11ee-8290-a8a1599412c6,
a1e27775-7a61-11ee-8290-a8a1599412c6,
0da4db89-84bf-11ee-8290-a8a1599412c6
110 files changed, 697 insertions, 771 deletions
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 67b419b47cf5..3bb305129a39 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -23,7 +23,7 @@ _QT_MK_INCLUDED= qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 5 6 QT5_VERSION?= 5.15.11 -QT6_VERSION?= 6.6.0 +QT6_VERSION?= 6.6.1 PYSIDE6_VERSION?= 6.6.0 # We accept the Qt version to be passed by either or all of the three mk files. @@ -160,7 +160,7 @@ _USE_QT5_ONLY= assistant buildtools concurrent core dbus \ _USE_QT5_ONLY+= sql-ibase . endif -_USE_QT6_ONLY= 5compat base coap graphs httpserver languageserver lottie positioning \ +_USE_QT6_ONLY= 5compat base coap graphs httpserver languageserver lottie pdf positioning \ quick3dphysics quickeffectmaker shadertools tools translations \ sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc @@ -274,6 +274,9 @@ qt-opengl_LIB= libQt${_QT_LIBVER}OpenGL.so qt-paths_PORT= sysutils/${_QT_RELNAME}-qtpaths qt-paths_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtpaths +qt-pdf_PORT= print/${_QT_RELNAME}-pdf +qt-pdf_LIB= libQt${_QT_LIBVER}Pdf.so + qt-pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool qt-pixeltool_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/pixeltool diff --git a/accessibility/qt6-speech/Makefile b/accessibility/qt6-speech/Makefile index de9d255cf67d..df0b8bde11e3 100644 --- a/accessibility/qt6-speech/Makefile +++ b/accessibility/qt6-speech/Makefile @@ -7,7 +7,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Accessibilty features for Qt6 USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative multimedia OPTIONS_DEFINE= ALSA diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo index 865816ae135c..7850daa2e10b 100644 --- a/accessibility/qt6-speech/distinfo +++ b/accessibility/qt6-speech/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049627 -SHA256 (KDE/Qt/6.6.0/qtspeech-everywhere-src-6.6.0.tar.xz) = 969bdbff826808f0cfd80e8f2e357f00174489f30d9f895390cf59814abe9f9c -SIZE (KDE/Qt/6.6.0/qtspeech-everywhere-src-6.6.0.tar.xz) = 270044 +TIMESTAMP = 1701101665 +SHA256 (KDE/Qt/6.6.1/qtspeech-everywhere-src-6.6.1.tar.xz) = a28c2052c95144cf25f2f234e5334df364818da2b0fc091e369418869c925899 +SIZE (KDE/Qt/6.6.1/qtspeech-everywhere-src-6.6.1.tar.xz) = 270752 diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo index ef8f501115f4..497155ac308c 100644 --- a/comms/qt6-connectivity/distinfo +++ b/comms/qt6-connectivity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049631 -SHA256 (KDE/Qt/6.6.0/qtconnectivity-everywhere-src-6.6.0.tar.xz) = 1c29c26247c28ef19b9ca87c38b4d61a1f94ee9021897962e0d5ba215f1c4010 -SIZE (KDE/Qt/6.6.0/qtconnectivity-everywhere-src-6.6.0.tar.xz) = 989076 +TIMESTAMP = 1701101668 +SHA256 (KDE/Qt/6.6.1/qtconnectivity-everywhere-src-6.6.1.tar.xz) = 5b468d4649464ff983746c5e9129b731de639ac835d35857f5d87cd4258e0645 +SIZE (KDE/Qt/6.6.1/qtconnectivity-everywhere-src-6.6.1.tar.xz) = 989544 diff --git a/comms/qt6-sensors/Makefile b/comms/qt6-sensors/Makefile index 8c15b4d10913..61b8e7f7ae23 100644 --- a/comms/qt6-sensors/Makefile +++ b/comms/qt6-sensors/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt sensors module -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo index 0c80347f50b4..356abc05cb59 100644 --- a/comms/qt6-sensors/distinfo +++ b/comms/qt6-sensors/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049639 -SHA256 (KDE/Qt/6.6.0/qtsensors-everywhere-src-6.6.0.tar.xz) = 28f0be5d4eac103ba3bb660ea61806d0e193c1fab949d1c95f2cb7cb39d84498 -SIZE (KDE/Qt/6.6.0/qtsensors-everywhere-src-6.6.0.tar.xz) = 1485724 +TIMESTAMP = 1701101671 +SHA256 (KDE/Qt/6.6.1/qtsensors-everywhere-src-6.6.1.tar.xz) = bd13ee815c2fc39ac9e5a2e34f3e7055f972d14b949f00d6c6ec5347783799d3 +SIZE (KDE/Qt/6.6.1/qtsensors-everywhere-src-6.6.1.tar.xz) = 1502740 diff --git a/comms/qt6-serialbus/Makefile b/comms/qt6-serialbus/Makefile index 2fd248dcf395..cf5551a70f96 100644 --- a/comms/qt6-serialbus/Makefile +++ b/comms/qt6-serialbus/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt functions to access industrial bus systems -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo index 35bc3caaab3c..137174070ed6 100644 --- a/comms/qt6-serialbus/distinfo +++ b/comms/qt6-serialbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049641 -SHA256 (KDE/Qt/6.6.0/qtserialbus-everywhere-src-6.6.0.tar.xz) = 18ccf07152ea995c6c1ef3ce9120b6baea7017a09626ec1c5bf4faa6dd29b94c -SIZE (KDE/Qt/6.6.0/qtserialbus-everywhere-src-6.6.0.tar.xz) = 554416 +TIMESTAMP = 1701101674 +SHA256 (KDE/Qt/6.6.1/qtserialbus-everywhere-src-6.6.1.tar.xz) = 5c145e630b30a1c204e787c46833bb68d9bcece31343b588a6788711f49ef7ac +SIZE (KDE/Qt/6.6.1/qtserialbus-everywhere-src-6.6.1.tar.xz) = 554516 diff --git a/comms/qt6-serialport/Makefile b/comms/qt6-serialport/Makefile index d3eaec344f43..111c23acc4b1 100644 --- a/comms/qt6-serialport/Makefile +++ b/comms/qt6-serialport/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt functions to access serial ports -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libudev.so:devel/libudev-devd diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo index 8388a97d4bb7..1a997d2215c1 100644 --- a/comms/qt6-serialport/distinfo +++ b/comms/qt6-serialport/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049643 -SHA256 (KDE/Qt/6.6.0/qtserialport-everywhere-src-6.6.0.tar.xz) = ecfcbbf1c47a67ff599a409bf7682fed416f797860c01c934f5a78c336da4065 -SIZE (KDE/Qt/6.6.0/qtserialport-everywhere-src-6.6.0.tar.xz) = 279784 +TIMESTAMP = 1701101676 +SHA256 (KDE/Qt/6.6.1/qtserialport-everywhere-src-6.6.1.tar.xz) = 96fc233d5cbcac5048c6020dcfbd6cec8a6a8334eed0a283b33d58afc6d2aed8 +SIZE (KDE/Qt/6.6.1/qtserialport-everywhere-src-6.6.1.tar.xz) = 279564 diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile index 943242d3885e..b7f4abfe8308 100644 --- a/databases/qt6-base_sqldriver/Makefile +++ b/databases/qt6-base_sqldriver/Makefile @@ -8,7 +8,6 @@ PKGNAMESUFFIX= _sqldriver-${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Qt base (${FLAVOR} sqldriver) -WWW= https://www.qt.io/ FLAVORS= sqlite mysql odbc psql FLAVOR?= sqlite diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo index 319c9315f8ec..d2a3bc746c62 100644 --- a/databases/qt6-base_sqldriver/distinfo +++ b/databases/qt6-base_sqldriver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049668 -SHA256 (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e -SIZE (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 48350308 +TIMESTAMP = 1701101726 +SHA256 (KDE/Qt/6.6.1/qtbase-everywhere-src-6.6.1.tar.xz) = 450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7 +SIZE (KDE/Qt/6.6.1/qtbase-everywhere-src-6.6.1.tar.xz) = 48370760 diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile index 8bc25e53817b..a03173ba60ab 100644 --- a/devel/py-qt6-pyqt/Makefile +++ b/devel/py-qt6-pyqt/Makefile @@ -1,5 +1,6 @@ PORTNAME= pyqt PORTVERSION= ${PYQT_VERSION} +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- @@ -22,22 +23,12 @@ USE_LOCALE= C.UTF-8 USE_PYTHON= concurrent flavors USE_PYQT= pysip qtbuilder sip USE_QT= base connectivity declarative imageformats multimedia \ - positioning quick3d remoteobjects sensors serialport \ + pdf positioning quick3d remoteobjects sensors serialport \ shadertools speech svg tools translations webchannel \ websockets PORTSCOUT?= limit:^${_QT_VERSION:R} -.include <bsd.port.pre.mk> - -.if ${ARCH} == amd64 || ${ARCH} == i386 -USE_QT+= webengine -PLIST_SUB+= WEBENGINE="" -.else -SIP_ARGS+= --disable QtPdf --disable QtPdfWidgets -PLIST_SUB+= WEBENGINE="@comment " -.endif - post-extract: ${RM} -r ${WRKSRC}/pyuic/uic/port_v2 @@ -51,4 +42,4 @@ post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \ -name '*.so*' -exec ${STRIP_CMD} {} + -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist index 019bdb63c1f8..1b92e9fe76e6 100644 --- a/devel/py-qt6-pyqt/pkg-plist +++ b/devel/py-qt6-pyqt/pkg-plist @@ -18,8 +18,8 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/QtNfc.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6/QtOpenGL.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6/QtOpenGLWidgets.abi%%PYTHON_MAJOR_VER%%.so -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/QtPdf.abi%%PYTHON_MAJOR_VER%%.so -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/QtPdfWidgets.abi%%PYTHON_MAJOR_VER%%.so +%%PYTHON_SITELIBDIR%%/PyQt6/QtPdf.abi%%PYTHON_MAJOR_VER%%.so +%%PYTHON_SITELIBDIR%%/PyQt6/QtPdfWidgets.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6/QtPositioning.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6/QtPrintSupport.abi%%PYTHON_MAJOR_VER%%.so %%PYTHON_SITELIBDIR%%/PyQt6/QtQml.abi%%PYTHON_MAJOR_VER%%.so @@ -465,21 +465,21 @@ bin/pyuic6 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/QtOpenGLWidgets.toml %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/QtOpenGLWidgetsmod.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtOpenGLWidgets/qopenglwidget.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdf.toml -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdfmod.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfbookmarkmodel.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocument.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocumentrenderoptions.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflink.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflinkmodel.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagenavigator.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagerenderer.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfsearchmodel.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfselection.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgets.toml -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgetsmod.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfpageselector.sip -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfview.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdf.toml +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/QtPdfmod.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfbookmarkmodel.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocument.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfdocumentrenderoptions.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflink.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdflinkmodel.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagenavigator.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfpagerenderer.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfsearchmodel.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdf/qpdfselection.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgets.toml +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/QtPdfWidgetsmod.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfpageselector.sip +%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPdfWidgets/qpdfview.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioning.toml %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/QtPositioningmod.sip %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtPositioning/qgeoaddress.sip diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile index 604d40d9c4c0..75861d3da2c0 100644 --- a/devel/pyside6/Makefile +++ b/devel/pyside6/Makefile @@ -1,5 +1,6 @@ PORTNAME= pyside6 DISTVERSION= ${PYSIDE6_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +20,7 @@ USE_GL= gl USE_LDCONFIG= yes USE_PYTHON= flavors USE_QT= 3d base charts connectivity datavis3d declarative doc graphs \ - httpserver imageformats location multimedia networkauth \ + httpserver imageformats location multimedia networkauth pdf \ positioning quick3d quicktimeline remoteobjects scxml sensors \ serialbus serialport shadertools speech svg tools translations \ wayland webchannel websockets diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist index 5dbc257f06d7..972c3f66de1b 100644 --- a/devel/pyside6/pkg-plist +++ b/devel/pyside6/pkg-plist @@ -30,8 +30,8 @@ include/PySide6/QtNetworkAuth/pyside6_qtnetworkauth_python.h include/PySide6/QtNfc/pyside6_qtnfc_python.h include/PySide6/QtOpenGL/pyside6_qtopengl_python.h include/PySide6/QtOpenGLWidgets/pyside6_qtopenglwidgets_python.h -%%WEBENGINE%%include/PySide6/QtPdf/pyside6_qtpdf_python.h -%%WEBENGINE%%include/PySide6/QtPdfWidgets/pyside6_qtpdfwidgets_python.h +include/PySide6/QtPdf/pyside6_qtpdf_python.h +include/PySide6/QtPdfWidgets/pyside6_qtpdfwidgets_python.h include/PySide6/QtPositioning/pyside6_qtpositioning_python.h include/PySide6/QtPrintSupport/pyside6_qtprintsupport_python.h include/PySide6/QtQml/pyside6_qtqml_python.h @@ -184,10 +184,10 @@ lib/libpyside6qml.abi3.so.%%DISTVERSION%% %%PYTHON_SITELIBDIR%%/PySide6/QtOpenGL.pyi %%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.abi3.so %%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.pyi -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.abi3.so -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.pyi -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.abi3.so -%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.pyi +%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.pyi +%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.abi3.so +%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.pyi %%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.abi3.so %%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.pyi %%PYTHON_SITELIBDIR%%/PySide6/QtPrintSupport.abi3.so @@ -349,8 +349,8 @@ share/PySide6/typesystems/typesystem_opengl_modifications4_5.xml share/PySide6/typesystems/typesystem_opengl_modifications4_5_core.xml share/PySide6/typesystems/typesystem_opengl_modifications_va.xml share/PySide6/typesystems/typesystem_openglwidgets.xml -%%WEBENGINE%%share/PySide6/typesystems/typesystem_pdf.xml -%%WEBENGINE%%share/PySide6/typesystems/typesystem_pdfwidgets.xml +share/PySide6/typesystems/typesystem_pdf.xml +share/PySide6/typesystems/typesystem_pdfwidgets.xml share/PySide6/typesystems/typesystem_positioning.xml share/PySide6/typesystems/typesystem_printsupport.xml share/PySide6/typesystems/typesystem_printsupport_common.xml diff --git a/devel/qt6-5compat/Makefile b/devel/qt6-5compat/Makefile index 87f795e038a3..1523282d4425 100644 --- a/devel/qt6-5compat/Makefile +++ b/devel/qt6-5compat/Makefile @@ -5,19 +5,13 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 module that contains unsupported Qt 5 APIs -WWW= https://qt-project.org LIB_DEPENDS= libicuuc.so:devel/icu \ - libdouble-conversion.so:devel/double-conversion \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd + libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gettext-runtime gl gnome \ +USES= cmake compiler:c++17-lang gl \ qt-dist:6 -USE_GL= gl opengl -USE_GNOME= glib20 +USE_GL= opengl USE_QT= base declarative shadertools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo index 386803211884..3d146fb6c8ea 100644 --- a/devel/qt6-5compat/distinfo +++ b/devel/qt6-5compat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049679 -SHA256 (KDE/Qt/6.6.0/qt5compat-everywhere-src-6.6.0.tar.xz) = 3d85edb66126f712266dcbfc6cd00383d46cc6d66c8b84607ca21e2bc71a8fca -SIZE (KDE/Qt/6.6.0/qt5compat-everywhere-src-6.6.0.tar.xz) = 14638540 +TIMESTAMP = 1701101740 +SHA256 (KDE/Qt/6.6.1/qt5compat-everywhere-src-6.6.1.tar.xz) = 0e1d15b6eda4172383208109d957257c8fa26a8a881f2901a4e9f347a31bc1f2 +SIZE (KDE/Qt/6.6.1/qt5compat-everywhere-src-6.6.1.tar.xz) = 14640664 diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 89ec755c6049..048dc7a6f13c 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt base (core, gui, widgets, network,...) -WWW= https://www.qt.io/ BUILD_DEPENDS= xml:textproc/xmlstarlet \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ @@ -14,40 +13,24 @@ LIB_DEPENDS= \ libatk-1.0.so:accessibility/at-spi2-core \ libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ - libavahi-client.so:net/avahi-app \ libbrotlidec.so:archivers/brotli \ libdbus-1.so:devel/dbus \ libdouble-conversion.so:devel/double-conversion \ libdrm.so:graphics/libdrm \ - libepoll-shim.so:devel/libepoll-shim \ - libepoxy.so:graphics/libepoxy \ libevdev.so:devel/libevdev \ - libexpat.so:textproc/expat2 \ - libffi.so:devel/libffi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libfribidi.so:converters/fribidi \ - libgmp.so:math/gmp \ - libgnutls.so:security/gnutls \ libgraphite2.so:graphics/graphite2 \ - libgudev-1.0.so:devel/libgudev \ libharfbuzz.so:print/harfbuzz \ libicui18n.so:devel/icu \ - libidn2.so:dns/libidn2 \ libinput.so:x11/libinput \ libintl.so:devel/gettext-runtime \ libjpeg.so:graphics/jpeg-turbo \ libmtdev.so:devel/libmtdev \ - libnettle.so:security/nettle \ - libp11-kit.so:security/p11-kit \ - libpcre.so:devel/pcre \ libpcre2-16.so:devel/pcre2 \ libpng16.so:graphics/png \ - libtasn1.so:security/libtasn1 \ libudev.so:devel/libudev-devd \ - libunistring.so:devel/libunistring \ libvulkan.so:graphics/vulkan-loader \ - libwacom.so:x11/libwacom \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd @@ -94,8 +77,7 @@ X11_LIB_DEPENDS= libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ - libxcb-render-util.so:x11/xcb-util-renderutil \ - libxcb-util.so:x11/xcb-util + libxcb-render-util.so:x11/xcb-util-renderutil .include <bsd.port.pre.mk> diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo index c3e7e528804d..8fb71367743a 100644 --- a/devel/qt6-base/distinfo +++ b/devel/qt6-base/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049681 -SHA256 (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e -SIZE (KDE/Qt/6.6.0/qtbase-everywhere-src-6.6.0.tar.xz) = 48350308 +TIMESTAMP = 1701101741 +SHA256 (KDE/Qt/6.6.1/qtbase-everywhere-src-6.6.1.tar.xz) = 450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7 +SIZE (KDE/Qt/6.6.1/qtbase-everywhere-src-6.6.1.tar.xz) = 48370760 diff --git a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake index b6b158107631..a1e02bb2b362 100644 --- a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake +++ b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake @@ -1,6 +1,6 @@ ---- cmake/QtFlagHandlingHelpers.cmake.orig 2023-09-21 19:24:26 UTC +--- cmake/QtFlagHandlingHelpers.cmake.orig 2023-11-15 13:58:42 UTC +++ cmake/QtFlagHandlingHelpers.cmake -@@ -103,6 +103,10 @@ function(qt_internal_add_link_flags_no_undefined targe +@@ -132,6 +132,10 @@ function(qt_internal_add_link_flags_no_undefined targe set(no_undefined_flag "-Wl,--no-undefined") endif() diff --git a/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp b/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp deleted file mode 100644 index c437e8d69127..000000000000 --- a/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/gui/platform/unix/qxkbcommon.cpp.orig 2023-09-21 19:24:26 UTC -+++ src/gui/platform/unix/qxkbcommon.cpp -@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray( - Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>, - Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>, - Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>, -- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>, -- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>, -- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>, -- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>, - - // Special keys from X.org - This include multimedia keys, - // wireless/bluetooth/uwb keys, special launcher keys, etc. diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp index 4eab6daffac2..902f6ae2be64 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp @@ -1,4 +1,4 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2023-09-13 16:02:48 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2023-11-15 13:58:42 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp @@ -112,23 +112,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) @@ -59,7 +59,17 @@ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) -@@ -289,12 +308,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const +@@ -214,7 +233,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** + DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return) + DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) + DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) ++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER >= 0x3060000fL) + DEFINEFUNC2(int, ASN1_TIME_to_tm, const ASN1_TIME *s, s, struct tm *tm, tm, return 0, return) ++#endif + DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) + DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) + DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return nullptr, return) +@@ -289,12 +310,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -1, return) DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) @@ -74,18 +84,18 @@ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -751,8 +772,8 @@ static LoadedOpenSsl loadOpenSsl() - #endif - #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so +@@ -761,8 +784,8 @@ static LoadedOpenSsl loadOpenSsl() + libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion); + #elif defined(SHLIB_VERSION_NUMBER) // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> - libssl->setFileNameAndVersion("ssl"_L1, SHLIB_VERSION_NUMBER ""_L1); - libcrypto->setFileNameAndVersion("crypto"_L1, SHLIB_VERSION_NUMBER ""_L1); + libssl->setFileNameAndVersion("%%OPENSSLLIB%%/libssl"_L1, SHLIB_VERSION_NUMBER ""_L1); + libcrypto->setFileNameAndVersion("%%OPENSSLLIB%%/libcrypto"_L1, SHLIB_VERSION_NUMBER ""_L1); + #endif // OPENSSL_SHLIB_VERSION + if (libcrypto->load() && libssl->load()) { - // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found - return result; -@@ -783,8 +804,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -795,8 +818,8 @@ static LoadedOpenSsl loadOpenSsl() libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1); libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1); # else @@ -96,7 +106,7 @@ # endif if (libcrypto->load() && libssl->load()) { // libssl.so.0 and libcrypto.so.0 found -@@ -853,21 +874,34 @@ bool q_resolveOpenSslSymbols() +@@ -865,21 +888,34 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) RESOLVEFUNC(EVP_PKEY_up_ref) @@ -131,7 +141,7 @@ #ifdef TLS1_3_VERSION RESOLVEFUNC(SSL_CTX_set_ciphersuites) RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -949,7 +983,9 @@ bool q_resolveOpenSslSymbols() +@@ -961,7 +997,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) @@ -142,7 +152,7 @@ RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -1044,12 +1080,14 @@ bool q_resolveOpenSslSymbols() +@@ -1056,12 +1094,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -157,7 +167,7 @@ RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -1109,7 +1147,9 @@ bool q_resolveOpenSslSymbols() +@@ -1121,7 +1161,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(RSA_free) RESOLVEFUNC(DH_bits) diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp index b99dd8d25cfd..2c822ea8c44c 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp @@ -18,7 +18,7 @@ QDateTime result; tm lTime; -+#ifdef LIBRESSL_VERSION_NUMBER ++#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x3060000fL) + const char *data; + size_t len; + int type; diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index 4eaf2762f2cb..f3b5273eda02 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -385,6 +385,7 @@ bin/qmake6 %%QT_INCDIR%%/QtCore/QObjectList %%QT_INCDIR%%/QtCore/QOperatingSystemVersion %%QT_INCDIR%%/QtCore/QOperatingSystemVersionBase +%%QT_INCDIR%%/QtCore/QOperatingSystemVersionUnexported %%QT_INCDIR%%/QtCore/QOverload %%QT_INCDIR%%/QtCore/QPair %%QT_INCDIR%%/QtCore/QParallelAnimationGroup @@ -1034,6 +1035,7 @@ bin/qmake6 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengineex_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpainter_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpainterpath_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpalette_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpathclipper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpathsimplifier_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpdf_p.h @@ -3098,10 +3100,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_MKSPECDIR%%/common/msvc-based-version.conf %%QT_MKSPECDIR%%/common/msvc-desktop.conf %%QT_MKSPECDIR%%/common/msvc-version.conf -%%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf -%%QT_MKSPECDIR%%/common/nacl/g++-nacl64.conf -%%QT_MKSPECDIR%%/common/nacl/nacl-base.conf -%%QT_MKSPECDIR%%/common/nacl/qplatformdefs.h %%QT_MKSPECDIR%%/common/posix/qplatformdefs.h %%QT_MKSPECDIR%%/common/qcc-base-qnx-aarch64le.conf %%QT_MKSPECDIR%%/common/qcc-base-qnx-armle-v7.conf @@ -3251,7 +3249,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_MKSPECDIR%%/features/designer_defines.prf %%QT_MKSPECDIR%%/features/device_config.prf %%QT_MKSPECDIR%%/features/egl.prf -%%QT_MKSPECDIR%%/features/entrypoint.prf %%QT_MKSPECDIR%%/features/exceptions.prf %%QT_MKSPECDIR%%/features/exceptions_off.prf %%QT_MKSPECDIR%%/features/exclusive_builds.prf @@ -3508,10 +3505,6 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake %%QT_MKSPECDIR%%/unsupported/macx-watchos-clang/Info.plist.lib %%QT_MKSPECDIR%%/unsupported/macx-watchos-clang/qmake.conf %%QT_MKSPECDIR%%/unsupported/macx-watchos-clang/qplatformdefs.h -%%QT_MKSPECDIR%%/unsupported/nacl-g++/qmake.conf -%%QT_MKSPECDIR%%/unsupported/nacl-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/unsupported/nacl64-g++/qmake.conf -%%QT_MKSPECDIR%%/unsupported/nacl64-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/qnx-X11-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/qnx-X11-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/vxworks-ppc-dcc/qmake.conf diff --git a/devel/qt6-languageserver/Makefile b/devel/qt6-languageserver/Makefile index 0f7c03bf51fd..7a535c0f90b1 100644 --- a/devel/qt6-languageserver/Makefile +++ b/devel/qt6-languageserver/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 implementation of the Language Server Protocol -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo index 00fcad36b4d1..5e54b7d6d245 100644 --- a/devel/qt6-languageserver/distinfo +++ b/devel/qt6-languageserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049688 -SHA256 (KDE/Qt/6.6.0/qtlanguageserver-everywhere-src-6.6.0.tar.xz) = aec93019862bf63769206fe56a2230cd9e37994806a4bf28415203b4eb9a490e -SIZE (KDE/Qt/6.6.0/qtlanguageserver-everywhere-src-6.6.0.tar.xz) = 154304 +TIMESTAMP = 1701101743 +SHA256 (KDE/Qt/6.6.1/qtlanguageserver-everywhere-src-6.6.1.tar.xz) = b0761f5603a989df921df10ff33e70d7b98d2a33b17679a7e84eb4f224e73e6f +SIZE (KDE/Qt/6.6.1/qtlanguageserver-everywhere-src-6.6.1.tar.xz) = 154312 diff --git a/devel/qt6-location/Makefile b/devel/qt6-location/Makefile index 295bfb0a0be4..7754c53784d2 100644 --- a/devel/qt6-location/Makefile +++ b/devel/qt6-location/Makefile @@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 API to create viable mapping solutions -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative positioning shadertools .include <bsd.port.mk> diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo index 2355de5577e8..c0b0e0f83f59 100644 --- a/devel/qt6-location/distinfo +++ b/devel/qt6-location/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049692 -SHA256 (KDE/Qt/6.6.0/qtlocation-everywhere-src-6.6.0.tar.xz) = f5968be76108bf22af334b403027cf0a859284cb824250e728bb8daca2d70794 -SIZE (KDE/Qt/6.6.0/qtlocation-everywhere-src-6.6.0.tar.xz) = 3035992 +TIMESTAMP = 1701101748 +SHA256 (KDE/Qt/6.6.1/qtlocation-everywhere-src-6.6.1.tar.xz) = 8dbe2b62e37278c83c5acdb536c3e4c313ec0bac5380d020873db692199f9c29 +SIZE (KDE/Qt/6.6.1/qtlocation-everywhere-src-6.6.1.tar.xz) = 3035980 diff --git a/devel/qt6-positioning/Makefile b/devel/qt6-positioning/Makefile index 011ecbe781d6..714fb0c005a5 100644 --- a/devel/qt6-positioning/Makefile +++ b/devel/qt6-positioning/Makefile @@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 API to provide positioning information via QML and C++ -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl -USE_QT= base declarative serialbus serialport +USE_GL= opengl +USE_QT= base declarative serialport .include <bsd.port.mk> diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo index 57b53eb9baee..521860858430 100644 --- a/devel/qt6-positioning/distinfo +++ b/devel/qt6-positioning/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049695 -SHA256 (KDE/Qt/6.6.0/qtpositioning-everywhere-src-6.6.0.tar.xz) = 8d6520fa3c759ed33eaea7cb1aa7e1e7ec999f828e496a6c592847d61f0fa539 -SIZE (KDE/Qt/6.6.0/qtpositioning-everywhere-src-6.6.0.tar.xz) = 1513304 +TIMESTAMP = 1701101751 +SHA256 (KDE/Qt/6.6.1/qtpositioning-everywhere-src-6.6.1.tar.xz) = 3ddac73f3b12b8516498cb5d2f9ade058a1a9368f74188d48ed27032833816b8 +SIZE (KDE/Qt/6.6.1/qtpositioning-everywhere-src-6.6.1.tar.xz) = 1513456 diff --git a/devel/qt6-remoteobjects/Makefile b/devel/qt6-remoteobjects/Makefile index 3c3493a99750..fe9684b8f7b9 100644 --- a/devel/qt6-remoteobjects/Makefile +++ b/devel/qt6-remoteobjects/Makefile @@ -5,12 +5,11 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt6 Remote Objects module -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative .include <bsd.port.mk> diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo index ecac797f50f2..f01d76f67d37 100644 --- a/devel/qt6-remoteobjects/distinfo +++ b/devel/qt6-remoteobjects/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049697 -SHA256 (KDE/Qt/6.6.0/qtremoteobjects-everywhere-src-6.6.0.tar.xz) = 261194e35bb9420225f095c58a5a549686797a3d2b7ea6f0d582d7d681f1f76b -SIZE (KDE/Qt/6.6.0/qtremoteobjects-everywhere-src-6.6.0.tar.xz) = 527892 +TIMESTAMP = 1701101753 +SHA256 (KDE/Qt/6.6.1/qtremoteobjects-everywhere-src-6.6.1.tar.xz) = b89e5898ff8bc0fca03e07cde97158ad02a0e082971e0637c4db69cd06fb9599 +SIZE (KDE/Qt/6.6.1/qtremoteobjects-everywhere-src-6.6.1.tar.xz) = 542624 diff --git a/devel/qt6-scxml/Makefile b/devel/qt6-scxml/Makefile index cff348d1ee3e..74d5c4cd01b9 100644 --- a/devel/qt6-scxml/Makefile +++ b/devel/qt6-scxml/Makefile @@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt6 SCXML module -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative .include <bsd.port.mk> diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo index 587d69fb6297..0e689b56a685 100644 --- a/devel/qt6-scxml/distinfo +++ b/devel/qt6-scxml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049705 -SHA256 (KDE/Qt/6.6.0/qtscxml-everywhere-src-6.6.0.tar.xz) = 57ecd0db5d8b063d0334c4b21461585b4904d4884c88de125bd72e967e8a1043 -SIZE (KDE/Qt/6.6.0/qtscxml-everywhere-src-6.6.0.tar.xz) = 1175844 +TIMESTAMP = 1701101756 +SHA256 (KDE/Qt/6.6.1/qtscxml-everywhere-src-6.6.1.tar.xz) = 874bc57af4399399e36424288d5e23fd8ea18c20ad9e0adb1ae3fbd420dd0897 +SIZE (KDE/Qt/6.6.1/qtscxml-everywhere-src-6.6.1.tar.xz) = 1176684 diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile index b789b10ffc85..8337b56058b6 100644 --- a/devel/qt6-tools/Makefile +++ b/devel/qt6-tools/Makefile @@ -5,29 +5,15 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \ - libdouble-conversion.so:devel/double-conversion \ - libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicudata.so:devel/icu \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libxkbcommon.so:x11/libxkbcommon \ +LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd -USES= cmake compiler:c++17-lang gettext-runtime gl gnome llvm:lib python:build xorg \ +USES= cmake compiler:c++17-lang gl llvm:lib python:build \ qt-dist:6 USE_GL= opengl -USE_GNOME= glib20 USE_QT= base declarative -USE_XORG= x11 xau xcb xdmcp USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} CMAKE_ARGS+= -DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \ diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo index b35d54b4aa90..eeab1507260c 100644 --- a/devel/qt6-tools/distinfo +++ b/devel/qt6-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049711 -SHA256 (KDE/Qt/6.6.0/qttools-everywhere-src-6.6.0.tar.xz) = 4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 -SIZE (KDE/Qt/6.6.0/qttools-everywhere-src-6.6.0.tar.xz) = 8582212 +TIMESTAMP = 1701101767 +SHA256 (KDE/Qt/6.6.1/qttools-everywhere-src-6.6.1.tar.xz) = 4939105a7345ab4e19e7caee8654a836e65bd41910359623e0f233f3aff0914a +SIZE (KDE/Qt/6.6.1/qttools-everywhere-src-6.6.1.tar.xz) = 8583536 diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist index c4aac07876f2..4f94015b3e5f 100644 --- a/devel/qt6-tools/pkg-plist +++ b/devel/qt6-tools/pkg-plist @@ -99,8 +99,11 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtDesigner/QDesignerActionEditorInterface %%QT_INCDIR%%/QtDesigner/QDesignerComponents %%QT_INCDIR%%/QtDesigner/QDesignerContainerExtension +%%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetCollectionInterface +%%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetInterface %%QT_INCDIR%%/QtDesigner/QDesignerDnDItemInterface %%QT_INCDIR%%/QtDesigner/QDesignerDynamicPropertySheetExtension +%%QT_INCDIR%%/QtDesigner/QDesignerExportWidget %%QT_INCDIR%%/QtDesigner/QDesignerExtraInfoExtension %%QT_INCDIR%%/QtDesigner/QDesignerFormEditorInterface %%QT_INCDIR%%/QtDesigner/QDesignerFormEditorPluginInterface @@ -157,6 +160,7 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtDesigner/abstractwidgetdatabase.h %%QT_INCDIR%%/QtDesigner/abstractwidgetfactory.h %%QT_INCDIR%%/QtDesigner/container.h +%%QT_INCDIR%%/QtDesigner/customwidget.h %%QT_INCDIR%%/QtDesigner/default_extensionfactory.h %%QT_INCDIR%%/QtDesigner/dynamicpropertysheet.h %%QT_INCDIR%%/QtDesigner/extension.h @@ -168,6 +172,7 @@ bin/qtplugininfo6 %%QT_INCDIR%%/QtDesigner/propertysheet.h %%QT_INCDIR%%/QtDesigner/qdesigner_components.h %%QT_INCDIR%%/QtDesigner/qdesigner_components_global.h +%%QT_INCDIR%%/QtDesigner/qdesignerexportwidget.h %%QT_INCDIR%%/QtDesigner/qextensionmanager.h %%QT_INCDIR%%/QtDesigner/qtdesignerversion.h %%QT_INCDIR%%/QtDesigner/sdk_global.h diff --git a/devel/qt6-translations/Makefile b/devel/qt6-translations/Makefile index f1a9e8458f18..664309891c7c 100644 --- a/devel/qt6-translations/Makefile +++ b/devel/qt6-translations/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 translation module -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers diff --git a/devel/qt6-translations/distinfo b/devel/qt6-translations/distinfo index f937cd76d0ae..b2d50f964ed1 100644 --- a/devel/qt6-translations/distinfo +++ b/devel/qt6-translations/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049713 -SHA256 (KDE/Qt/6.6.0/qttranslations-everywhere-src-6.6.0.tar.xz) = a0d89a236f64b810eb0fe4ae1e90db22b0e86263521b35f89e69f1392815078c -SIZE (KDE/Qt/6.6.0/qttranslations-everywhere-src-6.6.0.tar.xz) = 1468592 +TIMESTAMP = 1701101770 +SHA256 (KDE/Qt/6.6.1/qttranslations-everywhere-src-6.6.1.tar.xz) = 668702e822ad7150b27e7caa2158595fd9b3b77ffbc8262e6509872a3920ee88 +SIZE (KDE/Qt/6.6.1/qttranslations-everywhere-src-6.6.1.tar.xz) = 1481184 diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile index b09cda3c0b0d..e94c04ce9f98 100644 --- a/graphics/qt6-3d/Makefile +++ b/graphics/qt6-3d/Makefile @@ -5,28 +5,14 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML APIs for easy inclusion of 3D graphics -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libassimp.so:multimedia/assimp \ - libdouble-conversion.so:devel/double-conversion \ - libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicudata.so:devel/icu \ - libminizip.so:archivers/minizip \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd + libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gettext-runtime gl gnome python:build \ +USES= cmake compiler:c++17-lang gl python:build \ pkgconfig qt-dist:6 -USE_GL= gl -USE_GNOME= glib20 +USE_GL= opengl USE_QT= base declarative shadertools USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/graphics/qt6-3d/distinfo b/graphics/qt6-3d/distinfo index d6465d849db9..af3c4111ced4 100644 --- a/graphics/qt6-3d/distinfo +++ b/graphics/qt6-3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049779 -SHA256 (KDE/Qt/6.6.0/qt3d-everywhere-src-6.6.0.tar.xz) = 0da87a46217f4d72f6d0de9768605d5325ef3d093f73a5e0d73dd88e99c1fc2a -SIZE (KDE/Qt/6.6.0/qt3d-everywhere-src-6.6.0.tar.xz) = 161687452 +TIMESTAMP = 1701101914 +SHA256 (KDE/Qt/6.6.1/qt3d-everywhere-src-6.6.1.tar.xz) = f384aed74f14a71c68f607a3b1e859ea22746e82650e775fd40f0653c2443229 +SIZE (KDE/Qt/6.6.1/qt3d-everywhere-src-6.6.1.tar.xz) = 163183224 diff --git a/graphics/qt6-imageformats/Makefile b/graphics/qt6-imageformats/Makefile index 8848e2e748d4..089524f14b3f 100644 --- a/graphics/qt6-imageformats/Makefile +++ b/graphics/qt6-imageformats/Makefile @@ -5,33 +5,17 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt6 plugins for additional image formats: TIFF, MNG, TGA, WBMP -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libjasper.so:graphics/jasper \ - libwebp.so:graphics/webp \ - libtiff.so:graphics/tiff \ - libdouble-conversion.so:devel/double-conversion \ - libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicudata.so:devel/icu \ - libjbig.so:graphics/jbigkit \ libmng.so:graphics/libmng \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd + libtiff.so:graphics/tiff \ + libwebp.so:graphics/webp -USES= cmake compiler:c++17-lang gettext-runtime gl gnome jpeg pkgconfig xorg \ +USES= cmake compiler:c++17-lang gl jpeg pkgconfig \ qt-dist:6 -USE_GL= egl gl opengl -USE_GNOME= glib20 +USE_GL= opengl USE_QT= base -USE_XORG= x11 xau xcb xdmcp USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/graphics/qt6-imageformats/distinfo b/graphics/qt6-imageformats/distinfo index 333e224d4b82..048befc55cf8 100644 --- a/graphics/qt6-imageformats/distinfo +++ b/graphics/qt6-imageformats/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049786 -SHA256 (KDE/Qt/6.6.0/qtimageformats-everywhere-src-6.6.0.tar.xz) = e1542cb50176e237809895c6549598c08587c63703d100be54ac2d806834e384 -SIZE (KDE/Qt/6.6.0/qtimageformats-everywhere-src-6.6.0.tar.xz) = 1975848 +TIMESTAMP = 1701101917 +SHA256 (KDE/Qt/6.6.1/qtimageformats-everywhere-src-6.6.1.tar.xz) = ac4ed08950072e375be662cfa64fdb447dd6e935cf29c56a4128d1500492188f +SIZE (KDE/Qt/6.6.1/qtimageformats-everywhere-src-6.6.1.tar.xz) = 1972464 diff --git a/graphics/qt6-lottie/Makefile b/graphics/qt6-lottie/Makefile index 84d6d7fcfdfa..d84bc1f4fe06 100644 --- a/graphics/qt6-lottie/Makefile +++ b/graphics/qt6-lottie/Makefile @@ -4,14 +4,13 @@ CATEGORIES= graphics PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org -COMMENT= Qt 6 player software for a certain json-based for 2d animations -WWW= https://qt.io +COMMENT= QML API for rendering graphics and animations BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl -USE_QT= base declarative websockets +USE_GL= opengl +USE_QT= base declarative .include <bsd.port.mk> diff --git a/graphics/qt6-lottie/distinfo b/graphics/qt6-lottie/distinfo index a68aa7a2d810..8bc07aac57ce 100644 --- a/graphics/qt6-lottie/distinfo +++ b/graphics/qt6-lottie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049789 -SHA256 (KDE/Qt/6.6.0/qtlottie-everywhere-src-6.6.0.tar.xz) = 1d98b45107a4b9a6337bc7ac37b9e54cdaa68110f814d93eecc8fbf8d338f84f -SIZE (KDE/Qt/6.6.0/qtlottie-everywhere-src-6.6.0.tar.xz) = 92276 +TIMESTAMP = 1701101919 +SHA256 (KDE/Qt/6.6.1/qtlottie-everywhere-src-6.6.1.tar.xz) = 49cb059364f78936c09fb0f53dad23363ba8ae29d931cd8380cbdff4bda09fc8 +SIZE (KDE/Qt/6.6.1/qtlottie-everywhere-src-6.6.1.tar.xz) = 92264 diff --git a/graphics/qt6-quickeffectmaker/Makefile b/graphics/qt6-quickeffectmaker/Makefile index 264b41c6ef4f..513e1726bbef 100644 --- a/graphics/qt6-quickeffectmaker/Makefile +++ b/graphics/qt6-quickeffectmaker/Makefile @@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Tool for creating shader effects for Qt Quick -WWW= https://qt.io BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative quick3d shadertools .include <bsd.port.mk> diff --git a/graphics/qt6-quickeffectmaker/distinfo b/graphics/qt6-quickeffectmaker/distinfo index b81bd8d58561..0455070383c4 100644 --- a/graphics/qt6-quickeffectmaker/distinfo +++ b/graphics/qt6-quickeffectmaker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049793 -SHA256 (KDE/Qt/6.6.0/qtquickeffectmaker-everywhere-src-6.6.0.tar.xz) = d7cb379fc7ad228343b20c1f68ed7864de2b43601d1879469dcb5659f9d1f77f -SIZE (KDE/Qt/6.6.0/qtquickeffectmaker-everywhere-src-6.6.0.tar.xz) = 4367288 +TIMESTAMP = 1701101926 +SHA256 (KDE/Qt/6.6.1/qtquickeffectmaker-everywhere-src-6.6.1.tar.xz) = ac180953c7479cb707b20f3fffb4b778dc8e62d79455ad499caae66d74dd2653 +SIZE (KDE/Qt/6.6.1/qtquickeffectmaker-everywhere-src-6.6.1.tar.xz) = 4367324 diff --git a/graphics/qt6-svg/Makefile b/graphics/qt6-svg/Makefile index 7bbbcca0fb88..7eee8e4edde8 100644 --- a/graphics/qt6-svg/Makefile +++ b/graphics/qt6-svg/Makefile @@ -1,33 +1,18 @@ PORTNAME= svg DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt6 classes for displaying the contents of SVG files -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ - libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicudata.so:devel/icu \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd +LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gettext-runtime gl gnome xorg \ +USES= cmake compiler:c++17-lang gl \ qt-dist:6 -USE_GL= egl gl opengl -USE_GNOME= glib20 +USE_GL= opengl USE_QT= base -USE_XORG= x11 xau xcb xdmcp USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/graphics/qt6-svg/distinfo b/graphics/qt6-svg/distinfo index 4929e9bae51e..74ec38d2875e 100644 --- a/graphics/qt6-svg/distinfo +++ b/graphics/qt6-svg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049796 -SHA256 (KDE/Qt/6.6.0/qtsvg-everywhere-src-6.6.0.tar.xz) = 33da25fef51102f564624a7ea3e57cb4a0a31b7b44783d1af5749ac36d3c72de -SIZE (KDE/Qt/6.6.0/qtsvg-everywhere-src-6.6.0.tar.xz) = 1651728 +TIMESTAMP = 1701101929 +SHA256 (KDE/Qt/6.6.1/qtsvg-everywhere-src-6.6.1.tar.xz) = 248deb56d26a463cf3162f530358ccf90cfb654bbf518bb35ddf81b205e09228 +SIZE (KDE/Qt/6.6.1/qtsvg-everywhere-src-6.6.1.tar.xz) = 1651976 diff --git a/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp b/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp deleted file mode 100644 index 8eb861736a32..000000000000 --- a/graphics/qt6-svg/files/patch-src_svg_qsvghandler.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/svg/qsvghandler.cpp.orig 2023-10-02 03:05:52 UTC -+++ src/svg/qsvghandler.cpp -@@ -3606,6 +3606,8 @@ static bool detectCycles(const QSvgNode *node, QList<c - - static bool detectCycles(const QSvgNode *node, QList<const QSvgUse *> active = {}) - { -+ if (Q_UNLIKELY(!node)) -+ return false; - switch (node->type()) { - case QSvgNode::DOC: - case QSvgNode::G: diff --git a/graphics/qt6-wayland/Makefile b/graphics/qt6-wayland/Makefile index a96319c2ec45..dc41cc336881 100644 --- a/graphics/qt6-wayland/Makefile +++ b/graphics/qt6-wayland/Makefile @@ -5,31 +5,15 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt6 wrapper for Wayland -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ - libepoll-shim.so:devel/libepoll-shim \ - libexpat.so:textproc/expat2 \ - libffi.so:devel/libffi \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicudata.so:devel/icu \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libwayland-client.so:graphics/wayland \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd +LIB_DEPENDS= libwayland-client.so:graphics/wayland \ + libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gettext-runtime gl gnome pkgconfig xorg \ - qt-dist:6 xorg -USE_GL= gl egl -USE_GNOME= glib20 +USES= cmake compiler:c++17-lang gl pkgconfig \ + qt-dist:6 +USE_GL= opengl egl USE_QT= base declarative -USE_XORG= x11 xau xcb xcomposite xdmcp USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/graphics/qt6-wayland/distinfo b/graphics/qt6-wayland/distinfo index 7d2a1793d52a..6a34f4a5279e 100644 --- a/graphics/qt6-wayland/distinfo +++ b/graphics/qt6-wayland/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049798 -SHA256 (KDE/Qt/6.6.0/qtwayland-everywhere-src-6.6.0.tar.xz) = 30c3d82d85d050c83370710a26d12c802199c51eba5c2726e9d6243edd03b7e8 -SIZE (KDE/Qt/6.6.0/qtwayland-everywhere-src-6.6.0.tar.xz) = 1125748 +TIMESTAMP = 1701101932 +SHA256 (KDE/Qt/6.6.1/qtwayland-everywhere-src-6.6.1.tar.xz) = 66cc2d632dc07fc6cc4e35247f48b7c1753276ccbf86e86d7b24d799725568b1 +SIZE (KDE/Qt/6.6.1/qtwayland-everywhere-src-6.6.1.tar.xz) = 1127148 diff --git a/graphics/qt6-wayland/pkg-plist b/graphics/qt6-wayland/pkg-plist index 88886f1b5b56..8be4ad61c8c3 100644 --- a/graphics/qt6-wayland/pkg-plist +++ b/graphics/qt6-wayland/pkg-plist @@ -183,6 +183,7 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegration_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegrationfactory_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwltextureorphanage_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwltexturesharingextension_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-hardware-integration-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-idle-inhibit-unstable-v1-server-protocol.h diff --git a/misc/qt6-doc/Makefile b/misc/qt6-doc/Makefile index 8a7445bf222e..4cca77815de8 100644 --- a/misc/qt6-doc/Makefile +++ b/misc/qt6-doc/Makefile @@ -5,14 +5,12 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 module Documentations -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers USES= cmake compiler:c++17-lang \ qt-dist:6 -USE_QT= base declarative tools \ - sqldriver-sqlite +USE_QT= base declarative sqldriver-sqlite tools ALL_TARGET= docs INSTALL_TARGET= install_docs diff --git a/misc/qt6-doc/distinfo b/misc/qt6-doc/distinfo index 4b8483d41922..d4c18997b51d 100644 --- a/misc/qt6-doc/distinfo +++ b/misc/qt6-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697049807 -SHA256 (KDE/Qt/6.6.0/qtdoc-everywhere-src-6.6.0.tar.xz) = d37634d87a9bdd78ca42c9ace3cd08954a227c58ecd6270919aadef55977261e -SIZE (KDE/Qt/6.6.0/qtdoc-everywhere-src-6.6.0.tar.xz) = 13121692 +TIMESTAMP = 1701101948 +SHA256 (KDE/Qt/6.6.1/qtdoc-everywhere-src-6.6.1.tar.xz) = 944ba524e99e8e3c33b1f46de26b06599511b0004a0936d34fd520645c0cb059 +SIZE (KDE/Qt/6.6.1/qtdoc-everywhere-src-6.6.1.tar.xz) = 13174324 diff --git a/misc/qt6-examples/Makefile b/misc/qt6-examples/Makefile index 549544acef55..36d10bdbfd27 100644 --- a/misc/qt6-examples/Makefile +++ b/misc/qt6-examples/Makefile @@ -8,6 +8,7 @@ DIST_SUBDIR= KDE/Qt/${QT6_VERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 examples source code +WWW= https://www.qt.io/ NO_ARCH= yes NO_BUILD= yes diff --git a/misc/qt6-examples/distinfo b/misc/qt6-examples/distinfo index 54768f6f8d1d..abf5eaaa5ca8 100644 --- a/misc/qt6-examples/distinfo +++ b/misc/qt6-examples/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050141 -SHA256 (KDE/Qt/6.6.0/qt-everywhere-src-6.6.0.tar.xz) = 652538fcb5d175d8f8176c84c847b79177c87847b7273dccaec1897d80b50002 -SIZE (KDE/Qt/6.6.0/qt-everywhere-src-6.6.0.tar.xz) = 812361632 +TIMESTAMP = 1701102607 +SHA256 (KDE/Qt/6.6.1/qt-everywhere-src-6.6.1.tar.xz) = dd3668f65645fe270bc615d748bd4dc048bd17b9dc297025106e6ecc419ab95d +SIZE (KDE/Qt/6.6.1/qt-everywhere-src-6.6.1.tar.xz) = 814132652 diff --git a/misc/qt6-examples/pkg-plist b/misc/qt6-examples/pkg-plist index 201eb1d7e47e..7f387afbde77 100644 --- a/misc/qt6-examples/pkg-plist +++ b/misc/qt6-examples/pkg-plist @@ -580,6 +580,7 @@ %%QT_EXAMPLEDIR%%/corelib/serialization/convert/cborconverter.cpp %%QT_EXAMPLEDIR%%/corelib/serialization/convert/cborconverter.h %%QT_EXAMPLEDIR%%/corelib/serialization/convert/convert.pro +%%QT_EXAMPLEDIR%%/corelib/serialization/convert/converter.cpp %%QT_EXAMPLEDIR%%/corelib/serialization/convert/converter.h %%QT_EXAMPLEDIR%%/corelib/serialization/convert/datastreamconverter.cpp %%QT_EXAMPLEDIR%%/corelib/serialization/convert/datastreamconverter.h @@ -594,6 +595,7 @@ %%QT_EXAMPLEDIR%%/corelib/serialization/convert/nullconverter.h %%QT_EXAMPLEDIR%%/corelib/serialization/convert/textconverter.cpp %%QT_EXAMPLEDIR%%/corelib/serialization/convert/textconverter.h +%%QT_EXAMPLEDIR%%/corelib/serialization/convert/variantorderedmap.h %%QT_EXAMPLEDIR%%/corelib/serialization/convert/xmlconverter.cpp %%QT_EXAMPLEDIR%%/corelib/serialization/convert/xmlconverter.h %%QT_EXAMPLEDIR%%/corelib/serialization/savegame/CMakeLists.txt @@ -665,20 +667,7 @@ %%QT_EXAMPLEDIR%%/corelib/tools/contiguouscache/main.cpp %%QT_EXAMPLEDIR%%/corelib/tools/contiguouscache/randomlistmodel.cpp %%QT_EXAMPLEDIR%%/corelib/tools/contiguouscache/randomlistmodel.h -%%QT_EXAMPLEDIR%%/corelib/tools/customtype/CMakeLists.txt -%%QT_EXAMPLEDIR%%/corelib/tools/customtype/customtype.pro -%%QT_EXAMPLEDIR%%/corelib/tools/customtype/main.cpp -%%QT_EXAMPLEDIR%%/corelib/tools/customtype/message.cpp -%%QT_EXAMPLEDIR%%/corelib/tools/customtype/message.h -%%QT_EXAMPLEDIR%%/corelib/tools/customtypesending/CMakeLists.txt -%%QT_EXAMPLEDIR%%/corelib/tools/customtypesending/customtypesending.pro -%%QT_EXAMPLEDIR%%/corelib/tools/customtypesending/main.cpp -%%QT_EXAMPLEDIR%%/corelib/tools/customtypesending/message.cpp -%%QT_EXAMPLEDIR%%/corelib/tools/customtypesending/message.h -%%QT_EXAMPLEDIR%%/corelib/tools/customtypesending/window.cpp -%%QT_EXAMPLEDIR%%/corelib/tools/customtypesending/window.h %%QT_EXAMPLEDIR%%/corelib/tools/doc/src/contiguouscache.qdoc -%%QT_EXAMPLEDIR%%/corelib/tools/doc/src/customtype.qdoc %%QT_EXAMPLEDIR%%/corelib/tools/tools.pro %%QT_EXAMPLEDIR%%/datavisualization/CMakeLists.txt %%QT_EXAMPLEDIR%%/datavisualization/datavisualization.pro @@ -972,6 +961,13 @@ %%QT_EXAMPLEDIR%%/demos/FX_Material_Showroom/src/import_qml_plugins.h %%QT_EXAMPLEDIR%%/demos/FX_Material_Showroom/src/main.cpp %%QT_EXAMPLEDIR%%/demos/calqlatr/CMakeLists.txt +%%QT_EXAMPLEDIR%%/demos/calqlatr/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-hdpi/icon.png +%%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-ldpi/icon.png +%%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-mdpi/icon.png +%%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-xhdpi/icon.png +%%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-xxhdpi/icon.png +%%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-xxxhdpi/icon.png %%QT_EXAMPLEDIR%%/demos/calqlatr/calqlatr.pro %%QT_EXAMPLEDIR%%/demos/calqlatr/calqlatr.qml %%QT_EXAMPLEDIR%%/demos/calqlatr/calqlatr.qmlproject @@ -2197,6 +2193,8 @@ %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.cpp %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.h %%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad.pro +%%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad_fr.ts +%%QT_EXAMPLEDIR%%/linguist/arrowpad/arrowpad_nl.ts %%QT_EXAMPLEDIR%%/linguist/arrowpad/main.cpp %%QT_EXAMPLEDIR%%/linguist/arrowpad/mainwindow.cpp %%QT_EXAMPLEDIR%%/linguist/arrowpad/mainwindow.h @@ -2221,6 +2219,7 @@ %%QT_EXAMPLEDIR%%/linguist/doc/src/trollprint.qdoc %%QT_EXAMPLEDIR%%/linguist/hellotr/CMakeLists.txt %%QT_EXAMPLEDIR%%/linguist/hellotr/hellotr.pro +%%QT_EXAMPLEDIR%%/linguist/hellotr/hellotr_la.ts %%QT_EXAMPLEDIR%%/linguist/hellotr/main.cpp %%QT_EXAMPLEDIR%%/linguist/i18n/CMakeLists.txt %%QT_EXAMPLEDIR%%/linguist/i18n/i18n.pro @@ -2254,9 +2253,11 @@ %%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint_pt.ts %%QT_EXAMPLEDIR%%/mqtt/CMakeLists.txt %%QT_EXAMPLEDIR%%/mqtt/doc/examples.qdoc +%%QT_EXAMPLEDIR%%/mqtt/doc/images/quickpublication.png %%QT_EXAMPLEDIR%%/mqtt/doc/images/quicksubscription.png %%QT_EXAMPLEDIR%%/mqtt/doc/images/simpleclient.png %%QT_EXAMPLEDIR%%/mqtt/doc/images/subscriptions.png +%%QT_EXAMPLEDIR%%/mqtt/doc/quickpublication.qdoc %%QT_EXAMPLEDIR%%/mqtt/doc/quicksubscription.qdoc %%QT_EXAMPLEDIR%%/mqtt/doc/simpleclient.qdoc %%QT_EXAMPLEDIR%%/mqtt/doc/subscriptions.qdoc @@ -2690,6 +2691,7 @@ %%QT_EXAMPLEDIR%%/network/doc/images/multicastreceiver-example.webp %%QT_EXAMPLEDIR%%/network/doc/images/multicastsender-example.webp %%QT_EXAMPLEDIR%%/network/doc/images/network-chat-example.png +%%QT_EXAMPLEDIR%%/network/doc/images/rsslisting.png %%QT_EXAMPLEDIR%%/network/doc/images/securesocketclient.png %%QT_EXAMPLEDIR%%/network/doc/images/securesocketclient2.png %%QT_EXAMPLEDIR%%/network/doc/images/secureudpclient-example.png @@ -2705,6 +2707,7 @@ %%QT_EXAMPLEDIR%%/network/doc/src/multicastreceiver.qdoc %%QT_EXAMPLEDIR%%/network/doc/src/multicastsender.qdoc %%QT_EXAMPLEDIR%%/network/doc/src/network-chat.qdoc +%%QT_EXAMPLEDIR%%/network/doc/src/rsslisting.qdoc %%QT_EXAMPLEDIR%%/network/doc/src/securesocketclient.qdoc %%QT_EXAMPLEDIR%%/network/doc/src/secureudpclient.qdoc %%QT_EXAMPLEDIR%%/network/doc/src/secureudpserver.qdoc @@ -2777,8 +2780,6 @@ %%QT_EXAMPLEDIR%%/network/network-chat/server.h %%QT_EXAMPLEDIR%%/network/network.pro %%QT_EXAMPLEDIR%%/network/rsslisting/CMakeLists.txt -%%QT_EXAMPLEDIR%%/network/rsslisting/doc/images/rsslisting.png -%%QT_EXAMPLEDIR%%/network/rsslisting/doc/src/rsslisting.qdoc %%QT_EXAMPLEDIR%%/network/rsslisting/main.cpp %%QT_EXAMPLEDIR%%/network/rsslisting/rsslisting.cpp %%QT_EXAMPLEDIR%%/network/rsslisting/rsslisting.h @@ -4455,6 +4456,7 @@ %%QT_EXAMPLEDIR%%/quick/shapes/text.qml %%QT_EXAMPLEDIR%%/quick/shapes/tiger.qml %%QT_EXAMPLEDIR%%/quick/shapes/tigerLoader.qml +%%QT_EXAMPLEDIR%%/quick/shapes/zoomtiger.qml %%QT_EXAMPLEDIR%%/quick/shared/Button.qml %%QT_EXAMPLEDIR%%/quick/shared/CMakeLists.txt %%QT_EXAMPLEDIR%%/quick/shared/CheckBox.qml @@ -5860,47 +5862,21 @@ %%QT_EXAMPLEDIR%%/quickcontrols/wearable/wearable.pro %%QT_EXAMPLEDIR%%/quickcontrols/wearable/wearable.qrc %%QT_EXAMPLEDIR%%/remoteobjects/CMakeLists.txt -%%QT_EXAMPLEDIR%%/remoteobjects/ble/CMakeLists.txt -%%QT_EXAMPLEDIR%%/remoteobjects/ble/ble.pro -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/CMakeLists.txt -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/bleclient.pro -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/connectpage.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/connectpage.h -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/connectpage.ui -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/heaterview.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/heaterview.h -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/heaterview.ui -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/main.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/mainwindow.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleclient/mainwindow.h -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleserver/CMakeLists.txt -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleserver/bleserver.pro -%%QT_EXAMPLEDIR%%/remoteobjects/ble/bleserver/main.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/ble/common/Info.cmake.macos.plist -%%QT_EXAMPLEDIR%%/remoteobjects/ble/common/Info.ios.plist -%%QT_EXAMPLEDIR%%/remoteobjects/ble/common/Info.qmake.macos.plist -%%QT_EXAMPLEDIR%%/remoteobjects/ble/common/bleiodevice.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/ble/common/bleiodevice.h -%%QT_EXAMPLEDIR%%/remoteobjects/ble/common/common.pri -%%QT_EXAMPLEDIR%%/remoteobjects/ble/common/heater.rep -%%QT_EXAMPLEDIR%%/remoteobjects/ble/doc/src/ble.qdoc %%QT_EXAMPLEDIR%%/remoteobjects/clientapp/CMakeLists.txt +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/Clock.qml +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/Plugins.qml +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/center.png %%QT_EXAMPLEDIR%%/remoteobjects/clientapp/clientapp.pro -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/clientapp.qrc +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/clock.png %%QT_EXAMPLEDIR%%/remoteobjects/clientapp/doc/images/clientapp-example.webp %%QT_EXAMPLEDIR%%/remoteobjects/clientapp/doc/src/clientapp.qdoc +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/hour.png %%QT_EXAMPLEDIR%%/remoteobjects/clientapp/main.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/plugin.cpp +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/minute.png %%QT_EXAMPLEDIR%%/remoteobjects/clientapp/plugin.h -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/Clock.qml -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/center.png -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/clock.png -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/hour.png -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/minute.png -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/plugins.qml -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/plugins0.qml -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/plugins1.qml -%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qml/plugins2.qml +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/plugins0.qml +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/plugins1.qml +%%QT_EXAMPLEDIR%%/remoteobjects/clientapp/plugins2.qml %%QT_EXAMPLEDIR%%/remoteobjects/clientapp/qmldir %%QT_EXAMPLEDIR%%/remoteobjects/modelviewclient/CMakeLists.txt %%QT_EXAMPLEDIR%%/remoteobjects/modelviewclient/doc/src/modelviewclient.qdoc @@ -5925,28 +5901,13 @@ %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectclient/directconnectclient.pro %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectclient/main.cpp %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectclient/simpleswitch.rep -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicclient/directconnectdynamicclient.pro -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.h -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectdynamicclient/main.cpp %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectserver/directconnectserver.pro %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectserver/main.cpp %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectserver/simpleswitch.cpp %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/directconnectserver/simpleswitch.rep -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.h -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedclient/main.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedclient/registryconnectedclient.pro -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedserver/main.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedserver/registryconnectedserver.pro -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.cpp -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h -%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.rep +%%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/doc/src/simpleswitch.qdoc %%QT_EXAMPLEDIR%%/remoteobjects/simpleswitch/simpleswitch.pro %%QT_EXAMPLEDIR%%/remoteobjects/ssl/CMakeLists.txt %%QT_EXAMPLEDIR%%/remoteobjects/ssl/doc/src/ssl.qdoc @@ -6106,6 +6067,12 @@ %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/ProgressXYZBar.qml %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/Proximity.qml %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/android/AndroidManifest.xml +%%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/android/res/drawable-hdpi/icon.png +%%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/android/res/drawable-ldpi/icon.png +%%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/android/res/drawable-mdpi/icon.png +%%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/android/res/drawable-xhdpi/icon.png +%%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/android/res/drawable-xxhdpi/icon.png +%%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/android/res/drawable-xxxhdpi/icon.png %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/doc/images/sensorsshowcase-gyroscope.webp %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/doc/images/sensorsshowcase-mainview.webp %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/doc/src/sensorsshowcase.qdoc @@ -6116,6 +6083,7 @@ %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/qmldir %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/sensorsshowcase.pro +%%QT_EXAMPLEDIR%%/sensors/sensorsshowcase/sensorsupport.h %%QT_EXAMPLEDIR%%/serialbus/CMakeLists.txt %%QT_EXAMPLEDIR%%/serialbus/can/CMakeLists.txt %%QT_EXAMPLEDIR%%/serialbus/can/bitratebox.cpp @@ -7283,7 +7251,6 @@ %%QT_EXAMPLEDIR%%/widgets/doc/src/syntaxhighlighter.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/tabdialog.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/tablet.qdoc -%%QT_EXAMPLEDIR%%/widgets/doc/src/tooltips.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/transformations.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/treemodelcompleter.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/trivialwizard.qdoc @@ -7985,17 +7952,6 @@ %%QT_EXAMPLEDIR%%/widgets/widgets/tablet/tabletapplication.h %%QT_EXAMPLEDIR%%/widgets/widgets/tablet/tabletcanvas.cpp %%QT_EXAMPLEDIR%%/widgets/widgets/tablet/tabletcanvas.h -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/CMakeLists.txt -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/images/circle.png -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/images/square.png -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/images/triangle.png -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/main.cpp -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/shapeitem.cpp -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/shapeitem.h -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/sortingbox.cpp -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/sortingbox.h -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/tooltips.pro -%%QT_EXAMPLEDIR%%/widgets/widgets/tooltips/tooltips.qrc %%QT_EXAMPLEDIR%%/widgets/widgets/widgets.pro %%QT_EXAMPLEDIR%%/widgets/widgets/windowflags/CMakeLists.txt %%QT_EXAMPLEDIR%%/widgets/widgets/windowflags/controllerwindow.cpp diff --git a/multimedia/qt6-multimedia/Makefile b/multimedia/qt6-multimedia/Makefile index 279957ffa5eb..08660da6d670 100644 --- a/multimedia/qt6-multimedia/Makefile +++ b/multimedia/qt6-multimedia/Makefile @@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt audio, video, radio and camera support module -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative CXXFLAGS_powerpc64= -mvsx diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo index 539677d5fb0a..61b40c1a2cf9 100644 --- a/multimedia/qt6-multimedia/distinfo +++ b/multimedia/qt6-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050146 -SHA256 (KDE/Qt/6.6.0/qtmultimedia-everywhere-src-6.6.0.tar.xz) = ba4b236ca3ec118841b7f5ba87797e24a8c5cbef9ba973fe219fbfc310d38782 -SIZE (KDE/Qt/6.6.0/qtmultimedia-everywhere-src-6.6.0.tar.xz) = 6575240 +TIMESTAMP = 1701102613 +SHA256 (KDE/Qt/6.6.1/qtmultimedia-everywhere-src-6.6.1.tar.xz) = 7ee4e2296f5714961692f6ded568d3e3fde3687cee48e9d717194b5d1360db4a +SIZE (KDE/Qt/6.6.1/qtmultimedia-everywhere-src-6.6.1.tar.xz) = 6723296 diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist index e0d719a3ccb1..0e29106b9276 100644 --- a/multimedia/qt6-multimedia/pkg-plist +++ b/multimedia/qt6-multimedia/pkg-plist @@ -7,10 +7,12 @@ %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioengine_pulse_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiostatemachine_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiostatemachineutils_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystem_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcamera_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcameradevice_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcapturablewindow_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qerrorinfo_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplayer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediarecorder_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h diff --git a/net/qt6-coap/distinfo b/net/qt6-coap/distinfo index 2fdb2ba1c8c3..d699afc779f3 100644 --- a/net/qt6-coap/distinfo +++ b/net/qt6-coap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699369669 -SHA256 (KDE/Qt/6.6.0/qt-qtcoap-v6.6.0_GH0.tar.gz) = 9e2672bd0c59659dfe8265c68cd405d93a2247f6023a8524c20b481805c94133 -SIZE (KDE/Qt/6.6.0/qt-qtcoap-v6.6.0_GH0.tar.gz) = 183048 +TIMESTAMP = 1701102615 +SHA256 (KDE/Qt/6.6.1/qt-qtcoap-v6.6.1_GH0.tar.gz) = a11cae6ec75ba31150ac94b076b43d1e9c235e9872b5c02dc70734449dc07551 +SIZE (KDE/Qt/6.6.1/qt-qtcoap-v6.6.1_GH0.tar.gz) = 183077 diff --git a/net/qt6-networkauth/Makefile b/net/qt6-networkauth/Makefile index 5297c0593be4..93ed08a99a12 100644 --- a/net/qt6-networkauth/Makefile +++ b/net/qt6-networkauth/Makefile @@ -5,18 +5,11 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt6 Network authentication module -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ - libicudata.so:devel/icu \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libzstd.so:archivers/zstd -USES= cmake compiler:c++17-lang gettext-runtime gnome \ +USES= cmake compiler:c++17-lang \ qt-dist:6 -USE_GNOME= glib20 USE_QT= base USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/net/qt6-networkauth/distinfo b/net/qt6-networkauth/distinfo index 86e6fb12d779..95517104e0bf 100644 --- a/net/qt6-networkauth/distinfo +++ b/net/qt6-networkauth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050147 -SHA256 (KDE/Qt/6.6.0/qtnetworkauth-everywhere-src-6.6.0.tar.xz) = 20d5c0746c00eb3333f17c9869296d0acd0eed93518ea2734b98405cc6cc8830 -SIZE (KDE/Qt/6.6.0/qtnetworkauth-everywhere-src-6.6.0.tar.xz) = 152688 +TIMESTAMP = 1701102617 +SHA256 (KDE/Qt/6.6.1/qtnetworkauth-everywhere-src-6.6.1.tar.xz) = 693e11945b22735fc9b1662cad53c60098882d301c4f4a3e13c01bcc41c00d49 +SIZE (KDE/Qt/6.6.1/qtnetworkauth-everywhere-src-6.6.1.tar.xz) = 152916 diff --git a/print/Makefile b/print/Makefile index a0615213a6b3..2b26f74e07bd 100644 --- a/print/Makefile +++ b/print/Makefile @@ -197,6 +197,7 @@ SUBDIR += qpdf SUBDIR += qpdfview SUBDIR += qt5-printsupport + SUBDIR += qt6-pdf SUBDIR += rlpr SUBDIR += rtf2latex2e SUBDIR += rubygem-afm diff --git a/print/qt6-pdf/Makefile b/print/qt6-pdf/Makefile new file mode 100644 index 000000000000..92f70b1352d0 --- /dev/null +++ b/print/qt6-pdf/Makefile @@ -0,0 +1,13 @@ +PORTNAME= pdf +PORTREVISION= 0 + +CATEGORIES= print +COMMENT= Qt 6 module for rendering PDF documents + +MASTERDIR= ${.CURDIR}/../../www/qt6-webengine +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist + +BUILD_QTPDF= yes + +.include "${MASTERDIR}/Makefile" diff --git a/print/qt6-pdf/pkg-descr b/print/qt6-pdf/pkg-descr new file mode 100644 index 000000000000..ad47bfd53ff0 --- /dev/null +++ b/print/qt6-pdf/pkg-descr @@ -0,0 +1,2 @@ +The Qt PDF module contains classes and functions for rendering PDF +documents. diff --git a/print/qt6-pdf/pkg-plist b/print/qt6-pdf/pkg-plist new file mode 100644 index 000000000000..53ddfd7ffb0b --- /dev/null +++ b/print/qt6-pdf/pkg-plist @@ -0,0 +1,137 @@ +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfdocument_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdffile_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflink_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfsearchmodel_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfselection_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdf-config_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdfexports_p.h +%%QT_INCDIR%%/QtPdf/QPdfBookmarkModel +%%QT_INCDIR%%/QtPdf/QPdfDocument +%%QT_INCDIR%%/QtPdf/QPdfDocumentRenderOptions +%%QT_INCDIR%%/QtPdf/QPdfLink +%%QT_INCDIR%%/QtPdf/QPdfLinkModel +%%QT_INCDIR%%/QtPdf/QPdfPageNavigator +%%QT_INCDIR%%/QtPdf/QPdfPageRenderer +%%QT_INCDIR%%/QtPdf/QPdfSearchModel +%%QT_INCDIR%%/QtPdf/QPdfSelection +%%QT_INCDIR%%/QtPdf/QtPdf +%%QT_INCDIR%%/QtPdf/QtPdfDepends +%%QT_INCDIR%%/QtPdf/QtPdfVersion +%%QT_INCDIR%%/QtPdf/qpdfbookmarkmodel.h +%%QT_INCDIR%%/QtPdf/qpdfdocument.h +%%QT_INCDIR%%/QtPdf/qpdfdocumentrenderoptions.h +%%QT_INCDIR%%/QtPdf/qpdflink.h +%%QT_INCDIR%%/QtPdf/qpdflinkmodel.h +%%QT_INCDIR%%/QtPdf/qpdfpagenavigator.h +%%QT_INCDIR%%/QtPdf/qpdfpagerenderer.h +%%QT_INCDIR%%/QtPdf/qpdfsearchmodel.h +%%QT_INCDIR%%/QtPdf/qpdfselection.h +%%QT_INCDIR%%/QtPdf/qtpdf-config.h +%%QT_INCDIR%%/QtPdf/qtpdfexports.h +%%QT_INCDIR%%/QtPdf/qtpdfglobal.h +%%QT_INCDIR%%/QtPdf/qtpdfversion.h +%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfbookmarkmodel_p.h +%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfdocument_p.h +%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdflinkmodel_p.h +%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfpageimage_p.h +%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfpagenavigator_p.h +%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfsearchmodel_p.h +%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfselection_p.h +%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qtpdfquickglobal_p.h +%%QT_INCDIR%%/QtPdfQuick/QtPdfQuick +%%QT_INCDIR%%/QtPdfQuick/QtPdfQuickDepends +%%QT_INCDIR%%/QtPdfQuick/QtPdfQuickVersion +%%QT_INCDIR%%/QtPdfQuick/qtpdfquickversion.h +%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qpdfpageselector_p.h +%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qpdfview_p.h +%%QT_INCDIR%%/QtPdfWidgets/QPdfPageSelector +%%QT_INCDIR%%/QtPdfWidgets/QPdfView +%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgets +%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsDepends +%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsVersion +%%QT_INCDIR%%/QtPdfWidgets/qpdfpageselector.h +%%QT_INCDIR%%/QtPdfWidgets/qpdfview.h +%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsglobal.h +%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsversion.h +@comment lib/cmake/Qt6/FindGPerf.cmake +@comment lib/cmake/Qt6/FindGn.cmake +@comment lib/cmake/Qt6/FindNinja.cmake +@comment lib/cmake/Qt6/FindNodejs.cmake +@comment lib/cmake/Qt6/FindPkgConfigHost.cmake +@comment lib/cmake/Qt6/FindSnappy.cmake +@comment lib/cmake/Qt6BuildInternals/StandaloneTests/QtWebEngineTestsConfig.cmake +lib/cmake/Qt6Gui/Qt6QPdfPluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Gui/Qt6QPdfPluginConfig.cmake +lib/cmake/Qt6Gui/Qt6QPdfPluginConfigVersion.cmake +lib/cmake/Qt6Gui/Qt6QPdfPluginConfigVersionImpl.cmake +lib/cmake/Qt6Gui/Qt6QPdfPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Gui/Qt6QPdfPluginTargets.cmake +lib/cmake/Qt6Pdf/Qt6PdfAdditionalTargetInfo.cmake +lib/cmake/Qt6Pdf/Qt6PdfConfig.cmake +lib/cmake/Qt6Pdf/Qt6PdfConfigVersion.cmake +lib/cmake/Qt6Pdf/Qt6PdfConfigVersionImpl.cmake +lib/cmake/Qt6Pdf/Qt6PdfDependencies.cmake +lib/cmake/Qt6Pdf/Qt6PdfTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Pdf/Qt6PdfTargets.cmake +lib/cmake/Qt6Pdf/Qt6PdfVersionlessTargets.cmake +lib/cmake/Qt6PdfQuick/Qt6PdfQuickAdditionalTargetInfo.cmake +lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfig.cmake +lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfigVersion.cmake +lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfigVersionImpl.cmake +lib/cmake/Qt6PdfQuick/Qt6PdfQuickDependencies.cmake +lib/cmake/Qt6PdfQuick/Qt6PdfQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6PdfQuick/Qt6PdfQuickTargets.cmake +lib/cmake/Qt6PdfQuick/Qt6PdfQuickVersionlessTargets.cmake +lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsAdditionalTargetInfo.cmake +lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfig.cmake +lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfigVersion.cmake +lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfigVersionImpl.cmake +lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsDependencies.cmake +lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsTargets.cmake +lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsVersionlessTargets.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginAdditionalTargetInfo.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfig.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfigVersion.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfigVersionImpl.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginTargets.cmake +%%QT_LIBDIR%%/libQt6Pdf.prl +%%QT_LIBDIR%%/libQt6Pdf.so +%%QT_LIBDIR%%/libQt6Pdf.so.6 +%%QT_LIBDIR%%/libQt6Pdf.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6PdfQuick.prl +%%QT_LIBDIR%%/libQt6PdfQuick.so +%%QT_LIBDIR%%/libQt6PdfQuick.so.6 +%%QT_LIBDIR%%/libQt6PdfQuick.so.%%FULLVER%% +%%QT_LIBDIR%%/libQt6PdfWidgets.prl +%%QT_LIBDIR%%/libQt6PdfWidgets.so +%%QT_LIBDIR%%/libQt6PdfWidgets.so.6 +%%QT_LIBDIR%%/libQt6PdfWidgets.so.%%FULLVER%% +%%QT_LIBDIR%%/metatypes/qt6pdf_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6pdfquick_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_LIBDIR%%/metatypes/qt6pdfwidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%QT_MKSPECDIR%%/modules/qt_lib_pdf.pri +%%QT_MKSPECDIR%%/modules/qt_lib_pdf_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_pdfquick.pri +%%QT_MKSPECDIR%%/modules/qt_lib_pdfquick_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_pdfwidgets.pri +%%QT_MKSPECDIR%%/modules/qt_lib_pdfwidgets_private.pri +%%QT_PLUGINDIR%%/imageformats/libqpdf.so +%%QT_QMLDIR%%/QtQuick/Pdf/+Material/PdfStyle.qml +%%QT_QMLDIR%%/QtQuick/Pdf/+Universal/PdfStyle.qml +%%QT_QMLDIR%%/QtQuick/Pdf/PdfLinkDelegate.qml +%%QT_QMLDIR%%/QtQuick/Pdf/PdfMultiPageView.qml +%%QT_QMLDIR%%/QtQuick/Pdf/PdfPageView.qml +%%QT_QMLDIR%%/QtQuick/Pdf/PdfScrollablePageView.qml +%%QT_QMLDIR%%/QtQuick/Pdf/PdfStyle.qml +%%QT_QMLDIR%%/QtQuick/Pdf/libpdfquickplugin.so +%%QT_QMLDIR%%/QtQuick/Pdf/plugins.qmltypes +%%QT_QMLDIR%%/QtQuick/Pdf/qmldir +libdata/pkgconfig/Qt6Pdf.pc +libdata/pkgconfig/Qt6PdfQuick.pc +libdata/pkgconfig/Qt6PdfWidgets.pc +%%QT_DATADIR%%/modules/Pdf.json +%%QT_DATADIR%%/modules/PdfQuick.json +%%QT_DATADIR%%/modules/PdfWidgets.json diff --git a/science/qt6-quick3dphysics/Makefile b/science/qt6-quick3dphysics/Makefile index 9743045f016a..e9aa8b0664ca 100644 --- a/science/qt6-quick3dphysics/Makefile +++ b/science/qt6-quick3dphysics/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= High-level API for physics simulation -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon diff --git a/science/qt6-quick3dphysics/distinfo b/science/qt6-quick3dphysics/distinfo index d89ae9c7c0a1..d12d67d348dc 100644 --- a/science/qt6-quick3dphysics/distinfo +++ b/science/qt6-quick3dphysics/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698294812 -SHA256 (KDE/Qt/6.6.0/qtquick3dphysics-everywhere-src-6.6.0.tar.xz) = 74395b686f680cfa302e41530ff9bbe1b7e13c1d1aa9d68aa192318ecbfd7c03 -SIZE (KDE/Qt/6.6.0/qtquick3dphysics-everywhere-src-6.6.0.tar.xz) = 4700124 +TIMESTAMP = 1701102622 +SHA256 (KDE/Qt/6.6.1/qtquick3dphysics-everywhere-src-6.6.1.tar.xz) = 2cc6b5f58d7b1de6de34279657ad2c73a0e82e29c7a56a12f2c00fb62725e15a +SIZE (KDE/Qt/6.6.1/qtquick3dphysics-everywhere-src-6.6.1.tar.xz) = 4700696 diff --git a/www/py-qt6-webengine/Makefile b/www/py-qt6-webengine/Makefile index 51f3e796a6ea..ba2317eff1da 100644 --- a/www/py-qt6-webengine/Makefile +++ b/www/py-qt6-webengine/Makefile @@ -13,13 +13,16 @@ WWW= https://riverbankcomputing.com/software/pyqt USES= gl python pyqt:6 qt:6 USE_GL= gl -USE_LOCALE= C.UTF-8 USE_PYQT= sip:build pyqt6 USE_PYTHON= concurrent flavors USE_QT= base declarative positioning webchannel webengine PLIST_SUB= PYQT_WEBENGINE_VERSION=${DISTVERSION} +post-patch: + @${REINPLACE_CMD} -e 's|%%QT_INCDIR%%|${QT_INCDIR}|g' \ + ${WRKSRC}/pyproject.toml + post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \ -name '*.so*' -exec ${STRIP_CMD} {} + diff --git a/www/py-qt6-webengine/files/patch-pyproject.toml b/www/py-qt6-webengine/files/patch-pyproject.toml new file mode 100644 index 000000000000..eff2ee7441ae --- /dev/null +++ b/www/py-qt6-webengine/files/patch-pyproject.toml @@ -0,0 +1,15 @@ +Workaround for qprinter.h not being found when the Qt stack has been built +without CUPS support. + +/usr/local/lib/python3.9/site-packages/PyQt6/bindings/QtPrintSupport/qprinter.sip:28:10: fatal error: 'qprinter.h' file not found +#include <qprinter.h> + ^~~~~~~~~~~~ + +--- pyproject.toml.orig 2023-10-25 10:26:54 UTC ++++ pyproject.toml +@@ -32,3 +32,5 @@ qmake-QT = ["webenginewidgets"] + + [tool.sip.bindings.QtWebEngineWidgets] + qmake-QT = ["webenginewidgets"] ++define-macros = ["QT_PRINTSUPPORT_LIB"] ++include-dirs = ["%%QT_INCDIR%%/QtPrintSupport"] diff --git a/www/qt6-httpserver/Makefile b/www/qt6-httpserver/Makefile index 4cea5f2efdbf..c6930af383fd 100644 --- a/www/qt6-httpserver/Makefile +++ b/www/qt6-httpserver/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Lightweight HTTP Server -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers diff --git a/www/qt6-httpserver/distinfo b/www/qt6-httpserver/distinfo index f29fcdbe81bf..c9a1e2660b0b 100644 --- a/www/qt6-httpserver/distinfo +++ b/www/qt6-httpserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050149 -SHA256 (KDE/Qt/6.6.0/qthttpserver-everywhere-src-6.6.0.tar.xz) = f5ae1ed7e9c8c43c5577cf0565b13c0d255b57158dd2314c3c78e43484e33c65 -SIZE (KDE/Qt/6.6.0/qthttpserver-everywhere-src-6.6.0.tar.xz) = 170956 +TIMESTAMP = 1701102624 +SHA256 (KDE/Qt/6.6.1/qthttpserver-everywhere-src-6.6.1.tar.xz) = 1bfeb3f52f15002a0197a4ef4f3ada7b43a6d0681e1797a11c1460ecfa83124c +SIZE (KDE/Qt/6.6.1/qthttpserver-everywhere-src-6.6.1.tar.xz) = 171104 diff --git a/www/qt6-webchannel/Makefile b/www/qt6-webchannel/Makefile index 2af764fc2e92..b016d0a20149 100644 --- a/www/qt6-webchannel/Makefile +++ b/www/qt6-webchannel/Makefile @@ -5,12 +5,10 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 library for integration of C++/QML with HTML/js clients -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers -USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl -USE_QT= base declarative websockets +USES= cmake compiler:c++17-lang pkgconfig qt-dist:6 +USE_QT= base declarative .include <bsd.port.mk> diff --git a/www/qt6-webchannel/distinfo b/www/qt6-webchannel/distinfo index 7fd499262991..905a33698582 100644 --- a/www/qt6-webchannel/distinfo +++ b/www/qt6-webchannel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050151 -SHA256 (KDE/Qt/6.6.0/qtwebchannel-everywhere-src-6.6.0.tar.xz) = fddcb38e6d5843f9c7570654f1a12aaf0086e5a01f7bf3cf170064fcc5a3f51c -SIZE (KDE/Qt/6.6.0/qtwebchannel-everywhere-src-6.6.0.tar.xz) = 214924 +TIMESTAMP = 1701102626 +SHA256 (KDE/Qt/6.6.1/qtwebchannel-everywhere-src-6.6.1.tar.xz) = f16087cd573ada98b3c90f10a18bb660dc8a65a6404e4d8e24a712799f91e543 +SIZE (KDE/Qt/6.6.1/qtwebchannel-everywhere-src-6.6.1.tar.xz) = 215212 diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index 39c488b1c232..7153864dad46 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -9,58 +9,72 @@ # - The process of porting QtWebEngine needs to be documented so we can move to # newer releases more easily. # -# Also note that, due to the insane amount of patches this port needs, it tends -# to lag behind the rest of the official Qt6 ones, which is why we set -# QT6_VERSION and DISTINFO_FILE here. -PORTNAME= webengine +PORTNAME?= webengine DISTVERSION= ${QT6_VERSION} -CATEGORIES= www +PORTREVISION?= 0 # Master port for print/qt6-pdf. Please keep this line. +CATEGORIES?= www PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org -COMMENT= Qt 6 library to render web content +COMMENT?= Qt 6 library to render web content -BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ - ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ - libcups.so:print/cups \ +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libnss3.so:security/nss \ + libxkbcommon.so:x11/libxkbcommon + +USES= bison cmake compiler:c++17-lang gl gperf \ + localbase:ldflags ninja:build nodejs:build,lts \ + pkgconfig python:build qt-dist:6,webengine +USE_GL= opengl +USE_QT= base declarative tools +USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ + xrandr xrender xscrnsaver xshmfence xtst + +CMAKE_ON= QT_FEATURE_webengine_system_ffmpeg \ + QT_FEATURE_webengine_proprietary_codecs + +.if defined(BUILD_QTPDF) +LIB_DEPENDS+= libcups.so:print/cups \ + libopenjp2.so:graphics/openjpeg + +CMAKE_ON+= QT_FEATURE_qtpdf_build +CMAKE_OFF+= QT_FEATURE_qtwebengine_build + +SYS_LIBS= freetype +.else +BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat +LIB_DEPENDS+= libavcodec.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdrm.so:graphics/libdrm \ libevent.so:devel/libevent \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ - liblcms2.so:graphics/lcms2 \ libnspr4.so:devel/nspr \ - libnss3.so:security/nss \ libopenh264.so:multimedia/openh264 \ - libopenjp2.so:graphics/openjpeg \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ + libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ - libtiff.so:graphics/tiff \ libvpx.so:multimedia/libvpx \ - libwebp.so:graphics/webp \ - libxkbcommon.so:x11/libxkbcommon + libwebp.so:graphics/webp -USES= bison cmake compiler:c++17-lang gl gnome gperf jpeg \ - localbase:ldflags minizip ninja:build nodejs:build,lts \ - pkgconfig python:build qt-dist:6,webengine xorg -USE_GL= gbm gl -USE_GNOME= glib20 libxml2 libxslt -USE_QT= base declarative:run positioning quick3d:build tools webchannel -USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ +USES+= gnome jpeg minizip xorg +USE_GL+= gbm +USE_QT+= positioning quick3d:build webchannel +USE_GNOME+= glib20 libxml2 libxslt +USE_XORG+= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ xrandr xrender xscrnsaver xshmfence xtst -CMAKE_ON= QT_FEATURE_webengine_system_ffmpeg QT_FEATURE_webengine_proprietary_codecs -# See https://reviews.freebsd.org/D41571 for further details. From time to -# time, e.g. with new qt6-webengine releases, it should be checked whether -# re2 can be unbundled again. -CMAKE_OFF= QT_FEATURE_webengine_system_re2 +CMAKE_ON+= QT_FEATURE_qtwebengine_build +CMAKE_OFF+= QT_FEATURE_qtpdf_build + +SYS_LIBS= freetype harfbuzz-ng libdrm libevent libpng libxml libxslt openh264 opus +.endif # The build system reads the environment variable $NINJA_PATH to decide whether # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are @@ -85,10 +99,9 @@ DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} -j1 $ BINARY_ALIAS= python3=${PYTHON_CMD} -DISTINFO_FILE= ${.CURDIR}/distinfo -QT6_VERSION= 6.6.0 - -OPTIONS_DEFAULT= ALSA +.if !defined(BUILD_QTPDF) +OPTIONS_DEFINE= CUPS +OPTIONS_DEFAULT= ALSA CUPS OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO @@ -100,12 +113,22 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins ALSA_CMAKE_ON= -DQT_FEATURE_webengine_system_alsa:BOOL=ON ALSA_CMAKE_OFF= -DQT_FEATURE_webengine_system_alsa:BOOL=OFF + +CUPS_LIB_DEPENDS= libcups.so:print/cups \ + liblcms2.so:graphics/lcms2 \ + libopenjp2.so:graphics/openjpeg \ + libtiff.so:graphics/tiff +CUPS_CMAKE_ON= -DQT_FEATURE_webengine_printing_and_pdf:BOOL=ON +CUPS_CMAKE_OFF= -DQT_FEATURE_webengine_printing_and_pdf: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 + SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_ON= -DQT_FEATURE_webengine_system_sndio:BOOL=ON SNDIO_CMAKE_OFF= -DQT_FEATURE_webengine_system_sndio:BOOL=OFF +.endif .include <bsd.port.pre.mk> @@ -132,10 +155,13 @@ pre-configure: # Leads to missing header errors: icu, libvpx, libwebp, re2, snappy, zlib # No-Op: flac # +# Don't attempt to unbundle libraries that the Pdf module doesn't use. It +# causes configuration errors. +# # cd ${WRKSRC} && ${PYTHON_CMD} \ # ./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC}/src/3rdparty/chromium && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - fontconfig freetype harfbuzz-ng libdrm libevent libpng libxml libxslt openh264 opus || ${FALSE} + ${SYS_LIBS} || ${FALSE} .include <bsd.port.post.mk> diff --git a/www/qt6-webengine/distinfo b/www/qt6-webengine/distinfo index 96770f6bba9f..a301e0df3970 100644 --- a/www/qt6-webengine/distinfo +++ b/www/qt6-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050315 -SHA256 (KDE/Qt/6.6.0/qtwebengine-everywhere-src-6.6.0.tar.xz) = d5dc9ff05a2c57adbf99cbf0c7cb6f19527f67216caf627b0cc160a1d253b780 -SIZE (KDE/Qt/6.6.0/qtwebengine-everywhere-src-6.6.0.tar.xz) = 421117212 +TIMESTAMP = 1701102894 +SHA256 (KDE/Qt/6.6.1/qtwebengine-everywhere-src-6.6.1.tar.xz) = 7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691 +SIZE (KDE/Qt/6.6.1/qtwebengine-everywhere-src-6.6.1.tar.xz) = 421042656 diff --git a/www/qt6-webengine/files/patch-cmake_Functions.cmake b/www/qt6-webengine/files/patch-cmake_Functions.cmake index 6d8db14848de..0b7d8a757852 100644 --- a/www/qt6-webengine/files/patch-cmake_Functions.cmake +++ b/www/qt6-webengine/files/patch-cmake_Functions.cmake @@ -1,6 +1,6 @@ ---- cmake/Functions.cmake.orig 2023-08-16 19:50:41 UTC +--- cmake/Functions.cmake.orig 2023-11-20 16:08:07 UTC +++ cmake/Functions.cmake -@@ -447,7 +447,7 @@ function(add_linker_options target buildDir completeSt +@@ -452,7 +452,7 @@ function(add_linker_options target buildDir completeSt set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp") set(ldir_rsp "${buildDir}/${ninjaTarget}_ldir.rsp") set_target_properties(${cmakeTarget} PROPERTIES STATIC_LIBRARY_OPTIONS "@${objects_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") -@@ -699,6 +699,8 @@ function(get_gn_os result) +@@ -704,6 +704,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() -@@ -889,7 +891,7 @@ macro(append_build_type_setup) +@@ -894,7 +896,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 -@@ -941,7 +943,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -946,7 +948,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 ) -@@ -979,7 +981,7 @@ macro(append_compiler_linker_sdk_setup) +@@ -984,7 +986,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 -@@ -1054,7 +1056,7 @@ macro(append_toolchain_setup) +@@ -1059,7 +1061,7 @@ macro(append_toolchain_setup) ) list(APPEND gnArgArg host_cpu="${cpu}") endif() @@ -54,7 +54,7 @@ list(APPEND gnArgArg custom_toolchain="${buildDir}/target_toolchain:target" host_toolchain="${buildDir}/host_toolchain:host" -@@ -1086,7 +1088,7 @@ macro(append_pkg_config_setup) +@@ -1091,7 +1093,7 @@ macro(append_pkg_config_setup) macro(append_pkg_config_setup) @@ -63,7 +63,7 @@ list(APPEND gnArgArg pkg_config="${PKG_CONFIG_EXECUTABLE}" host_pkg_config="${PKG_CONFIG_HOST_EXECUTABLE}" -@@ -1179,6 +1181,20 @@ function(add_gn_build_aritfacts_to_target) +@@ -1184,6 +1186,20 @@ function(add_gn_build_aritfacts_to_target) set_target_properties(${arg_CMAKE_TARGET} PROPERTIES LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP} ) @@ -84,7 +84,7 @@ if(QT_IS_MACOS_UNIVERSAL) add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC}) elseif(IOS) -@@ -1305,7 +1321,7 @@ function(check_for_ulimit) +@@ -1311,7 +1327,7 @@ function(check_for_ulimit) function(check_for_ulimit) message("-- Checking 'ulimit -n'") @@ -93,7 +93,7 @@ OUTPUT_VARIABLE ulimitOutput ) string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}") -@@ -1314,7 +1330,7 @@ function(check_for_ulimit) +@@ -1320,7 +1336,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 diff --git a/www/qt6-webengine/files/patch-configure.cmake b/www/qt6-webengine/files/patch-configure.cmake index aa59c6004ca5..b99f8dc18884 100644 --- a/www/qt6-webengine/files/patch-configure.cmake +++ b/www/qt6-webengine/files/patch-configure.cmake @@ -1,4 +1,4 @@ ---- configure.cmake.orig 2023-10-03 19:49:54 UTC +--- configure.cmake.orig 2023-11-20 16:08:07 UTC +++ configure.cmake @@ -67,7 +67,7 @@ endif() endif() @@ -9,7 +9,7 @@ check_for_ulimit() endif() -@@ -438,7 +438,7 @@ qt_feature("webengine-ozone-x11" PRIVATE +@@ -439,7 +439,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 -@@ -475,12 +475,12 @@ add_check_for_support( +@@ -476,12 +476,12 @@ add_check_for_support( ) add_check_for_support( MODULES QtWebEngine @@ -33,7 +33,7 @@ MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android(on non-Windows hosts only)." ) if(LINUX AND CMAKE_CROSSCOMPILING) -@@ -502,13 +502,6 @@ add_check_for_support( +@@ -503,13 +503,6 @@ add_check_for_support( MESSAGE "node.js version 14 or later is required." ) add_check_for_support( @@ -47,7 +47,7 @@ MODULES QtWebEngine QtPdf CONDITION Python3_EXECUTABLE MESSAGE "Python version 3.6 or later is required." -@@ -586,8 +579,8 @@ add_check_for_support( +@@ -587,8 +580,8 @@ add_check_for_support( add_check_for_support( MODULES QtWebEngine CONDITION MSVC OR @@ -58,7 +58,7 @@ (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) MESSAGE "${CMAKE_CXX_COMPILER_ID} compiler is not supported." -@@ -596,8 +589,8 @@ add_check_for_support( +@@ -597,8 +590,8 @@ add_check_for_support( add_check_for_support( MODULES QtPdf CONDITION MSVC OR diff --git a/www/qt6-webengine/files/patch-security-rollup b/www/qt6-webengine/files/patch-security-rollup new file mode 100644 index 000000000000..a50454f4e40c --- /dev/null +++ b/www/qt6-webengine/files/patch-security-rollup @@ -0,0 +1,103 @@ +Add security patches to this file. + +Addresses the following security issues: +- CVE-2023-5997 +- CVE-2023-6112 + +From 669506a53474e3d7637666d3c53f6101fb94d96f Mon Sep 17 00:00:00 2001 +From: Nidhi Jaju <nidhijaju@chromium.org> +Date: Thu, 2 Nov 2023 08:16:57 +0000 +Subject: [PATCH] [Backport] CVE-2023-5997: Use after free in Garbage + Collection + +Cherry-pick of patch originally reviewed on +https://chromium-review.googlesource.com/c/chromium/src/+/4996929: +Make URLSearchParams persistent to avoid UaF + +The URLSearchParams::Create() function returns an on-heap object, but it +can be garbage collected, so making it a persistent variable in +DidFetchDataLoadedString() mitigates the issue. + +Bug: 1497997 +Change-Id: I229efec33451792a10a185cb2f9aa37dd0579823 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4996929 +Reviewed-by: Adam Rice <ricea@chromium.org> +Commit-Queue: Nidhi Jaju <nidhijaju@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1218682} +Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/518606 +Reviewed-by: Michal Klocek <michal.klocek@qt.io> +--- + chromium/third_party/blink/renderer/core/fetch/body.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/chromium/third_party/blink/renderer/core/fetch/body.cc b/chromium/third_party/blink/renderer/core/fetch/body.cc +index f24125ee271..6f6abd5b961 100644 +--- src/3rdparty/chromium/third_party/blink/renderer/core/fetch/body.cc.orig ++++ src/3rdparty/chromium/third_party/blink/renderer/core/fetch/body.cc +@@ -119,8 +119,13 @@ class BodyFormDataConsumer final : public BodyConsumerBase { + + void DidFetchDataLoadedString(const String& string) override { + auto* formData = MakeGarbageCollected<FormData>(); +- for (const auto& pair : URLSearchParams::Create(string)->Params()) ++ // URLSearchParams::Create() returns an on-heap object, but it can be ++ // garbage collected, so making it a persistent variable on the stack ++ // mitigates use-after-free scenarios. See crbug.com/1497997. ++ Persistent<URLSearchParams> search_params = URLSearchParams::Create(string); ++ for (const auto& pair : search_params->Params()) { + formData->append(pair.first, pair.second); ++ } + DidFetchDataLoadedFormData(formData); + } + }; +From 6c805bf7507997616d826f20c7c901739ed3b431 Mon Sep 17 00:00:00 2001 +From: Yoshisato Yanagisawa <yyanagisawa@chromium.org> +Date: Tue, 7 Nov 2023 02:56:57 +0000 +Subject: [PATCH] [Backport] CVE-2023-6112: Use after free in Navigation + +Cherry-pick of patch originally reviewed on +https://chromium-review.googlesource.com/c/chromium/src/+/5004329: +Use WeakPointer for the loader fallback callback. + +`MaybeStartLoader` binds an unretained pointer to +`FallbackToNonInterceptedRequest`, which is passed through a series of +objects until it reaches `ServiceWorkerMainResourceLoader`. + +When "network" or "cache" is selected as a ServiceWorker static +routing API's source and caused the network fallback, the unretained +pointer can be released and may cause use-after-free. + +This CL changes the unretained pointer to a weak pointer to avoid that. +For the consistency of the function call, both of the callbacks +starts to use weak pointers. + +Bug: 1499298 +Change-Id: I7e7c93fa389ab35584703f30bfc722eadeca81dd +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5004329 +Reviewed-by: Shunya Shishido <sisidovski@chromium.org> +Reviewed-by: Minoru Chikamune <chikamune@chromium.org> +Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org> +Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1220697} +Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/518607 +Reviewed-by: Michal Klocek <michal.klocek@qt.io> +--- + chromium/content/browser/loader/navigation_url_loader_impl.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/chromium/content/browser/loader/navigation_url_loader_impl.cc b/chromium/content/browser/loader/navigation_url_loader_impl.cc +index 0e8f73e7d18..0bd83dadec2 100644 +--- src/3rdparty/chromium/content/browser/loader/navigation_url_loader_impl.cc.orig ++++ src/3rdparty/chromium/content/browser/loader/navigation_url_loader_impl.cc +@@ -638,10 +638,10 @@ void NavigationURLLoaderImpl::MaybeStartLoader( + next_interceptor->MaybeCreateLoader( + *resource_request_, browser_context_, + base::BindOnce(&NavigationURLLoaderImpl::MaybeStartLoader, +- base::Unretained(this), next_interceptor), ++ weak_factory_.GetWeakPtr(), next_interceptor), + base::BindOnce( + &NavigationURLLoaderImpl::FallbackToNonInterceptedRequest, +- base::Unretained(this))); ++ weak_factory_.GetWeakPtr())); + return; + } + diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_checked__iterators.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_checked__iterators.h index 5a63712a10bb..0c4ea373280b 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_checked__iterators.h +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_checked__iterators.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/containers/checked_iterators.h.orig 2023-09-07 16:02:00 UTC +--- src/3rdparty/chromium/base/containers/checked_iterators.h.orig 2023-11-20 16:08:07 UTC +++ src/3rdparty/chromium/base/containers/checked_iterators.h -@@ -23,6 +23,9 @@ class CheckedContiguousIterator { +@@ -24,6 +24,9 @@ class CheckedContiguousIterator { using pointer = T*; using reference = T&; using iterator_category = std::random_access_iterator_tag; @@ -10,7 +10,7 @@ // Required for converting constructor below. template <typename U> -@@ -30,10 +33,8 @@ class CheckedContiguousIterator { +@@ -31,10 +34,8 @@ class CheckedContiguousIterator { // Required for certain libc++ algorithm optimizations that are not available // for NaCl. @@ -21,7 +21,7 @@ constexpr CheckedContiguousIterator() = default; -@@ -217,7 +218,6 @@ using CheckedContiguousConstIterator = CheckedContiguo +@@ -224,7 +225,6 @@ using CheckedContiguousConstIterator = CheckedContiguo } // namespace base @@ -29,7 +29,7 @@ // Specialize both std::__is_cpp17_contiguous_iterator and std::pointer_traits // for CCI in case we compile with libc++ outside of NaCl. The former is // required to enable certain algorithm optimizations (e.g. std::copy can be a -@@ -235,13 +235,35 @@ using CheckedContiguousConstIterator = CheckedContiguo +@@ -242,13 +242,35 @@ using CheckedContiguousConstIterator = CheckedContiguo // [1] https://wg21.link/iterator.concept.contiguous // [2] https://wg21.link/std.iterator.tags // [3] https://wg21.link/pointer.traits.optmem @@ -66,7 +66,7 @@ struct pointer_traits<::base::CheckedContiguousIterator<T>> { using pointer = ::base::CheckedContiguousIterator<T>; using element_type = T; -@@ -260,6 +282,5 @@ struct pointer_traits<::base::CheckedContiguousIterato +@@ -267,6 +289,5 @@ struct pointer_traits<::base::CheckedContiguousIterato }; } // namespace std diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni index d55a846d49d9..c4d3cef02ebe 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2023-08-16 19:50:41 UTC +--- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2023-11-20 16:08:07 UTC +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -833,22 +840,12 @@ template("clang_toolchain") { +@@ -839,22 +846,12 @@ template("clang_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc index d19b0171311b..0ad768406f15 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2022-11-30 08:12:58 UTC +--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2023-11-20 16:08:07 UTC +++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -19,8 +19,10 @@ +@@ -20,8 +20,10 @@ #include "build/chromeos_buildflags.h" #include "content/common/zygote/zygote_commands_linux.h" #include "content/common/zygote/zygote_communication_linux.h" @@ -11,7 +11,7 @@ #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/suid/client/setuid_sandbox_host.h" -@@ -38,6 +40,7 @@ namespace content { +@@ -39,6 +41,7 @@ namespace { namespace { @@ -19,7 +19,7 @@ // Receive a fixed message on fd and return the sender's PID. // Returns true if the message received matches the expected message. bool ReceiveFixedMessage(int fd, -@@ -59,6 +62,7 @@ bool ReceiveFixedMessage(int fd, +@@ -60,6 +63,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -27,7 +27,7 @@ } // namespace -@@ -68,9 +72,13 @@ ZygoteHost* ZygoteHost::GetInstance() { +@@ -69,9 +73,13 @@ ZygoteHostImpl::ZygoteHostImpl() } ZygoteHostImpl::ZygoteHostImpl() @@ -41,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -83,6 +91,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +@@ -84,6 +92,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -49,7 +49,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -133,6 +142,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -134,6 +143,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -57,15 +57,15 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -157,6 +167,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -158,6 +168,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { +#if !BUILDFLAG(IS_BSD) int fds[2]; + #if !defined(TOOLKIT_QT) CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); - CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -224,9 +235,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -232,9 +243,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc index 94591e3949bb..113fe2c35295 100644 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2023-03-09 06:31:50 UTC +--- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2023-04-28 19:19:55 UTC +++ src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.cc -@@ -0,0 +1,239 @@ +@@ -0,0 +1,245 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + -+#include "sandbox/policy/openbsd/sandbox_openbsd.h" ++#include "sandbox/policy/freebsd/sandbox_freebsd.h" + +#include <dirent.h> +#include <fcntl.h> @@ -36,6 +36,8 @@ +#include "base/threading/thread.h" +#include "base/time/time.h" +#include "build/build_config.h" ++#include "crypto/crypto_buildflags.h" ++#include "ppapi/buildflags/buildflags.h" +#include "sandbox/constants.h" +#include "sandbox/linux/services/credentials.h" +#include "sandbox/linux/services/namespace_sandbox.h" @@ -54,22 +56,13 @@ +#include <sanitizer/common_interface_defs.h> +#endif + -+#if defined(USE_NSS_CERTS) ++#if BUILDFLAG(USE_NSS_CERTS) +#include "crypto/nss_util.h" +#endif + -+#include "ui/gfx/font_util.h" -+ -+#define MAXTOKENS 3 ++#include "third_party/boringssl/src/include/openssl/crypto.h" + -+#define _UNVEIL_MAIN "/etc/chromium/unveil.main"; -+#define _UNVEIL_RENDERER "/etc/chromium/unveil.renderer"; -+#define _UNVEIL_GPU "/etc/chromium/unveil.gpu"; -+#define _UNVEIL_PLUGIN "/etc/chromium/unveil.plugin"; -+#define _UNVEIL_UTILITY "/etc/chromium/unveil.utility"; -+#define _UNVEIL_UTILITY_NETWORK "/etc/chromium/unveil.utility_network"; -+#define _UNVEIL_UTILITY_AUDIO "/etc/chromium/unveil.utility_audio"; -+#define _UNVEIL_UTILITY_VIDEO "/etc/chromium/unveil.utility_video"; ++#include "ui/gfx/font_util.h" + +namespace sandbox { +namespace policy { @@ -112,35 +105,43 @@ + + base::SysInfo::AmountOfPhysicalMemory(); + base::SysInfo::NumberOfProcessors(); ++ base::SysInfo::CPUModelName(); + -+#if defined(USE_NSS_CERTS) -+ // The main process has to initialize the ~/.pki dir which won't work -+ // after unveil(2). -+ if (process_type.empty()) -+ crypto::EnsureNSSInit(); ++ switch (sandbox_type) { ++ case sandbox::mojom::Sandbox::kNoSandbox: ++ { ++#if BUILDFLAG(USE_NSS_CERTS) ++ // The main process has to initialize the ~/.pki dir which won't work ++ // after unveil(2). ++ crypto::EnsureNSSInit(); +#endif ++ CRYPTO_pre_sandbox_init(); + -+ if (process_type.empty()) { -+ base::FilePath cache_directory, local_directory; ++ base::FilePath cache_directory, local_directory; + -+ base::PathService::Get(base::DIR_CACHE, &cache_directory); -+ base::PathService::Get(base::DIR_HOME, &local_directory); ++ base::PathService::Get(base::DIR_CACHE, &cache_directory); ++ base::PathService::Get(base::DIR_HOME, &local_directory); + -+ cache_directory = cache_directory.AppendASCII("chromium"); -+ local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications"); ++ cache_directory = cache_directory.AppendASCII("chromium"); ++ local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications"); + -+ if (!base::CreateDirectory(cache_directory)) { -+ LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory."; -+ } ++ if (!base::CreateDirectory(cache_directory)) { ++ LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory."; ++ } + -+ if (!base::CreateDirectory(local_directory)) { -+ LOG(ERROR) << "Failed to create " << local_directory.value() << " directory."; ++ if (!base::CreateDirectory(local_directory)) { ++ LOG(ERROR) << "Failed to create " << local_directory.value() << " directory."; ++ } ++ ++ break; + } ++ case sandbox::mojom::Sandbox::kRenderer: ++ gfx::InitializeFonts(); ++ break; ++ default: ++ break; + } + -+ if (process_type == switches::kRendererProcess) -+ gfx::InitializeFonts(); -+ + pre_initialized_ = true; +} + @@ -174,6 +175,9 @@ + PCHECK(limited_as); + } + ++ if (hook) ++ CHECK(std::move(hook).Run(options)); ++ + return true; +} + @@ -217,8 +221,10 @@ + return "Utility"; + case sandbox::mojom::Sandbox::kGpu: + return "GPU"; ++#if BUILDFLAG(ENABLE_PPAPI) + case sandbox::mojom::Sandbox::kPpapi: + return "PPAPI"; ++#endif + case sandbox::mojom::Sandbox::kNetwork: + return "Network"; + case sandbox::mojom::Sandbox::kCdm: diff --git a/www/qt6-webengine/files/patch-src_core_api_configure.cmake b/www/qt6-webengine/files/patch-src_core_api_configure.cmake index a80e138141a7..37bf6d26192b 100644 --- a/www/qt6-webengine/files/patch-src_core_api_configure.cmake +++ b/www/qt6-webengine/files/patch-src_core_api_configure.cmake @@ -1,4 +1,4 @@ ---- src/core/api/configure.cmake.orig 2023-09-21 14:52:09 UTC +--- src/core/api/configure.cmake.orig 2023-11-20 16:08:07 UTC +++ src/core/api/configure.cmake @@ -10,6 +10,7 @@ if(NOT QT_CONFIGURE_RUNNING) if(PkgConfig_FOUND) @@ -20,16 +20,16 @@ qt_feature("webengine-pepper-plugins" PRIVATE LABEL "Pepper Plugins" PURPOSE "Enables use of Pepper plugins." -@@ -163,7 +169,7 @@ qt_feature("webengine-vaapi" PRIVATE - LABEL "VA-API support" +@@ -164,7 +170,7 @@ qt_feature("webengine-vaapi" PRIVATE PURPOSE "Enables support for VA-API hardware acceleration" AUTODETECT GBM_FOUND AND LIBVA_FOUND AND QT_FEATURE_vulkan -- CONDITION LINUX -+ CONDITION UNIX + # hardware accelerated encoding requires bundled libvpx +- CONDITION LINUX AND NOT QT_FEATURE_webengine_system_libvpx ++ CONDITION UNIX AND NOT QT_FEATURE_webengine_system_libvpx ) # internal testing feature qt_feature("webengine-system-poppler" PRIVATE -@@ -198,15 +204,19 @@ qt_configure_add_summary_entry( +@@ -199,15 +205,19 @@ qt_configure_add_summary_entry( ) qt_configure_add_summary_entry( ARGS "webengine-vaapi" diff --git a/www/qt6-webengine/pkg-plist b/www/qt6-webengine/pkg-plist index 9dfd1b4145ab..8479693b2243 100644 --- a/www/qt6-webengine/pkg-plist +++ b/www/qt6-webengine/pkg-plist @@ -1,59 +1,3 @@ -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfdocument_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdffile_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflink_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfsearchmodel_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfselection_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdf-config_p.h -%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdfexports_p.h -%%QT_INCDIR%%/QtPdf/QPdfBookmarkModel -%%QT_INCDIR%%/QtPdf/QPdfDocument -%%QT_INCDIR%%/QtPdf/QPdfDocumentRenderOptions -%%QT_INCDIR%%/QtPdf/QPdfLink -%%QT_INCDIR%%/QtPdf/QPdfLinkModel -%%QT_INCDIR%%/QtPdf/QPdfPageNavigator -%%QT_INCDIR%%/QtPdf/QPdfPageRenderer -%%QT_INCDIR%%/QtPdf/QPdfSearchModel -%%QT_INCDIR%%/QtPdf/QPdfSelection -%%QT_INCDIR%%/QtPdf/QtPdf -%%QT_INCDIR%%/QtPdf/QtPdfDepends -%%QT_INCDIR%%/QtPdf/QtPdfVersion -%%QT_INCDIR%%/QtPdf/qpdfbookmarkmodel.h -%%QT_INCDIR%%/QtPdf/qpdfdocument.h -%%QT_INCDIR%%/QtPdf/qpdfdocumentrenderoptions.h -%%QT_INCDIR%%/QtPdf/qpdflink.h -%%QT_INCDIR%%/QtPdf/qpdflinkmodel.h -%%QT_INCDIR%%/QtPdf/qpdfpagenavigator.h -%%QT_INCDIR%%/QtPdf/qpdfpagerenderer.h -%%QT_INCDIR%%/QtPdf/qpdfsearchmodel.h -%%QT_INCDIR%%/QtPdf/qpdfselection.h -%%QT_INCDIR%%/QtPdf/qtpdf-config.h -%%QT_INCDIR%%/QtPdf/qtpdfexports.h -%%QT_INCDIR%%/QtPdf/qtpdfglobal.h -%%QT_INCDIR%%/QtPdf/qtpdfversion.h -%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfbookmarkmodel_p.h -%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfdocument_p.h -%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdflinkmodel_p.h -%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfpageimage_p.h -%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfpagenavigator_p.h -%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfsearchmodel_p.h -%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qquickpdfselection_p.h -%%QT_INCDIR%%/QtPdfQuick/%%FULLVER%%/QtPdfQuick/private/qtpdfquickglobal_p.h -%%QT_INCDIR%%/QtPdfQuick/QtPdfQuick -%%QT_INCDIR%%/QtPdfQuick/QtPdfQuickDepends -%%QT_INCDIR%%/QtPdfQuick/QtPdfQuickVersion -%%QT_INCDIR%%/QtPdfQuick/qtpdfquickversion.h -%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qpdfpageselector_p.h -%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qpdfview_p.h -%%QT_INCDIR%%/QtPdfWidgets/QPdfPageSelector -%%QT_INCDIR%%/QtPdfWidgets/QPdfView -%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgets -%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsDepends -%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsVersion -%%QT_INCDIR%%/QtPdfWidgets/qpdfpageselector.h -%%QT_INCDIR%%/QtPdfWidgets/qpdfview.h -%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsglobal.h -%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsversion.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecore-config_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecoreglobal_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecontextmenurequest_p.h @@ -191,42 +135,6 @@ lib/cmake/Qt6Designer/Qt6QWebEngineViewPluginConfigVersion.cmake lib/cmake/Qt6Designer/Qt6QWebEngineViewPluginConfigVersionImpl.cmake lib/cmake/Qt6Designer/Qt6QWebEngineViewPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6Designer/Qt6QWebEngineViewPluginTargets.cmake -lib/cmake/Qt6Gui/Qt6QPdfPluginAdditionalTargetInfo.cmake -lib/cmake/Qt6Gui/Qt6QPdfPluginConfig.cmake -lib/cmake/Qt6Gui/Qt6QPdfPluginConfigVersion.cmake -lib/cmake/Qt6Gui/Qt6QPdfPluginConfigVersionImpl.cmake -lib/cmake/Qt6Gui/Qt6QPdfPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Gui/Qt6QPdfPluginTargets.cmake -lib/cmake/Qt6Pdf/Qt6PdfAdditionalTargetInfo.cmake -lib/cmake/Qt6Pdf/Qt6PdfConfig.cmake -lib/cmake/Qt6Pdf/Qt6PdfConfigVersion.cmake -lib/cmake/Qt6Pdf/Qt6PdfConfigVersionImpl.cmake -lib/cmake/Qt6Pdf/Qt6PdfDependencies.cmake -lib/cmake/Qt6Pdf/Qt6PdfTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Pdf/Qt6PdfTargets.cmake -lib/cmake/Qt6Pdf/Qt6PdfVersionlessTargets.cmake -lib/cmake/Qt6PdfQuick/Qt6PdfQuickAdditionalTargetInfo.cmake -lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfig.cmake -lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfigVersion.cmake -lib/cmake/Qt6PdfQuick/Qt6PdfQuickConfigVersionImpl.cmake -lib/cmake/Qt6PdfQuick/Qt6PdfQuickDependencies.cmake -lib/cmake/Qt6PdfQuick/Qt6PdfQuickTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6PdfQuick/Qt6PdfQuickTargets.cmake -lib/cmake/Qt6PdfQuick/Qt6PdfQuickVersionlessTargets.cmake -lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsAdditionalTargetInfo.cmake -lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfig.cmake -lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfigVersion.cmake -lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsConfigVersionImpl.cmake -lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsDependencies.cmake -lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsTargets.cmake -lib/cmake/Qt6PdfWidgets/Qt6PdfWidgetsVersionlessTargets.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginAdditionalTargetInfo.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfig.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfigVersion.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginConfigVersionImpl.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Qt6Qml/QmlPlugins/Qt6PdfQuickpluginTargets.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtwebenginequickdelegatespluginAdditionalTargetInfo.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtwebenginequickdelegatespluginConfig.cmake lib/cmake/Qt6Qml/QmlPlugins/Qt6qtwebenginequickdelegatespluginConfigVersion.cmake @@ -279,18 +187,6 @@ lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsDependencies.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsTargets.cmake lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake -%%QT_LIBDIR%%/libQt6Pdf.prl -%%QT_LIBDIR%%/libQt6Pdf.so -%%QT_LIBDIR%%/libQt6Pdf.so.6 -%%QT_LIBDIR%%/libQt6Pdf.so.%%FULLVER%% -%%QT_LIBDIR%%/libQt6PdfQuick.prl -%%QT_LIBDIR%%/libQt6PdfQuick.so -%%QT_LIBDIR%%/libQt6PdfQuick.so.6 -%%QT_LIBDIR%%/libQt6PdfQuick.so.%%FULLVER%% -%%QT_LIBDIR%%/libQt6PdfWidgets.prl -%%QT_LIBDIR%%/libQt6PdfWidgets.so -%%QT_LIBDIR%%/libQt6PdfWidgets.so.6 -%%QT_LIBDIR%%/libQt6PdfWidgets.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6WebEngineCore.prl %%QT_LIBDIR%%/libQt6WebEngineCore.so %%QT_LIBDIR%%/libQt6WebEngineCore.so.6 @@ -307,19 +203,10 @@ lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6WebEngineWidgets.so %%QT_LIBDIR%%/libQt6WebEngineWidgets.so.6 %%QT_LIBDIR%%/libQt6WebEngineWidgets.so.%%FULLVER%% -%%QT_LIBDIR%%/metatypes/qt6pdf_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%QT_LIBDIR%%/metatypes/qt6pdfquick_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%QT_LIBDIR%%/metatypes/qt6pdfwidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6webenginecore_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6webenginequick_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6webenginequickdelegatesqml_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6webenginewidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json -%%QT_MKSPECDIR%%/modules/qt_lib_pdf.pri -%%QT_MKSPECDIR%%/modules/qt_lib_pdf_private.pri -%%QT_MKSPECDIR%%/modules/qt_lib_pdfquick.pri -%%QT_MKSPECDIR%%/modules/qt_lib_pdfquick_private.pri -%%QT_MKSPECDIR%%/modules/qt_lib_pdfwidgets.pri -%%QT_MKSPECDIR%%/modules/qt_lib_pdfwidgets_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_webenginecore.pri %%QT_MKSPECDIR%%/modules/qt_lib_webenginecore_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_webenginequick.pri @@ -329,17 +216,6 @@ lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_webenginewidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_webenginewidgets_private.pri %%QT_PLUGINDIR%%/designer/libqwebengineview.so -%%QT_PLUGINDIR%%/imageformats/libqpdf.so -%%QT_QMLDIR%%/QtQuick/Pdf/+Material/PdfStyle.qml -%%QT_QMLDIR%%/QtQuick/Pdf/+Universal/PdfStyle.qml -%%QT_QMLDIR%%/QtQuick/Pdf/PdfLinkDelegate.qml -%%QT_QMLDIR%%/QtQuick/Pdf/PdfMultiPageView.qml -%%QT_QMLDIR%%/QtQuick/Pdf/PdfPageView.qml -%%QT_QMLDIR%%/QtQuick/Pdf/PdfScrollablePageView.qml -%%QT_QMLDIR%%/QtQuick/Pdf/PdfStyle.qml -%%QT_QMLDIR%%/QtQuick/Pdf/libpdfquickplugin.so -%%QT_QMLDIR%%/QtQuick/Pdf/plugins.qmltypes -%%QT_QMLDIR%%/QtQuick/Pdf/qmldir %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/AlertDialog.qml %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/AuthenticationDialog.qml %%QT_QMLDIR%%/QtWebEngine/ControlsDelegates/AutofillPopup.qml @@ -360,18 +236,12 @@ lib/cmake/Qt6WebEngineWidgets/Qt6WebEngineWidgetsVersionlessTargets.cmake %%QT_QMLDIR%%/QtWebEngine/libqtwebenginequickplugin.so %%QT_QMLDIR%%/QtWebEngine/plugins.qmltypes %%QT_QMLDIR%%/QtWebEngine/qmldir -libdata/pkgconfig/Qt6Pdf.pc -libdata/pkgconfig/Qt6PdfQuick.pc -libdata/pkgconfig/Qt6PdfWidgets.pc libdata/pkgconfig/Qt6WebEngineCore.pc libdata/pkgconfig/Qt6WebEngineQuick.pc libdata/pkgconfig/Qt6WebEngineQuickDelegatesQml.pc libdata/pkgconfig/Qt6WebEngineWidgets.pc %%QT_TOOLDIR%%/QtWebEngineProcess %%QT_TOOLDIR%%/qwebengine_convert_dict -%%QT_DATADIR%%/modules/Pdf.json -%%QT_DATADIR%%/modules/PdfQuick.json -%%QT_DATADIR%%/modules/PdfWidgets.json %%QT_DATADIR%%/modules/WebEngineCore.json %%QT_DATADIR%%/modules/WebEngineQuick.json %%QT_DATADIR%%/modules/WebEngineQuickDelegatesQml.json diff --git a/www/qt6-websockets/Makefile b/www/qt6-websockets/Makefile index 29fe6e87ca91..356d439b6913 100644 --- a/www/qt6-websockets/Makefile +++ b/www/qt6-websockets/Makefile @@ -5,7 +5,6 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt implementation of WebSocket protocol -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers diff --git a/www/qt6-websockets/distinfo b/www/qt6-websockets/distinfo index 12a65f3cb827..ff6134430cb1 100644 --- a/www/qt6-websockets/distinfo +++ b/www/qt6-websockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050317 -SHA256 (KDE/Qt/6.6.0/qtwebsockets-everywhere-src-6.6.0.tar.xz) = 2e05b15c0c6e82c484cf3a4a39a3e3e484a6c8f72bc31ee5cf615d52d07df30e -SIZE (KDE/Qt/6.6.0/qtwebsockets-everywhere-src-6.6.0.tar.xz) = 463624 +TIMESTAMP = 1701102896 +SHA256 (KDE/Qt/6.6.1/qtwebsockets-everywhere-src-6.6.1.tar.xz) = 787514349876d87e046504e5f64886d886bd2993a53fa795598ea07ecc7b0643 +SIZE (KDE/Qt/6.6.1/qtwebsockets-everywhere-src-6.6.1.tar.xz) = 463896 diff --git a/www/qt6-webview/Makefile b/www/qt6-webview/Makefile index 45de0575c5d4..e584b5616031 100644 --- a/www/qt6-webview/Makefile +++ b/www/qt6-webview/Makefile @@ -9,7 +9,7 @@ COMMENT= Qt component for displaying web content LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative positioning webchannel webengine .include <bsd.port.mk> diff --git a/www/qt6-webview/distinfo b/www/qt6-webview/distinfo index 608c80fc79df..e60aa427e0ee 100644 --- a/www/qt6-webview/distinfo +++ b/www/qt6-webview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050319 -SHA256 (KDE/Qt/6.6.0/qtwebview-everywhere-src-6.6.0.tar.xz) = a5a48d9b5dfac60b66a737f844dc57de311de9d154fe10ccd8ec498506753392 -SIZE (KDE/Qt/6.6.0/qtwebview-everywhere-src-6.6.0.tar.xz) = 147528 +TIMESTAMP = 1701102898 +SHA256 (KDE/Qt/6.6.1/qtwebview-everywhere-src-6.6.1.tar.xz) = d6de1ba33be93ae464147c9c069e115c7a24e3e475640016bc2f07c93c4a256c +SIZE (KDE/Qt/6.6.1/qtwebview-everywhere-src-6.6.1.tar.xz) = 147644 diff --git a/x11-toolkits/qt6-charts/Makefile b/x11-toolkits/qt6-charts/Makefile index a11d9cc188b5..1583d2034c40 100644 --- a/x11-toolkits/qt6-charts/Makefile +++ b/x11-toolkits/qt6-charts/Makefile @@ -5,12 +5,11 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 charts module -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-charts/distinfo b/x11-toolkits/qt6-charts/distinfo index d987a84c2be3..876e37096f08 100644 --- a/x11-toolkits/qt6-charts/distinfo +++ b/x11-toolkits/qt6-charts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050324 -SHA256 (KDE/Qt/6.6.0/qtcharts-everywhere-src-6.6.0.tar.xz) = e6beabcdc70c7719818459d2b2db63d7b0b5adc5572b8802368b698f64292cf5 -SIZE (KDE/Qt/6.6.0/qtcharts-everywhere-src-6.6.0.tar.xz) = 4668892 +TIMESTAMP = 1701102903 +SHA256 (KDE/Qt/6.6.1/qtcharts-everywhere-src-6.6.1.tar.xz) = 1156caa94526b7e1bc30da800a7503d19744b10afc7c1f702da6dedfaa2a31b6 +SIZE (KDE/Qt/6.6.1/qtcharts-everywhere-src-6.6.1.tar.xz) = 4669120 diff --git a/x11-toolkits/qt6-datavis3d/Makefile b/x11-toolkits/qt6-datavis3d/Makefile index 89dc21b0e7a9..0c39b47838d2 100644 --- a/x11-toolkits/qt6-datavis3d/Makefile +++ b/x11-toolkits/qt6-datavis3d/Makefile @@ -5,12 +5,11 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 3D data visualization module -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-datavis3d/distinfo b/x11-toolkits/qt6-datavis3d/distinfo index 4f28d7f7aef6..da55b6452653 100644 --- a/x11-toolkits/qt6-datavis3d/distinfo +++ b/x11-toolkits/qt6-datavis3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050328 -SHA256 (KDE/Qt/6.6.0/qtdatavis3d-everywhere-src-6.6.0.tar.xz) = c0489f6d9f0be9b45917d8e8c49f3a4a7521bf836abe85e4733b9003abd1599e -SIZE (KDE/Qt/6.6.0/qtdatavis3d-everywhere-src-6.6.0.tar.xz) = 3955580 +TIMESTAMP = 1701102910 +SHA256 (KDE/Qt/6.6.1/qtdatavis3d-everywhere-src-6.6.1.tar.xz) = b9dc3bcd8e222effcc8ab0c286c7bcc5507188a43ac01bee855f9642d1a71ba2 +SIZE (KDE/Qt/6.6.1/qtdatavis3d-everywhere-src-6.6.1.tar.xz) = 3955668 diff --git a/x11-toolkits/qt6-declarative/Makefile b/x11-toolkits/qt6-declarative/Makefile index aabeae3edf6e..68ed3fab9c77 100644 --- a/x11-toolkits/qt6-declarative/Makefile +++ b/x11-toolkits/qt6-declarative/Makefile @@ -3,33 +3,16 @@ DISTVERSION= ${QT6_VERSION} CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt6- -PATCH_SITES= https://github.com/qt/qtdeclarative/commit/ -PATCHFILES= 54059d0dffd1966c8a442b3675eb979c32c16cbe.patch:-p1 # QTBUG-117513 - MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ - libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicudata.so:devel/icu \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd +LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gettext-runtime gl gnome pkgconfig python xorg \ +USES= cmake compiler:c++17-lang gl pkgconfig python \ qt-dist:6 USE_GL= opengl -USE_GNOME= glib20 -USE_QT= base shadertools languageserver -USE_XORG= x11 xau xcb xdmcp +USE_QT= base languageserver shadertools:build USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.options.mk> diff --git a/x11-toolkits/qt6-declarative/distinfo b/x11-toolkits/qt6-declarative/distinfo index e521515d3f9a..a3d1c863703d 100644 --- a/x11-toolkits/qt6-declarative/distinfo +++ b/x11-toolkits/qt6-declarative/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1697050345 -SHA256 (KDE/Qt/6.6.0/qtdeclarative-everywhere-src-6.6.0.tar.xz) = 1b539bb0a918c8f0307fd07bd4ef0334bf7f8934bbc2eabfc04c433a7d7fa331 -SIZE (KDE/Qt/6.6.0/qtdeclarative-everywhere-src-6.6.0.tar.xz) = 34331124 -SHA256 (KDE/Qt/6.6.0/54059d0dffd1966c8a442b3675eb979c32c16cbe.patch) = 804de6136d8728bb725a37fad542de0c3b016f31cac29b86b1379205c9e6b744 -SIZE (KDE/Qt/6.6.0/54059d0dffd1966c8a442b3675eb979c32c16cbe.patch) = 1282 +TIMESTAMP = 1701110281 +SHA256 (KDE/Qt/6.6.1/qtdeclarative-everywhere-src-6.6.1.tar.xz) = 7effd7338e6658464ce9554dc88d1bf93a39d1415501be2c4b34c098b608995c +SIZE (KDE/Qt/6.6.1/qtdeclarative-everywhere-src-6.6.1.tar.xz) = 34349560 diff --git a/x11-toolkits/qt6-declarative/pkg-plist b/x11-toolkits/qt6-declarative/pkg-plist index dcc17ca8699c..5045335894b2 100644 --- a/x11-toolkits/qt6-declarative/pkg-plist +++ b/x11-toolkits/qt6-declarative/pkg-plist @@ -1084,6 +1084,7 @@ bin/qmlscene6 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquadpath_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshape_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshape_p_p.h +%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapeabstractcurvenode_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurvenode_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurvenode_p_p.h %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurverenderer_p.h diff --git a/x11-toolkits/qt6-graphs/Makefile b/x11-toolkits/qt6-graphs/Makefile index 93c1666d1fa1..1e6eb4665abb 100644 --- a/x11-toolkits/qt6-graphs/Makefile +++ b/x11-toolkits/qt6-graphs/Makefile @@ -5,13 +5,12 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 graphs module -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 -USE_GL= gl opengl +USE_GL= opengl USE_QT= base declarative quick3d shadertools .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-graphs/distinfo b/x11-toolkits/qt6-graphs/distinfo index 4d07f3aa58f7..733d3fa6a7d7 100644 --- a/x11-toolkits/qt6-graphs/distinfo +++ b/x11-toolkits/qt6-graphs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050348 -SHA256 (KDE/Qt/6.6.0/qtgraphs-everywhere-src-6.6.0.tar.xz) = 56e147fc89031b77002a87da2970c1d6ebf3f595268d0cae52f5f71278e15e7f -SIZE (KDE/Qt/6.6.0/qtgraphs-everywhere-src-6.6.0.tar.xz) = 3827408 +TIMESTAMP = 1701102945 +SHA256 (KDE/Qt/6.6.1/qtgraphs-everywhere-src-6.6.1.tar.xz) = c8968d03cf5d3c46732c97d8e46e405d79c963150fee0de1fab8e59116556477 +SIZE (KDE/Qt/6.6.1/qtgraphs-everywhere-src-6.6.1.tar.xz) = 3827440 diff --git a/x11-toolkits/qt6-graphs/pkg-plist b/x11-toolkits/qt6-graphs/pkg-plist index 0f41ce475fa2..fd3c068354c9 100644 --- a/x11-toolkits/qt6-graphs/pkg-plist +++ b/x11-toolkits/qt6-graphs/pkg-plist @@ -159,6 +159,8 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginTargets.cmake %%QT_QMLDIR%%/QtGraphs/libgraphsplugin.so %%QT_QMLDIR%%/QtGraphs/plugins.qmltypes %%QT_QMLDIR%%/QtGraphs/qml/designer/Bars3DSpecifics.qml +%%QT_QMLDIR%%/QtGraphs/qml/designer/GraphsCameraSection.qml +%%QT_QMLDIR%%/QtGraphs/qml/designer/GraphsSection.qml %%QT_QMLDIR%%/QtGraphs/qml/designer/Scatter3DSpecifics.qml %%QT_QMLDIR%%/QtGraphs/qml/designer/Surface3DSpecifics.qml %%QT_QMLDIR%%/QtGraphs/qml/designer/default/Bars3D.qml diff --git a/x11-toolkits/qt6-quick3d/Makefile b/x11-toolkits/qt6-quick3d/Makefile index 1aca4f3f3a65..e5975b14e6b3 100644 --- a/x11-toolkits/qt6-quick3d/Makefile +++ b/x11-toolkits/qt6-quick3d/Makefile @@ -5,29 +5,15 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Provides a high-level API for creating 3D content or UIs based on Qt Quick -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libassimp.so:multimedia/assimp \ - libdouble-conversion.so:devel/double-conversion \ - libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicudata.so:devel/icu \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd + libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gettext-runtime gl gnome python:build xorg \ +USES= cmake compiler:c++17-lang gl python:build \ qt-dist:6 -USE_GL= gl -USE_GNOME= glib20 +USE_GL= opengl USE_QT= base declarative quicktimeline shadertools -USE_XORG= x11 xau xcb xdmcp USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-quick3d/distinfo b/x11-toolkits/qt6-quick3d/distinfo index a8aa6110b142..f2619dddb9bc 100644 --- a/x11-toolkits/qt6-quick3d/distinfo +++ b/x11-toolkits/qt6-quick3d/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050374 -SHA256 (KDE/Qt/6.6.0/qtquick3d-everywhere-src-6.6.0.tar.xz) = 37ab3eb394e49d6c2b03c4da0c7f782c255dff294e73946369dd2e059a837aba -SIZE (KDE/Qt/6.6.0/qtquick3d-everywhere-src-6.6.0.tar.xz) = 59166200 +TIMESTAMP = 1701102991 +SHA256 (KDE/Qt/6.6.1/qtquick3d-everywhere-src-6.6.1.tar.xz) = 151500ee2223d61b5f83a3a033323812a5438eef9703546f6dbb837db8ce8422 +SIZE (KDE/Qt/6.6.1/qtquick3d-everywhere-src-6.6.1.tar.xz) = 59170016 diff --git a/x11-toolkits/qt6-quicktimeline/Makefile b/x11-toolkits/qt6-quicktimeline/Makefile index 30a5fbd563e4..9bbcae7d1598 100644 --- a/x11-toolkits/qt6-quicktimeline/Makefile +++ b/x11-toolkits/qt6-quicktimeline/Makefile @@ -5,28 +5,14 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Enables keyframe-based animations and parameterization. -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ - libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicudata.so:devel/icu \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd +LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gettext-runtime gl gnome xorg \ +USES= cmake compiler:c++17-lang gl \ qt-dist:6 -USE_GL= egl gl opengl -USE_GNOME= glib20 +USE_GL= opengl USE_QT= base declarative -USE_XORG= x11 xau xcb xdmcp USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-quicktimeline/distinfo b/x11-toolkits/qt6-quicktimeline/distinfo index a9750426dafc..f4460c88f975 100644 --- a/x11-toolkits/qt6-quicktimeline/distinfo +++ b/x11-toolkits/qt6-quicktimeline/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050376 -SHA256 (KDE/Qt/6.6.0/qtquicktimeline-everywhere-src-6.6.0.tar.xz) = 079e51d4572aed992731628b269f9c3f9c61a6c379bae6c354c949a6d89bb590 -SIZE (KDE/Qt/6.6.0/qtquicktimeline-everywhere-src-6.6.0.tar.xz) = 113676 +TIMESTAMP = 1701102993 +SHA256 (KDE/Qt/6.6.1/qtquicktimeline-everywhere-src-6.6.1.tar.xz) = 3860f548327d425beb3772eddde1670986646912e2a11721ea37d18199ffe168 +SIZE (KDE/Qt/6.6.1/qtquicktimeline-everywhere-src-6.6.1.tar.xz) = 113688 diff --git a/x11-toolkits/qt6-shadertools/Makefile b/x11-toolkits/qt6-shadertools/Makefile index 2667f440cd20..1f31353874c0 100644 --- a/x11-toolkits/qt6-shadertools/Makefile +++ b/x11-toolkits/qt6-shadertools/Makefile @@ -5,28 +5,14 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Provides tools for the cross-platform Qt shader pipeline -WWW= https://qt-project.org BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libdouble-conversion.so:devel/double-conversion \ - libexpat.so:textproc/expat2 \ - libfreetype.so:print/freetype2 \ - libgraphite2.so:graphics/graphite2 \ - libharfbuzz.so:print/harfbuzz \ - libicui18n.so:devel/icu \ - libpcre.so:devel/pcre \ - libpcre2-16.so:devel/pcre2 \ - libpng16.so:graphics/png \ - libxkbcommon.so:x11/libxkbcommon \ - libzstd.so:archivers/zstd +LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gettext-runtime gl gnome python:build xorg \ +USES= cmake compiler:c++17-lang gl python:build \ qt-dist:6 USE_GL= opengl -USE_GNOME= glib20 USE_QT= base -USE_XORG= x11 xau xcb xdmcp USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-shadertools/distinfo b/x11-toolkits/qt6-shadertools/distinfo index 8c6eb06dbc26..486dc3fb8bc9 100644 --- a/x11-toolkits/qt6-shadertools/distinfo +++ b/x11-toolkits/qt6-shadertools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050379 -SHA256 (KDE/Qt/6.6.0/qtshadertools-everywhere-src-6.6.0.tar.xz) = 3690327dc550144b8102be2bb7f6dc995ccbe3584041094ad021a83737ef9875 -SIZE (KDE/Qt/6.6.0/qtshadertools-everywhere-src-6.6.0.tar.xz) = 1063372 +TIMESTAMP = 1701102995 +SHA256 (KDE/Qt/6.6.1/qtshadertools-everywhere-src-6.6.1.tar.xz) = 08338fe4f54954928e41a8a5450627e61bca115039706c28161bf967785e73bb +SIZE (KDE/Qt/6.6.1/qtshadertools-everywhere-src-6.6.1.tar.xz) = 1063468 diff --git a/x11-toolkits/qt6-virtualkeyboard/Makefile b/x11-toolkits/qt6-virtualkeyboard/Makefile index f3d661feff32..fa17bb8ffca9 100644 --- a/x11-toolkits/qt6-virtualkeyboard/Makefile +++ b/x11-toolkits/qt6-virtualkeyboard/Makefile @@ -5,15 +5,13 @@ PKGNAMEPREFIX= qt6- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 6 Virtual Keyboard Module -WWW= https://qt.io BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \ libxkbcommon.so:x11/libxkbcommon -USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 xorg -USE_GL= gl opengl +USES= cmake compiler:c++17-lang gl pkgconfig qt-dist:6 +USE_GL= opengl USE_QT= base declarative svg -USE_XORG= xcb .include <bsd.port.mk> diff --git a/x11-toolkits/qt6-virtualkeyboard/distinfo b/x11-toolkits/qt6-virtualkeyboard/distinfo index 36de391d57cd..fc2ea8214e03 100644 --- a/x11-toolkits/qt6-virtualkeyboard/distinfo +++ b/x11-toolkits/qt6-virtualkeyboard/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697050382 -SHA256 (KDE/Qt/6.6.0/qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz) = 2784db43f514bfd3a2ce0e79e0096deea95a3866254d376a9134bc512bfa777b -SIZE (KDE/Qt/6.6.0/qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz) = 3735008 +TIMESTAMP = 1701103001 +SHA256 (KDE/Qt/6.6.1/qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz) = 993cde36de23985f0444f379877d58e8b0e76c05dd078e1292251b04c98d7baa +SIZE (KDE/Qt/6.6.1/qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz) = 3732976 |