From 505aa45253b9e5d34fdf3e169bd2eb03d50d722d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 14 Apr 2024 12:57:21 +1000 Subject: [PATCH] qt6_base: bump version --- ...6.6.0.patchset => qt6_base-6.7.0.patchset} | 247 ++++++++++-------- ...ase-6.6.0.recipe => qt6_base-6.7.0.recipe} | 12 +- 2 files changed, 144 insertions(+), 115 deletions(-) rename dev-qt/qt6-base/patches/{qt6_base-6.6.0.patchset => qt6_base-6.7.0.patchset} (82%) rename dev-qt/qt6-base/{qt6_base-6.6.0.recipe => qt6_base-6.7.0.recipe} (96%) diff --git a/dev-qt/qt6-base/patches/qt6_base-6.6.0.patchset b/dev-qt/qt6-base/patches/qt6_base-6.7.0.patchset similarity index 82% rename from dev-qt/qt6-base/patches/qt6_base-6.6.0.patchset rename to dev-qt/qt6-base/patches/qt6_base-6.7.0.patchset index 37ef75d02..64d93827d 100644 --- a/dev-qt/qt6-base/patches/qt6_base-6.6.0.patchset +++ b/dev-qt/qt6-base/patches/qt6_base-6.7.0.patchset @@ -1,4 +1,4 @@ -From 0f12f9b9bcb2333cc9d9b877732b33a3b171fccd Mon Sep 17 00:00:00 2001 +From dd7d76221e3b6357b13398c40f16bd062827a82b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 10:16:14 +1000 Subject: Make sure libs are searched in the develop/ dir by CMake @@ -19,20 +19,20 @@ index 24ed125..52f637e 100644 CMAKE_DLL_DIR = $$CMAKE_LIB_DIR CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE -- -2.42.0 +2.43.2 -From 2ebc27acb1c57a9cf4bde066c705b2b34b37a4fe Mon Sep 17 00:00:00 2001 +From 4b7d3728f0a1901aba12605f5fa7a41fc529a3d2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 10:16:34 +1000 Subject: Fix QStandartPaths for Haiku diff --git a/src/corelib/io/qstandardpaths_haiku.cpp b/src/corelib/io/qstandardpaths_haiku.cpp -index 6122e5f..5bf676f 100644 +index 93eba13..2862472 100644 --- a/src/corelib/io/qstandardpaths_haiku.cpp +++ b/src/corelib/io/qstandardpaths_haiku.cpp -@@ -111,22 +111,22 @@ QString QStandardPaths::writableLocation(StandardLocation type) +@@ -111,15 +111,16 @@ QString QStandardPaths::writableLocation(StandardLocation type) return haikuStandardPath(B_USER_NONPACKAGED_BIN_DIRECTORY); case TempLocation: return haikuStandardPath(B_SYSTEM_TEMP_DIRECTORY); @@ -49,21 +49,20 @@ index 6122e5f..5bf676f 100644 return haikuAppStandardPath(B_USER_CACHE_DIRECTORY); case GenericCacheLocation: - return haikuStandardPath(B_USER_CACHE_DIRECTORY); -- case ConfigLocation: // fall through + return haikuStandardPath(B_SYSTEM_CACHE_DIRECTORY); -+ case ConfigLocation: + case ConfigLocation: case AppConfigLocation: -- return haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY); + case StateLocation: +@@ -128,7 +129,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) case GenericConfigLocation: -- return haikuStandardPath(B_USER_SETTINGS_DIRECTORY); -+ return haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY); + return haikuStandardPath(B_USER_SETTINGS_DIRECTORY); default: - return QString(); + return haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY); } } -@@ -147,7 +147,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) +@@ -149,7 +150,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) case PublicShareLocation: case TemplatesLocation: case HomeLocation: @@ -72,7 +71,7 @@ index 6122e5f..5bf676f 100644 break; case FontsLocation: paths += haikuStandardPaths(B_FIND_PATH_FONTS_DIRECTORY); -@@ -171,7 +171,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) +@@ -173,7 +174,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) break; case ConfigLocation: // fall through case AppConfigLocation: @@ -82,20 +81,20 @@ index 6122e5f..5bf676f 100644 case GenericConfigLocation: paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY); -- -2.42.0 +2.43.2 -From a99d488cf0baab76629335f334be01504c5414ee Mon Sep 17 00:00:00 2001 +From 0098c2242857170ecdb048aac4b20723f7906f8e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 10:16:55 +1000 Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku. diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp -index 0563fd0..58835af 100644 +index 1fe3344..a0dcdf4 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp -@@ -2958,6 +2958,7 @@ QList QSslSocketPrivate::unixRootCertDirectories() +@@ -2957,6 +2957,7 @@ QList QSslSocketPrivate::unixRootCertDirectories() ba("/usr/local/ssl/certs/"), // Solaris ba("/etc/openssl/certs/"), // BlackBerry ba("/opt/openssl/certs/"), // HP-UX @@ -104,10 +103,10 @@ index 0563fd0..58835af 100644 }; return QList::fromReadOnlyData(dirs); -- -2.42.0 +2.43.2 -From fcc3c9cc3337ca935f4548e2575b0ad04d67cab2 Mon Sep 17 00:00:00 2001 +From 23aee867f41924b04aa5208a92f963827d2d5f0a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 10:45:27 +1000 Subject: Fix build for Haiku platform @@ -127,17 +126,17 @@ index bfad10d..39e6d31 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.42.0 +2.43.2 -From 73d27d2858bd63c8c77235e0c8e5ea3675340bea Mon Sep 17 00:00:00 2001 +From c8396b3d15f8d9edf2a079983502e0c01a7e0df9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 10:45:56 +1000 Subject: Fix endian detection diff --git a/src/3rdparty/sha3/brg_endian.h b/src/3rdparty/sha3/brg_endian.h -index 9bb306e..9f0ea58 100644 +index 0baac93..1d48cbc 100644 --- a/src/3rdparty/sha3/brg_endian.h +++ b/src/3rdparty/sha3/brg_endian.h @@ -39,10 +39,10 @@ Changes for ARM 9/9/2010 [Downstream relative to Gladman's GitHub, upstream to Q @@ -148,26 +147,26 @@ index 9bb306e..9f0ea58 100644 +#elif defined( __linux__ ) || defined( __HAIKU__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ ) # if !defined( __MINGW32__ ) && !defined( _AIX ) && !defined(Q_OS_QNX) # include --# if !defined( __BEOS__ ) && !defined(Q_OS_RTEMS) -+# if !defined( __BEOS__ ) && !defined( __HAIKU__ ) && !defined(Q_OS_RTEMS) +-# if !defined( __BEOS__ ) && !defined(Q_OS_RTEMS) && !defined(Q_OS_VXWORKS) ++# if !defined( __BEOS__ ) && !defined( __HAIKU__ ) && !defined(Q_OS_RTEMS) && !defined(Q_OS_VXWORKS) # include # endif # endif -- -2.42.0 +2.43.2 -From 0fd1c0a17d2c3094e09152f0dae22354210f27bf Mon Sep 17 00:00:00 2001 +From 575d79a83151f59ccdedc038fbc50d115d1f10db Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:11:52 +1000 Subject: Disable LibResolv for Haiku diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index 42194fb..59e2bee 100644 +index 80d386a..dd9ac9c 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp -@@ -47,6 +47,8 @@ static void maybeRefreshResolver() +@@ -50,6 +50,8 @@ static void maybeRefreshResolver() // res_init() is not thread-safe; executing it leads to state corruption. // Whether it reloads resolv.conf on its own is unknown. return; @@ -177,43 +176,43 @@ index 42194fb..59e2bee 100644 #if QT_CONFIG(libresolv) -- -2.42.0 +2.43.2 -From 06c1739c89f002727b58abbbe3c653e3d9326e4b Mon Sep 17 00:00:00 2001 +From 6247a30f7b643a04097833777d6e79476cb68c80 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:15:38 +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 082d83e..eab15bf 100644 +index 116e7d0..9c7af42 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp -@@ -17,7 +17,7 @@ - # include "qdatetime.h" +@@ -21,7 +21,7 @@ + # include #endif --#if defined(QT_LINUXBASE) +-#ifdef QT_LINUXBASE +#if defined(QT_LINUXBASE) || defined(Q_OS_HAIKU) - # define QT_NO_GETIFADDRS - #endif - + # include + # ifndef SIOCGIFBRDADDR + # define SIOCGIFBRDADDR 0x8919 -- -2.42.0 +2.43.2 -From fea0640efe1a4a170192c0b2ddec486eb7df0886 Mon Sep 17 00:00:00 2001 +From e17cd0236e106db600a51d7d829484a0783e0968 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:15:58 +1000 Subject: Disable sharedmemory feature for bootstrap diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt -index e065fdf..915fb81 100644 +index 7cceb2a..17fe3d8 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt -@@ -100,6 +100,7 @@ qt_internal_extend_target(Bootstrap +@@ -99,6 +99,7 @@ qt_internal_extend_target(Bootstrap QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_FOREACH @@ -222,17 +221,17 @@ index e065fdf..915fb81 100644 .. ../../3rdparty/tinycbor/src -- -2.42.0 +2.43.2 -From 39f3777388a2268cf91fda27c7d52974c80025e7 Mon Sep 17 00:00:00 2001 +From 1071afb219fc9bd1a60786cd0154dfc62eab9698 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:16:20 +1000 Subject: Fix build for x86_gcc2 diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c -index 9960e45..3de4afc 100644 +index edef3c5..c9df584 100644 --- a/src/3rdparty/forkfd/forkfd.c +++ b/src/3rdparty/forkfd/forkfd.c @@ -675,7 +675,7 @@ static int forkfd_fork_fallback(int flags, pid_t *ppid) @@ -245,20 +244,20 @@ index 9960e45..3de4afc 100644 /* release the child */ #ifdef HAVE_EVENTFD -- -2.42.0 +2.43.2 -From 41de48fd76bc2181ab729de9760b94d1eab66cd8 Mon Sep 17 00:00:00 2001 +From 246384a15e0048d154b6ba70db5dcfdf953a45be Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:17:49 +1000 Subject: Implement QFilesystemWatcher for Haiku diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt -index d42b51d..7c3ce10 100644 +index bf24eec..f28f64e 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt -@@ -900,6 +900,11 @@ qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher +@@ -939,6 +939,11 @@ qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h ) @@ -643,20 +642,20 @@ index 0000000..0ae4bdf +#endif // QFILESYSTEMWATCHER_HAIKU_P_H + -- -2.42.0 +2.43.2 -From c336bbfc781e9ad9fedaaf68189700ce37c32ec6 Mon Sep 17 00:00:00 2001 +From 67e71426951fbc54639b290e0c1b72f0394dff42 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:18:17 +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 d5f2bfb..681b136 100644 +index b6df412..e7e2f17 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp -@@ -204,8 +204,12 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc +@@ -194,8 +194,12 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc } int protocol = 0; #endif // QT_NO_SCTP @@ -670,20 +669,20 @@ index d5f2bfb..681b136 100644 int socket = qt_safe_socket(domain, type, protocol, O_NONBLOCK); -- -2.42.0 +2.43.2 -From 3fae787f5ac052fd2b423f495592fe38e015733c Mon Sep 17 00:00:00 2001 +From caa66e94f036f4b6c12333391f661a32b7c392d6 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:18:41 +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 84f572a..f69b310 100644 +index e29207e..f0ab252 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp -@@ -163,7 +163,7 @@ bool QLibraryPrivate::load_sys() +@@ -157,7 +157,7 @@ bool QLibraryPrivate::load_sys() prefixes.append(QString()); } @@ -693,34 +692,47 @@ index 84f572a..f69b310 100644 auto transform = [](QStringList &list, void (*f)(QString *)) { QStringList tmp; -- -2.42.0 +2.43.2 -From 7b014f8c23c4b5b14924a019e06d24de0906cf8e Mon Sep 17 00:00:00 2001 +From 9ea6145c509a6bc806c912211f22cdcc55800623 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:19:25 +1000 Subject: Haiku build setup -diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake -index 1dc576d..c79efa7 100644 ---- a/cmake/QtBuild.cmake -+++ b/cmake/QtBuild.cmake -@@ -307,6 +307,12 @@ elseif(LINUX) - elseif(CLANG) - set(QT_DEFAULT_MKSPEC linux-clang) - endif() -+elseif(HAIKU) -+ if(GCC) -+ set(QT_DEFAULT_MKSPEC haiku-g++) -+ elseif(CLANG) -+ set(QT_DEFAULT_MKSPEC haiku-clang) -+ endif() - elseif(ANDROID) - if(GCC) - set(QT_DEFAULT_MKSPEC android-g++) +diff --git a/cmake/QtBuildHelpers.cmake b/cmake/QtBuildHelpers.cmake +index 2c1b134..efdb61e 100644 +--- a/cmake/QtBuildHelpers.cmake ++++ b/cmake/QtBuildHelpers.cmake +@@ -42,7 +42,7 @@ endmacro() + + macro(qt_internal_setup_position_independent_code) + ## Position independent code: +- set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ set(CMAKE_POSITION_INDEPENDENT_CODE OFF) + + # Does the linker support position independent code? + include(CheckPIESupported) +diff --git a/cmake/QtMkspecHelpers.cmake b/cmake/QtMkspecHelpers.cmake +index cd08daa..f541bde 100644 +--- a/cmake/QtMkspecHelpers.cmake ++++ b/cmake/QtMkspecHelpers.cmake +@@ -48,6 +48,12 @@ macro(qt_internal_setup_platform_definitions_and_mkspec) + elseif(CLANG) + set(QT_DEFAULT_MKSPEC linux-clang) + endif() ++ elseif(HAIKU) ++ if(GCC) ++ set(QT_DEFAULT_MKSPEC haiku-g++) ++ elseif(CLANG) ++ set(QT_DEFAULT_MKSPEC haiku-clang) ++ endif() + elseif(ANDROID) + if(GCC) + set(QT_DEFAULT_MKSPEC android-g++) diff --git a/cmake/QtRpathHelpers.cmake b/cmake/QtRpathHelpers.cmake -index 7228ffb..533d261 100644 +index da6c871..bd085e2 100644 --- a/cmake/QtRpathHelpers.cmake +++ b/cmake/QtRpathHelpers.cmake @@ -8,6 +8,8 @@ function(qt_internal_get_relative_rpath_base_token out_var) @@ -732,34 +744,21 @@ index 7228ffb..533d261 100644 else() set(rpath_rel_base "NO_KNOWN_RPATH_REL_BASE") endif() -diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake -index 762299f..60b614c 100644 ---- a/cmake/QtSetup.cmake -+++ b/cmake/QtSetup.cmake -@@ -126,7 +126,7 @@ elseif(APPLE) - endif() - - ## Position independent code: --set(CMAKE_POSITION_INDEPENDENT_CODE ON) -+set(CMAKE_POSITION_INDEPENDENT_CODE OFF) - - # Does the linker support position independent code? - include(CheckPIESupported) -- -2.42.0 +2.43.2 -From 8b97a9c94ade718f3d1e63eaa41dc12129e0cfcf Mon Sep 17 00:00:00 2001 +From da54e8bb93551ebfd4763c5e510c53f24a2918a6 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:21:18 +1000 Subject: Haiku: link against libnetwork diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt -index 64c9bf5..0affd20 100644 +index c4e0324..db3feb5 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt -@@ -202,6 +202,11 @@ qt_internal_extend_target(Network CONDITION WIN32 +@@ -212,6 +212,11 @@ qt_internal_extend_target(Network CONDITION WIN32 NOMINMAX ) @@ -772,17 +771,17 @@ index 64c9bf5..0affd20 100644 LIBRARIES ${FWCoreServices} -- -2.42.0 +2.43.2 -From b8a9442cf57e65ece49f91399a76b5f8a6663e3f Mon Sep 17 00:00:00 2001 +From 5dbf63417e2b190f2134788e0836230f877304df Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:28:46 +1000 Subject: Fix elf parser for Haiku diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp -index ffc4a14..7d822e8 100644 +index 0bbadb2..e454680 100644 --- a/src/corelib/plugin/qelfparser_p.cpp +++ b/src/corelib/plugin/qelfparser_p.cpp @@ -20,6 +20,12 @@ @@ -798,7 +797,7 @@ index ffc4a14..7d822e8 100644 QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -@@ -202,18 +208,26 @@ struct ElfHeaderCheck : public ElfHeaderCommonCheck +@@ -206,18 +212,26 @@ struct ElfHeaderCheck : public ElfHeaderCommonCheck // byte 7 static bool checkOsAbi(const uchar *ident) { @@ -825,7 +824,7 @@ index ffc4a14..7d822e8 100644 return true; } -@@ -331,6 +345,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade +@@ -335,6 +349,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade break; } @@ -835,7 +834,7 @@ index ffc4a14..7d822e8 100644 switch (e_ident[EI_OSABI]) { case ELFOSABI_SYSV: d << " (SYSV"; break; case ELFOSABI_HPUX: d << " (HP-UX"; break; -@@ -347,7 +364,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade +@@ -351,7 +368,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 << ')'; @@ -844,7 +843,7 @@ index ffc4a14..7d822e8 100644 if (e_ident[EI_VERSION] != 1) { d << ", file version " << e_ident[EI_VERSION]; return d; -@@ -442,11 +459,12 @@ Q_DECL_UNUSED static QDebug &operator<<(QDebug &d, ElfSectionDebug s) +@@ -446,11 +463,12 @@ Q_DECL_UNUSED static QDebug &operator<<(QDebug &d, ElfSectionDebug s) d << 'A'; if (s.shdr->sh_flags & SHF_EXECINSTR) d << 'X'; @@ -859,20 +858,20 @@ index ffc4a14..7d822e8 100644 return d; } -- -2.42.0 +2.43.2 -From 362b34a4d593a3cdfd6f88dbaf4ab858069072f2 Mon Sep 17 00:00:00 2001 +From 2665b201ffa9ad3485c8256dd4b5d268278477b1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:29:03 +1000 Subject: Don't use nl_langinfo diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index cf773a2..99bce80 100644 +index 1ce2642..32c4f37 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -616,7 +616,7 @@ void QCoreApplicationPrivate::initLocale() +@@ -621,7 +621,7 @@ void QCoreApplicationPrivate::initLocale() // QLocal8Bit hard-codes this, and we need to be consistent. # if defined(Q_OS_INTEGRITY) setlocale(LC_CTYPE, "UTF-8"); @@ -882,30 +881,60 @@ index cf773a2..99bce80 100644 // FIXME: Shouldn't we still setlocale("UTF-8")? # elif defined(Q_OS_ANDROID) && __ANDROID_API__ < __ANDROID_API_O__ -- -2.42.0 +2.43.2 -From fae5ec2bb295e4355129e1336a5bc0371b873f01 Mon Sep 17 00:00:00 2001 +From cd3a02eaea0789de1a13ff3f39608d3a6f3d1b85 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 20 Oct 2023 12:30:12 +1000 Subject: Workaround for shm_open diff --git a/src/corelib/ipc/qsharedmemory_posix.cpp b/src/corelib/ipc/qsharedmemory_posix.cpp -index 8844810..a2e4cb7 100644 +index 582c662..0854906 100644 --- a/src/corelib/ipc/qsharedmemory_posix.cpp +++ b/src/corelib/ipc/qsharedmemory_posix.cpp @@ -68,6 +68,10 @@ bool QSharedMemoryPosix::create(QSharedMemoryPrivate *self, qsizetype size) int fd; - EINTR_LOOP(fd, ::shm_open(shmName.constData(), O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, 0600)); + QT_EINTR_LOOP(fd, ::shm_open(shmName.constData(), O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, 0600)); +#ifdef Q_OS_HAIKU + if (fd == -1) -+ EINTR_LOOP(fd, ::shm_open(shmName.constData(), O_RDWR | O_CLOEXEC, 0600)); ++ QT_EINTR_LOOP(fd, ::shm_open(shmName.constData(), O_RDWR | O_CLOEXEC, 0600)); +#endif if (fd == -1) { const int errorNumber = errno; const auto function = "QSharedMemory::attach (shm_open)"_L1; -- -2.42.0 +2.43.2 + + +From 2cdc06b88bdf9c35be9d540003c8e2d2f570f18f Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 14 Apr 2024 12:20:21 +1000 +Subject: Disable DisconnectControllingTerminal + + +diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp +index fcbce92..7417b69 100644 +--- a/src/corelib/io/qprocess_unix.cpp ++++ b/src/corelib/io/qprocess_unix.cpp +@@ -852,6 +852,7 @@ static const char *applyProcessParameters(const QProcess::UnixProcessParameters + return "setsid"; + } + ++#ifndef Q_OS_HAIKU + // Disconnect from the controlling TTY. This probably won't fail. Must be + // done after the session settings from above. + if (params.flags.testFlag(QProcess::UnixProcessFlag::DisconnectControllingTerminal)) { +@@ -866,6 +867,7 @@ static const char *applyProcessParameters(const QProcess::UnixProcessParameters + } + } + } ++#endif + + // Apply UID and GID parameters last. This isn't expected to fail either: + // either we're trying to impersonate what we already are, or we're EUID or +-- +2.43.2 diff --git a/dev-qt/qt6-base/qt6_base-6.6.0.recipe b/dev-qt/qt6-base/qt6_base-6.7.0.recipe similarity index 96% rename from dev-qt/qt6-base/qt6_base-6.6.0.recipe rename to dev-qt/qt6-base/qt6_base-6.7.0.recipe index 9f943e410..5863907ce 100644 --- a/dev-qt/qt6-base/qt6_base-6.6.0.recipe +++ b/dev-qt/qt6-base/qt6_base-6.7.0.recipe @@ -4,17 +4,17 @@ used for developing software with a graphical user interface, and also used \ for developing non-GUI programs such as command-line tools and consoles for \ servers." HOMEPAGE="https://qt.io/" -COPYRIGHT="2015-2023 The Qt Company Ltd." +COPYRIGHT="2015-2024 The Qt Company Ltd." LICENSE="GNU LGPL v3 GNU GPL v3 GNU FDL v1" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtbase-everywhere-src-$portVersion.tar.xz" -CHECKSUM_SHA256="039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e" +CHECKSUM_SHA256="11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254" SOURCE_DIR="qtbase-everywhere-src-$portVersion" -srcGitRev2="1882f012bab043bb1a789f493a074b02f0c3d5ea" +srcGitRev2="8d202a636483049d7768b855a70be9ab0d1cc780" SOURCE_URI_2="https://github.com/threedeyes/qt6-haikuplugins/archive/$srcGitRev2.tar.gz" -CHECKSUM_SHA256_2="030ae321f28f6a12f51254a92d100d956058fed474d7e7c32fa9d45468fdc001" +CHECKSUM_SHA256_2="ac3694f59eca89cd8f6a679a26c2530c2cf5435b0e664f78336e1e11943345e1" SOURCE_DIR_2="qt6-haikuplugins-$srcGitRev2" PATCHES="qt6_base-$portVersion.patchset" @@ -105,7 +105,7 @@ BUILD_REQUIRES=" devel:libglu$secondaryArchSuffix devel:libharfbuzz$secondaryArchSuffix devel:libharfbuzz_gobject$secondaryArchSuffix - devel:libicuuc$secondaryArchSuffix >= 66 + devel:libicuuc$secondaryArchSuffix >= 74 devel:libjpeg$secondaryArchSuffix devel:libpcre2_16$secondaryArchSuffix devel:libpng16$secondaryArchSuffix