diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 0272d24ca2f7..e4ebeebc9040 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,116 +1,116 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt6- PATCH_SITES= https://github.com/qt/qtbase/commit/ PATCHFILES+= 5875da6d70303468eab85030a80f54c268f80b79.patch:-p1 # PR282335 MAINTAINER= kde@FreeBSD.org COMMENT= Qt base (core, gui, widgets, network,...) BUILD_DEPENDS= xml:textproc/xmlstarlet \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto 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 \ libbrotlidec.so:archivers/brotli \ libdbus-1.so:devel/dbus \ libdouble-conversion.so:devel/double-conversion \ libdrm.so:graphics/libdrm \ libevdev.so:devel/libevdev \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libharfbuzz.so:print/harfbuzz \ libicui18n.so:devel/icu \ libinput.so:x11/libinput \ libintl.so:devel/gettext-runtime \ libjpeg.so:graphics/jpeg-turbo \ libmtdev.so:devel/libmtdev \ libpcre2-16.so:devel/pcre2 \ libpng16.so:graphics/png \ libudev.so:devel/libudev-devd \ libvulkan.so:graphics/vulkan-loader \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon \ libzstd.so:archivers/zstd USES= cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconfig python \ qt-dist:6 shebangfix ssl USE_GL= egl opengl USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 pango USE_LOCALE= C.UTF-8 CMAKE_ARGS= -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_LTTngUST \ QT_AVOID_CMAKE_ARCHIVING_API \ QT_FIND_ALL_PACKAGES_ALWAYS \ QT_FEATURE_openssl_linked CMAKE_OFF= QT_FEATURE_eglfs \ QT_FEATURE_gssapi # sql drivers are handled in the qt6-base-sqldriver port CMAKE_OFF+= FEATURE_sql_mysql \ FEATURE_sql_odbc \ FEATURE_sql_psql \ FEATURE_sql_sqlite SHEBANG_FILES= ${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \ ${WRKSRC}/mkspecs/features/uikit/devices.py \ ${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \ ${WRKSRC}/util/testrunner/qt-testrunner.py \ ${WRKSRC}/util/testrunner/sanitizer-testrunner.py USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} # zstd from base fails to compress files during the build (error 11: unsupported argument) BINARY_ALIAS= zstd=${LOCALBASE}/bin/zstd OPTIONS_DEFINE= CUPS X11 OPTIONS_DEFAULT= CUPS X11 OPTIONS_SUB= yes CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_OFF= -DFEATURE_cups=OFF X11_USES= xorg X11_USE= XORG=ice,pixman,sm,x11,xau,xcb,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xi,xinerama,xrandr,xrender X11_CMAKE_BOOL= FEATURE_xcb FEATURE_xlib 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 .include # LibreSSL does not currently support BIO_ADDR in DTLSv1_listen() .if ${SSL_DEFAULT:Mlibressl*} CMAKE_OFF+= QT_FEATURE_dtls PLIST_SUB+= DTLS="@comment " .else PLIST_SUB+= DTLS="" .endif .if ${ARCH} == "armv6" || ${ARCH} == "armv7" BUILD_DEPENDS+= as:devel/binutils CMAKE_ARGS+= -DCMAKE_ASM_FLAGS=-no-integrated-as .endif post-patch: @${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \ ${WRKSRC}/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp # TODO: do this cleaner -- somewhere cmake/qmake still creates empty directories # for the cmake files in INSTALL_PREFIX/lib/cmake post-install: ${RM} -vr ${STAGEDIR}${PREFIX}/${QT_LIBDIR_REL}/cmake # Install symlinks for user-facing tools ${REINPLACE_CMD} -e "s#^#${STAGEDIR}#" -e "s# # ${STAGEDIR}#" \ ${WRKDIR}/.build/user_facing_tool_links.txt while read t; do \ ${RLN} $$t; \ done <${WRKDIR}/.build/user_facing_tool_links.txt .include diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h index f28c5a926a13..420a902bd19c 100644 --- a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h +++ b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h @@ -1,49 +1,27 @@ Suppress spurious zero as null pointer constant warnings which cause errors in www/dooble due to -Werror being passed. This is the same problem as in qcompare.h that upstream suppresses for GCC. /usr/local/include/qt6/QtCore/qfloat16.h:209:5: error: zero as null pointer constant [-Werror,-Wzero-as-null-pointer-constant] ... /usr/local/include/qt6/QtCore/qcomparehelpers.h:211:43: note: expanded from macro 'QT_DECLARE_ORDERING_HELPER_TEMPLATE' 211 | { return compareThreeWay(lhs, rhs) >= 0; } ---- src/corelib/global/qcomparehelpers.h.orig 2024-01-22 10:20:09 UTC +--- src/corelib/global/qcomparehelpers.h.orig 2024-09-16 09:24:52 UTC +++ src/corelib/global/qcomparehelpers.h -@@ -197,6 +197,8 @@ template constexpr auto to_Qt(In in) noe +@@ -197,6 +197,7 @@ template constexpr auto to_Qt(In in) noe { return !comparesEqual(rhs, lhs); } #define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \ -+ QT_WARNING_PUSH \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) \ noexcept(noexcept(compareThreeWay(lhs, rhs))) \ { return compareThreeWay(lhs, rhs) < 0; } \ -@@ -208,7 +210,8 @@ template constexpr auto to_Qt(In in) noe - { return compareThreeWay(lhs, rhs) <= 0; } \ - friend Constexpr bool operator>=(LeftType const &lhs, RightType const &rhs) \ - noexcept(noexcept(compareThreeWay(lhs, rhs))) \ -- { return compareThreeWay(lhs, rhs) >= 0; } -+ { return compareThreeWay(lhs, rhs) >= 0; } \ -+ QT_WARNING_POP - - #define QT_DECLARE_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \ - QT_DECLARE_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr) -@@ -225,6 +228,8 @@ template constexpr auto to_Qt(In in) noe +@@ -225,6 +226,7 @@ template constexpr auto to_Qt(In in) noe // Helpers for reversed ordering, using the existing compareThreeWay() function. #define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \ -+ QT_WARNING_PUSH \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ friend Constexpr bool operator<(RightType const &lhs, LeftType const &rhs) \ noexcept(noexcept(compareThreeWay(rhs, lhs))) \ { return compareThreeWay(rhs, lhs) > 0; } \ -@@ -236,7 +241,8 @@ template constexpr auto to_Qt(In in) noe - { return compareThreeWay(rhs, lhs) >= 0; } \ - friend Constexpr bool operator>=(RightType const &lhs, LeftType const &rhs) \ - noexcept(noexcept(compareThreeWay(rhs, lhs))) \ -- { return compareThreeWay(rhs, lhs) <= 0; } -+ { return compareThreeWay(rhs, lhs) <= 0; } \ -+ QT_WARNING_POP - - #define QT_DECLARE_REVERSED_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \ - QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr)