summaryrefslogtreecommitdiff
path: root/devel/qt6-base
diff options
context:
space:
mode:
Diffstat (limited to 'devel/qt6-base')
-rw-r--r--devel/qt6-base/Makefile8
-rw-r--r--devel/qt6-base/distinfo6
-rw-r--r--devel/qt6-base/files/extrapatch-inotify11
-rw-r--r--devel/qt6-base/pkg-plist11
4 files changed, 30 insertions, 6 deletions
diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index e3ec93bddc7c..ec92164f3f97 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -1,6 +1,5 @@
PORTNAME= base
DISTVERSION= ${QT6_VERSION}
-PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt6-
@@ -96,6 +95,13 @@ BUILD_DEPENDS+= as:devel/binutils
CMAKE_ARGS+= -DCMAKE_ASM_FLAGS=-no-integrated-as
.endif
+.if exists(/usr/include/sys/inotify.h)
+PLIST_SUB+= INOTIFY="" KQUEUE="@comment "
+EXTRA_PATCHES+= ${FILESDIR}/extrapatch-inotify
+.else
+PLIST_SUB+= INOTIFY="@comment " KQUEUE=""
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \
${WRKSRC}/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo
index 07b98015ee3b..f27032e50768 100644
--- a/devel/qt6-base/distinfo
+++ b/devel/qt6-base/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749162730
-SHA256 (KDE/Qt/6.9.1/qtbase-everywhere-src-6.9.1.tar.xz) = 40caedbf83cc9a1959610830563565889878bc95f115868bbf545d1914acf28e
-SIZE (KDE/Qt/6.9.1/qtbase-everywhere-src-6.9.1.tar.xz) = 49755912
+TIMESTAMP = 1756196361
+SHA256 (KDE/Qt/6.9.2/qtbase-everywhere-src-6.9.2.tar.xz) = 44be9c9ecfe04129c4dea0a7e1b36ad476c9cc07c292016ac98e7b41514f2440
+SIZE (KDE/Qt/6.9.2/qtbase-everywhere-src-6.9.2.tar.xz) = 49812824
diff --git a/devel/qt6-base/files/extrapatch-inotify b/devel/qt6-base/files/extrapatch-inotify
new file mode 100644
index 000000000000..15106c6c721b
--- /dev/null
+++ b/devel/qt6-base/files/extrapatch-inotify
@@ -0,0 +1,11 @@
+--- src/corelib/io/qfilesystemwatcher.cpp.orig 2025-02-13 17:45:28 UTC
++++ src/corelib/io/qfilesystemwatcher.cpp
+@@ -11,7 +11,7 @@
+ #include <qset.h>
+ #include <qtimer.h>
+
+-#if (defined(Q_OS_LINUX) || defined(Q_OS_QNX)) && QT_CONFIG(inotify)
++#if (defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) && QT_CONFIG(inotify)
+ #define USE_INOTIFY
+ #endif
+
diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist
index 5b6306fcaf42..737f0c8e6992 100644
--- a/devel/qt6-base/pkg-plist
+++ b/devel/qt6-base/pkg-plist
@@ -62,7 +62,8 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystementry_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemiterator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemmetadata_p.h
-%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_kqueue_p.h
+%%INOTIFY%%%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_inotify_p.h
+%%KQUEUE%%%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_kqueue_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qflatmap_p.h
@@ -148,6 +149,7 @@ bin/qmake6
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringiterator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemerror_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemsemaphore_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtclasshelper_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcore-config_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcoreglobal_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtemporaryfile_p.h
@@ -974,6 +976,7 @@ bin/qmake6
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qabstracttextdocumentlayout_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblebridgeutils_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblecache_p.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaccessiblehelper_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qaction_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qactiongroup_p.h
%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qastchandler_p.h
@@ -2536,6 +2539,7 @@ bin/qmake6
%%QT_INCDIR%%/QtXml/qtxmlversion.h
@comment lib/cmake/Qt6/3rdparty/extra-cmake-modules/0001-ECMEnableSanitizers.cmake-fix-GCC-s-note-variable-tr.patch
@comment lib/cmake/Qt6/3rdparty/extra-cmake-modules/0002-ECMEnableSanitizers.cmake-replace-tabs-with-spaces.patch
+@comment lib/cmake/Qt6/3rdparty/extra-cmake-modules/0003-ECMEnableSanitizers.cmake-fix-no-undefined-flag-replacement.patch
lib/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS
lib/cmake/Qt6/3rdparty/extra-cmake-modules/REUSE.toml
lib/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/ECMFindModuleHelpersStub.cmake
@@ -2694,6 +2698,7 @@ lib/cmake/Qt6/QtProcessConfigureArgs.cmake
lib/cmake/Qt6/QtProperties.cmake
lib/cmake/Qt6/QtPublicAndroidHelpers.cmake
lib/cmake/Qt6/QtPublicAppleHelpers.cmake
+lib/cmake/Qt6/QtPublicCMakeEarlyPolicyHelpers.cmake
lib/cmake/Qt6/QtPublicCMakeHelpers.cmake
lib/cmake/Qt6/QtPublicCMakeVersionHelpers.cmake
lib/cmake/Qt6/QtPublicDependencyHelpers.cmake
@@ -3177,6 +3182,9 @@ lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateConfigVersionImpl.cmake
lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateTargets.cmake
lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateVersionlessAliasTargets.cmake
lib/cmake/Qt6TestInternalsPrivate/Qt6TestInternalsPrivateVersionlessTargets.cmake
+lib/cmake/Qt6TestInternalsPrivate/QtRunCMake.cmake
+lib/cmake/Qt6TestInternalsPrivate/QtRunCMakeTestWrappers.cmake
+lib/cmake/Qt6TestInternalsPrivate/RunCMake.cmake
lib/cmake/Qt6TestPrivate/Qt6TestPrivateAdditionalTargetInfo.cmake
lib/cmake/Qt6TestPrivate/Qt6TestPrivateConfig.cmake
lib/cmake/Qt6TestPrivate/Qt6TestPrivateConfigVersion.cmake
@@ -3544,7 +3552,6 @@ lib/cmake/Qt6XmlPrivate/Qt6XmlPrivateVersionlessTargets.cmake
%%QT_MKSPECDIR%%/features/mac/sdk.mk
%%QT_MKSPECDIR%%/features/mac/sdk.prf
%%QT_MKSPECDIR%%/features/mac/toolchain.prf
-%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf
%%QT_MKSPECDIR%%/features/metatypes.prf
%%QT_MKSPECDIR%%/features/moc.prf
%%QT_MKSPECDIR%%/features/no_debug_info.prf