Skip to content

Commit

Permalink
Qt6: Update to 6.6.1
Browse files Browse the repository at this point in the history
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
  • Loading branch information
BSDKaffee committed Dec 1, 2023
1 parent 895d7f8 commit 8adbabc
Show file tree
Hide file tree
Showing 110 changed files with 697 additions and 771 deletions.
7 changes: 5 additions & 2 deletions Mk/Uses/qt.mk
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion accessibility/qt6-speech/Makefile
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 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
6 changes: 3 additions & 3 deletions 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
1 change: 0 additions & 1 deletion comms/qt6-sensors/Makefile
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions 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
1 change: 0 additions & 1 deletion comms/qt6-serialbus/Makefile
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions 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
1 change: 0 additions & 1 deletion comms/qt6-serialport/Makefile
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 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
1 change: 0 additions & 1 deletion databases/qt6-base_sqldriver/Makefile
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 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
15 changes: 3 additions & 12 deletions 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}-
Expand All @@ -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

Expand All @@ -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>
34 changes: 17 additions & 17 deletions devel/py-qt6-pyqt/pkg-plist
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion 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}
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions devel/pyside6/pkg-plist
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions devel/qt6-5compat/Makefile
Expand Up @@ -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}

Expand Down
6 changes: 3 additions & 3 deletions 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
20 changes: 1 addition & 19 deletions devel/qt6-base/Makefile
Expand Up @@ -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 \
Expand All @@ -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
Expand Down Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions 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
4 changes: 2 additions & 2 deletions 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()

Expand Down
13 changes: 0 additions & 13 deletions devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp

This file was deleted.

0 comments on commit 8adbabc

Please sign in to comment.