diff --git a/dev-qt/qt6-base/patches/qt6_base-6.3.0.patchset b/dev-qt/qt6-base/patches/qt6_base-6.4.0.patchset similarity index 90% rename from dev-qt/qt6-base/patches/qt6_base-6.3.0.patchset rename to dev-qt/qt6-base/patches/qt6_base-6.4.0.patchset index 34be113c9..75d2e4cab 100644 --- a/dev-qt/qt6-base/patches/qt6_base-6.3.0.patchset +++ b/dev-qt/qt6-base/patches/qt6_base-6.4.0.patchset @@ -1,4 +1,4 @@ -From 278725a0c21bc16009f43e2aec4b06e0d5f97233 Mon Sep 17 00:00:00 2001 +From 6edaeafb70a76aa6a48770bebf4eff4b0f53704c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 11 Feb 2019 15:53:49 +1000 Subject: Make sure libs are searched in the develop/ dir by CMake @@ -20,20 +20,20 @@ index 24ed125..52f637e 100644 CMAKE_DLL_DIR = $$CMAKE_LIB_DIR CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE -- -2.30.2 +2.36.1 -From 930f8f14045ac24db29d6aa197b2ac3f2ecc003d Mon Sep 17 00:00:00 2001 +From 383dd2759941afd4094685296dab2d7d51af8eba Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:56:12 +1000 Subject: Fix QStandartPaths for Haiku diff --git a/src/corelib/io/qstandardpaths_haiku.cpp b/src/corelib/io/qstandardpaths_haiku.cpp -index 044d69f..1f255a9 100644 +index 6122e5f..5bf676f 100644 --- a/src/corelib/io/qstandardpaths_haiku.cpp +++ b/src/corelib/io/qstandardpaths_haiku.cpp -@@ -145,22 +145,22 @@ QString QStandardPaths::writableLocation(StandardLocation type) +@@ -111,22 +111,22 @@ QString QStandardPaths::writableLocation(StandardLocation type) return haikuStandardPath(B_USER_NONPACKAGED_BIN_DIRECTORY); case TempLocation: return haikuStandardPath(B_SYSTEM_TEMP_DIRECTORY); @@ -64,16 +64,16 @@ index 044d69f..1f255a9 100644 } } -@@ -179,7 +179,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) - case MoviesLocation: - case DownloadLocation: +@@ -147,7 +147,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) + case PublicShareLocation: + case TemplatesLocation: case HomeLocation: - paths += haikuStandardPath(B_USER_NONPACKAGED_DIRECTORY); + paths += haikuStandardPath(B_USER_DIRECTORY); break; case FontsLocation: paths += haikuStandardPaths(B_FIND_PATH_FONTS_DIRECTORY); -@@ -203,7 +203,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) +@@ -171,7 +171,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) break; case ConfigLocation: // fall through case AppConfigLocation: @@ -83,20 +83,20 @@ index 044d69f..1f255a9 100644 case GenericConfigLocation: paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY); -- -2.30.2 +2.36.1 -From 9235e780c5c83673fab8da1f4dbde226acbf1afc Mon Sep 17 00:00:00 2001 +From d2d3453b9018d8296ccdade45d11432fbc532077 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:56:39 +1000 Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku. diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp -index 453d7a8..3602e21 100644 +index cd76517..56cd335 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp -@@ -2987,6 +2987,7 @@ QList QSslSocketPrivate::unixRootCertDirectories() +@@ -2953,6 +2953,7 @@ QList QSslSocketPrivate::unixRootCertDirectories() ba("/usr/local/ssl/certs/"), // Solaris ba("/etc/openssl/certs/"), // BlackBerry ba("/opt/openssl/certs/"), // HP-UX @@ -105,10 +105,10 @@ index 453d7a8..3602e21 100644 }; return QList::fromReadOnlyData(dirs); -- -2.30.2 +2.36.1 -From 47cb80806420546401d044f3dc6d125725d7086a Mon Sep 17 00:00:00 2001 +From 6b696bf307187c3cdccf9758f21c6d631b53c9a7 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:56:59 +1000 Subject: Fix build for Haiku platform @@ -128,10 +128,10 @@ index 0040b6c..9a729bb 100644 # or gold under Linux) will not print any library search path. Need to use another # invocation with different options (which in turn doesn't print include search -- -2.30.2 +2.36.1 -From 1a32dc100195b34a57067b48d2d9659da9fa94c6 Mon Sep 17 00:00:00 2001 +From 8b0aad65864783f6c172052142cc9fbe9976df04 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 11 Feb 2019 15:57:54 +1000 Subject: Fix endian detection @@ -155,20 +155,20 @@ index 9bb306e..9f0ea58 100644 # endif # endif -- -2.30.2 +2.36.1 -From 044774b9948b1fbbb6695bcca39cf2cbb16930ee Mon Sep 17 00:00:00 2001 +From eb7b83a6bfabebb87e01754b7697d8aacc9f92e0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 27 May 2020 19:54:30 +1000 Subject: Disable LibResolv for Haiku diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index eb1048a..0345439 100644 +index 12d8c04..377cb0b 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp -@@ -89,7 +89,7 @@ typedef void (*res_nclose_proto)(res_state_ptr); +@@ -55,7 +55,7 @@ typedef void (*res_nclose_proto)(res_state_ptr); static res_nclose_proto local_res_nclose = nullptr; static res_state_ptr local_res = nullptr; @@ -178,20 +178,20 @@ index eb1048a..0345439 100644 struct LibResolv { -- -2.30.2 +2.36.1 -From ba1842cdfd4c43526bec2d3bb36c4c8a58b81bdb Mon Sep 17 00:00:00 2001 +From df7203d2a5e910acd9107b85f5c776b1236de3bd Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 Sep 2019 00:17:19 +1000 Subject: Don't use ifaddrs for Haiku diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp -index 94f3a53..1f4140a 100644 +index 51a266b..cf16236 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp -@@ -53,7 +53,7 @@ +@@ -17,7 +17,7 @@ # include "qdatetime.h" #endif @@ -201,20 +201,20 @@ index 94f3a53..1f4140a 100644 #endif -- -2.30.2 +2.36.1 -From a293654ab3ef7868a110f677267e08d2c7d48e85 Mon Sep 17 00:00:00 2001 +From 12d2459cec4b5c042ab01fee5d16dcbb9ba8de72 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 27 May 2020 19:54:58 +1000 Subject: Disable sharedmemory feature for bootstrap diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt -index fb39c11..f9f8761 100644 +index 35e62b6..f61ca73 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt -@@ -109,6 +109,7 @@ qt_internal_extend_target(Bootstrap +@@ -95,6 +95,7 @@ qt_internal_extend_target(Bootstrap QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_FOREACH @@ -223,20 +223,20 @@ index fb39c11..f9f8761 100644 .. ../../3rdparty/tinycbor/src -- -2.30.2 +2.36.1 -From f038f1671a33fa3fd40898e2f12d11e02b908b2f Mon Sep 17 00:00:00 2001 +From c11b6c3991f20a1f0b17a7c847678c2152ee936a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 29 Dec 2019 18:13:19 +1000 Subject: Fix build for x86_gcc2 diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c -index c29ebc2..c6309a2 100644 +index 9960e45..3de4afc 100644 --- a/src/3rdparty/forkfd/forkfd.c +++ b/src/3rdparty/forkfd/forkfd.c -@@ -722,7 +722,7 @@ int forkfd(int flags, pid_t *ppid) +@@ -675,7 +675,7 @@ static int forkfd_fork_fallback(int flags, pid_t *ppid) /* parent process */ info->deathPipe = death_pipe[1]; fd = death_pipe[0]; @@ -246,20 +246,20 @@ index c29ebc2..c6309a2 100644 /* release the child */ #ifdef HAVE_EVENTFD -- -2.30.2 +2.36.1 -From eb6173566cef9b05e4005597e3ef05587d6b47e7 Mon Sep 17 00:00:00 2001 +From a539097787a2b5a653cf24c253fac0600f73fc8d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 4 Jun 2020 23:11:17 +1000 Subject: Implement QFilesystemWatcher for Haiku diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt -index e722be1..55a39af 100644 +index c683bb4..369c931 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt -@@ -443,6 +443,14 @@ qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQU +@@ -469,6 +469,14 @@ qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQU "/BASE:0x67000000" ) @@ -274,7 +274,7 @@ index e722be1..55a39af 100644 # QtCore can't be compiled with -Wl,-no-undefined because it uses the # "environ" variable and FreeBSD does not include a weak symbol for it # in libc. -@@ -882,6 +890,11 @@ qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher +@@ -889,6 +897,11 @@ qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h ) @@ -286,7 +286,7 @@ index e722be1..55a39af 100644 qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS SOURCES io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h -@@ -1068,7 +1081,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX +@@ -1076,7 +1089,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX WrapRt::WrapRt ) @@ -296,10 +296,10 @@ index e722be1..55a39af 100644 kernel/qsharedmemory_posix.cpp kernel/qsharedmemory_systemv.cpp diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp -index bd5a73d..a3825f8 100644 +index 9ffbe31..cfb1acf 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp -@@ -54,6 +54,8 @@ +@@ -18,6 +18,8 @@ #include "qfilesystemwatcher_polling_p.h" #if defined(Q_OS_WIN) # include "qfilesystemwatcher_win_p.h" @@ -308,7 +308,7 @@ index bd5a73d..a3825f8 100644 #elif defined(USE_INOTIFY) # include "qfilesystemwatcher_inotify_p.h" #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) || defined(QT_PLATFORM_UIKIT) -@@ -73,6 +75,8 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine(QObject +@@ -39,6 +41,8 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine(QObject { #if defined(Q_OS_WIN) return new QWindowsFileSystemWatcherEngine(parent); @@ -668,20 +668,20 @@ index 0000000..8a8d75a +#endif // QFILESYSTEMWATCHER_HAIKU_P_H + -- -2.30.2 +2.36.1 -From af2d8bbde532f02f813ef099eb9af62e5a88009c Mon Sep 17 00:00:00 2001 +From 0f2058f4df0362fcf0ad98db417f27a41edc00b2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 16 Jun 2020 18:06:57 +1000 Subject: Don't use AF_INET6 for new sockets diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp -index 61fa8ed..aa5449a 100644 +index 4b5e93e..d47057f 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp -@@ -233,8 +233,12 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc +@@ -200,8 +200,12 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc } int protocol = 0; #endif // QT_NO_SCTP @@ -695,20 +695,20 @@ index 61fa8ed..aa5449a 100644 int socket = qt_safe_socket(domain, type, protocol, O_NONBLOCK); -- -2.30.2 +2.36.1 -From 07fad9ba1f4b9842a5efb7970ccced46cde8742c Mon Sep 17 00:00:00 2001 +From 671b2bee6917a27b7c7d2b48206b6777b24d8c1c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 5 Oct 2020 19:40:40 +1000 Subject: Disable Haswell CPU feature for plugins diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp -index c119bee..39978af 100644 +index 7ad6e9e..7839494 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp -@@ -192,7 +192,7 @@ bool QLibraryPrivate::load_sys() +@@ -158,7 +158,7 @@ bool QLibraryPrivate::load_sys() prefixes.append(QString()); } @@ -718,33 +718,33 @@ index c119bee..39978af 100644 auto transform = [](QStringList &list, void (*f)(QString *)) { QStringList tmp; -- -2.30.2 +2.36.1 -From ae506208bbae9e31dd34c547c72c476dfbff904d Mon Sep 17 00:00:00 2001 +From 533a530d56ecd6d7ee8f794639c3413b64b00904 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 Nov 2020 17:50:04 +0100 Subject: Haiku build setup diff --git a/cmake/QtRpathHelpers.cmake b/cmake/QtRpathHelpers.cmake -index 6e3414b..8d16ac4 100644 +index fc75b8f..e9b12ff 100644 --- a/cmake/QtRpathHelpers.cmake +++ b/cmake/QtRpathHelpers.cmake -@@ -22,6 +22,8 @@ function(qt_compute_relative_rpath_base rpath install_location out_var) +@@ -5,6 +5,8 @@ function(qt_internal_get_relative_rpath_base_token out_var) set(rpath_rel_base "@loader_path") - elseif(LINUX OR SOLARIS OR FREEBSD) + elseif(LINUX OR SOLARIS OR FREEBSD OR HURD) set(rpath_rel_base "$ORIGIN") + elseif(HAIKU) + set(rpath_rel_base "$ORIGIN") else() - message(WARNING "No known RPATH_REL_BASE for target platform.") set(rpath_rel_base "NO_KNOWN_RPATH_REL_BASE") + endif() diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake -index 17b81e9..78fe275 100644 +index bcb629d..6d29d06 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake -@@ -104,7 +104,7 @@ elseif(APPLE) +@@ -114,7 +114,7 @@ elseif(APPLE) endif() ## Position independent code: @@ -754,20 +754,20 @@ index 17b81e9..78fe275 100644 # Do not relink dependent libraries when no header has changed: set(CMAKE_LINK_DEPENDS_NO_SHARED ON) -- -2.30.2 +2.36.1 -From e4f662a92d5ee34f47afc471294d7a718da0722d Mon Sep 17 00:00:00 2001 +From 1bb2c919e01bc9116656802d6f297208155b92ec Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 Nov 2020 22:33:56 +0100 Subject: Haiku: link against libnetwork diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt -index 730d67e..f14c3ca 100644 +index 98fcb5d..ae147ff 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt -@@ -205,6 +205,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 +@@ -210,6 +210,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32 kernel/qdnslookup_win.cpp ) @@ -780,20 +780,20 @@ index 730d67e..f14c3ca 100644 LIBRARIES ${FWCoreServices} -- -2.30.2 +2.36.1 -From f299acf69a911d8cfbf3b3458bc8e573dee59d4c Mon Sep 17 00:00:00 2001 +From 99b41ce36c7ddaefb9e9a90dbe39657c1c894beb Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 31 Oct 2021 22:57:22 +1000 Subject: QSharedMemory implementation diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp -index 3dbbe75..6303b77 100644 +index a789a58..eeee4b8 100644 --- a/src/corelib/kernel/qsharedmemory.cpp +++ b/src/corelib/kernel/qsharedmemory.cpp -@@ -46,6 +46,9 @@ +@@ -10,6 +10,9 @@ #ifdef Q_OS_WIN # include #endif @@ -803,7 +803,7 @@ index 3dbbe75..6303b77 100644 #if defined(Q_OS_DARWIN) # include "qcore_mac_p.h" -@@ -104,6 +107,12 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key, +@@ -70,6 +73,12 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key, #ifdef Q_OS_WIN return result; @@ -814,11 +814,11 @@ index 3dbbe75..6303b77 100644 + result.truncate(B_OS_NAME_LENGTH - 4); + return result + QLatin1Char('_') + QString::number(qChecksum(key.toUtf8()), 16); #elif defined(QT_POSIX_IPC) - return QLatin1Char('/') + result; + return u'/' + result; #else diff --git a/src/corelib/kernel/qsharedmemory_haiku.cpp b/src/corelib/kernel/qsharedmemory_haiku.cpp new file mode 100644 -index 0000000..469b81c +index 0000000..219c8ff --- /dev/null +++ b/src/corelib/kernel/qsharedmemory_haiku.cpp @@ -0,0 +1,183 @@ @@ -1006,10 +1006,10 @@ index 0000000..469b81c + +#endif // QT_NO_SHAREDMEMORY diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h -index e06e7e8..e0bd23f 100644 +index 57dcb2c..11fb8a4 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h -@@ -78,10 +78,14 @@ QT_END_NAMESPACE +@@ -42,10 +42,14 @@ QT_END_NAMESPACE # include "private/qobject_p.h" #endif @@ -1025,8 +1025,8 @@ index e06e7e8..e0bd23f 100644 QT_BEGIN_NAMESPACE #ifndef QT_NO_SYSTEMSEMAPHORE -@@ -144,6 +148,8 @@ public: - const QString &prefix = QLatin1String("qipc_sharedmemory_")); +@@ -108,6 +112,8 @@ public: + const QString &prefix = QStringLiteral("qipc_sharedmemory_")); #ifdef Q_OS_WIN Qt::HANDLE handle(); +#elif defined(Q_OS_HAIKU) @@ -1034,7 +1034,7 @@ index e06e7e8..e0bd23f 100644 #elif defined(QT_POSIX_IPC) int handle(); #else -@@ -171,6 +177,8 @@ public: +@@ -135,6 +141,8 @@ public: private: #ifdef Q_OS_WIN Qt::HANDLE hand; @@ -1044,20 +1044,20 @@ index e06e7e8..e0bd23f 100644 int hand; #else -- -2.30.2 +2.36.1 -From 7facce45184d5812db5af5d36d795d6df5810bb8 Mon Sep 17 00:00:00 2001 +From 7969199e8819fd97f79645abd3f9ea4fed0eec64 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 28 Apr 2022 21:03:05 +1000 Subject: Fix elf parser for Haiku diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp -index c6ccda9..4179696 100644 +index b0c23d5..d538ea7 100644 --- a/src/corelib/plugin/qelfparser_p.cpp +++ b/src/corelib/plugin/qelfparser_p.cpp -@@ -56,6 +56,12 @@ +@@ -20,6 +20,12 @@ # error "Need ELF header to parse plugins." #endif @@ -1069,8 +1069,8 @@ index c6ccda9..4179696 100644 + QT_BEGIN_NAMESPACE - // ### Qt7: propagate the constant and eliminate dead code -@@ -230,18 +236,26 @@ struct ElfHeaderCheck : public ElfHeaderCommonCheck + using namespace Qt::StringLiterals; +@@ -196,18 +202,26 @@ struct ElfHeaderCheck : public ElfHeaderCommonCheck // byte 7 static bool checkOsAbi(const uchar *ident) { @@ -1097,7 +1097,7 @@ index c6ccda9..4179696 100644 return true; } -@@ -359,6 +373,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade +@@ -325,6 +339,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade break; } @@ -1107,7 +1107,7 @@ index c6ccda9..4179696 100644 switch (e_ident[EI_OSABI]) { case ELFOSABI_SYSV: d << " (SYSV"; break; case ELFOSABI_HPUX: d << " (HP-UX"; break; -@@ -375,7 +392,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade +@@ -341,7 +358,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade if (e_ident[EI_ABIVERSION]) d << " v" << e_ident[EI_ABIVERSION]; d << ')'; @@ -1116,7 +1116,7 @@ index c6ccda9..4179696 100644 if (e_ident[EI_VERSION] != 1) { d << ", file version " << e_ident[EI_VERSION]; return d; -@@ -460,11 +477,12 @@ Q_DECL_UNUSED static QDebug &operator<<(QDebug &d, ElfSectionDebug s) +@@ -428,11 +445,12 @@ Q_DECL_UNUSED static QDebug &operator<<(QDebug &d, ElfSectionDebug s) d << 'A'; if (s.shdr->sh_flags & SHF_EXECINSTR) d << 'X'; @@ -1131,5 +1131,5 @@ index c6ccda9..4179696 100644 return d; } -- -2.30.2 +2.36.1 diff --git a/dev-qt/qt6-base/qt6_base-6.3.0.recipe b/dev-qt/qt6-base/qt6_base-6.4.0.recipe similarity index 96% rename from dev-qt/qt6-base/qt6_base-6.3.0.recipe rename to dev-qt/qt6-base/qt6_base-6.4.0.recipe index 765893287..d9431f111 100644 --- a/dev-qt/qt6-base/qt6_base-6.3.0.recipe +++ b/dev-qt/qt6-base/qt6_base-6.4.0.recipe @@ -8,13 +8,13 @@ COPYRIGHT="2015-2022 The Qt Company Ltd." LICENSE="GNU LGPL v3 GNU GPL v3 GNU FDL v1" -REVISION="5" +REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtbase-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256="b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99" +CHECKSUM_SHA256="cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d" SOURCE_DIR="qtbase-everywhere-src-$portVersion" -srcGitRev2="fb64faaa46757900ac1318ad0eefbd54e45ea908" +srcGitRev2="0cbd793279b7fa5ee971b216cbba03dd3d336440" SOURCE_URI_2="https://github.com/threedeyes/qt6-haikuplugins/archive/$srcGitRev2.tar.gz" -CHECKSUM_SHA256_2="d0c99d154eaf65a9b11622532424bd1ddf52bffeaadbc4c55c38bdd934d30cf0" +CHECKSUM_SHA256_2="49c186b32b41f932186616c5f7e8bdd902f66ad21d762f15e0fce2dc8b6b86d5" SOURCE_DIR_2="qt6-haikuplugins-$srcGitRev2" PATCHES="qt6_base-$portVersion.patchset" @@ -163,6 +163,7 @@ INSTALL() # build platform plugins PATH=$PATH:$binDir:$libDir/Qt6 + LIBRARY_PATH=$LIBRARY_PATH:$libDir mkdir -p $sourceDir2/build $preferencesDir cd $sourceDir2/build qmake6 ../src