haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt6_base: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2023-05-14 10:57:51 +10:00
parent 5b177aacb0
commit 36c42da19c
2 changed files with 141 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
dev-qt/qt6-base/patches/qt6_base-6.4.0.patchset → dev-qt/qt6-base/patches/qt6_base-6.5.0.patchset
View File

@@ -1,4 +1,4 @@
From 6edaeafb70a76aa6a48770bebf4eff4b0f53704c Mon Sep 17 00:00:00 2001
From c7aea58ebe63b9036d33c358f607bf02542ad3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 11 Feb 2019 15:53:49 +1000
Subject: Make sure libs are searched in the develop/ dir by CMake
@@ -20,10 +20,10 @@ index 24ed125..52f637e 100644
CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
--
2.36.1
2.37.3
From 383dd2759941afd4094685296dab2d7d51af8eba Mon Sep 17 00:00:00 2001
From a6218c9ab6c754e730b33bbd386152e21c8085d7 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
@@ -83,17 +83,17 @@ index 6122e5f..5bf676f 100644
case GenericConfigLocation:
paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
--
2.36.1
2.37.3
From d2d3453b9018d8296ccdade45d11432fbc532077 Mon Sep 17 00:00:00 2001
From 07e972341500246b05934bb9976a3e782dd23236 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 cd76517..56cd335 100644
index 4eefe43..ea20a3e 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -2953,6 +2953,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
@@ -105,10 +105,10 @@ index cd76517..56cd335 100644
};
return QList<QByteArray>::fromReadOnlyData(dirs);
--
2.36.1
2.37.3
From 6b696bf307187c3cdccf9758f21c6d631b53c9a7 Mon Sep 17 00:00:00 2001
From fc72eb07f336659fd206c667b867249e40a31481 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.36.1
2.37.3
From 8b0aad65864783f6c172052142cc9fbe9976df04 Mon Sep 17 00:00:00 2001
From 7f1e826c4991c3a378018aaed49a5b14f9131699 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,10 +155,10 @@ index 9bb306e..9f0ea58 100644
# endif
# endif
--
2.36.1
2.37.3
From eb7b83a6bfabebb87e01754b7697d8aacc9f92e0 Mon Sep 17 00:00:00 2001
From cd596caaa930b4cd5493e86443a4c2a9b5cd9a25 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
@@ -178,10 +178,10 @@ index 12d8c04..377cb0b 100644
struct LibResolv
{
--
2.36.1
2.37.3
From df7203d2a5e910acd9107b85f5c776b1236de3bd Mon Sep 17 00:00:00 2001
From 46c98fb360bcbd604a05d0107c0ffa79d28d94c9 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
@@ -201,20 +201,20 @@ index 51a266b..cf16236 100644
#endif
--
2.36.1
2.37.3
From 12d2459cec4b5c042ab01fee5d16dcbb9ba8de72 Mon Sep 17 00:00:00 2001
From a4783b34d00955f5bea8d934b3c954f9574c3dab 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 35e62b6..f61ca73 100644
index 0919159..4573649 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -95,6 +95,7 @@ qt_internal_extend_target(Bootstrap
@@ -100,6 +100,7 @@ qt_internal_extend_target(Bootstrap
QT_NO_CAST_FROM_ASCII
QT_NO_CAST_TO_ASCII
QT_NO_FOREACH
@@ -223,10 +223,10 @@ index 35e62b6..f61ca73 100644
..
../../3rdparty/tinycbor/src
--
2.36.1
2.37.3
From c11b6c3991f20a1f0b17a7c847678c2152ee936a Mon Sep 17 00:00:00 2001
From 148ba5e5b428c39bf41bd01eebd103b04fd5f692 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
@@ -246,20 +246,20 @@ index 9960e45..3de4afc 100644
/* release the child */
#ifdef HAVE_EVENTFD
--
2.36.1
2.37.3
From a539097787a2b5a653cf24c253fac0600f73fc8d Mon Sep 17 00:00:00 2001
From ba91eb186d2e74775cfa3fbbfb41b8db397a71a3 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 c683bb4..369c931 100644
index 1a8cc08..23845cc 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -469,6 +469,14 @@ qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQU
@@ -461,6 +461,14 @@ qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQU
"/BASE:0x67000000"
)
@@ -274,7 +274,7 @@ index c683bb4..369c931 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.
@@ -889,6 +897,11 @@ qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher
@@ -874,6 +882,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 c683bb4..369c931 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
@@ -1076,7 +1089,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
@@ -1068,7 +1081,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
WrapRt::WrapRt
)
@@ -319,7 +319,7 @@ index 9ffbe31..cfb1acf 100644
// 2005), so we can't just new inotify directly.
diff --git a/src/corelib/io/qfilesystemwatcher_haiku.cpp b/src/corelib/io/qfilesystemwatcher_haiku.cpp
new file mode 100644
index 0000000..8355ca8
index 0000000..92a2647
--- /dev/null
+++ b/src/corelib/io/qfilesystemwatcher_haiku.cpp
@@ -0,0 +1,254 @@
@@ -403,7 +403,7 @@ index 0000000..8355ca8
+ watch_node(&nref, (B_WATCH_NAME | B_WATCH_ATTR | B_WATCH_STAT), fileLooper);
+
+ if (status != B_OK) {
+ qWarning("watch_node(%ls) failed:", path.constData());
+ qWarning("watch_node(%s) failed:", path.toUtf8().constData());
+ continue;
+ }
+
@@ -431,10 +431,10 @@ index 0000000..8355ca8
+
+ if (directories->contains(path)) {
+ directories->removeAll(path);
+ status_t status = watch_node(&nref, B_STOP_WATCHING, dirLooper);
+ watch_node(&nref, B_STOP_WATCHING, dirLooper);
+ } else if (files->contains(path)) {
+ files->removeAll(path);
+ status_t status = watch_node(&nref, B_STOP_WATCHING, fileLooper);
+ watch_node(&nref, B_STOP_WATCHING, fileLooper);
+ } else {
+ continue;
+ }
@@ -579,7 +579,7 @@ index 0000000..8355ca8
+#include "moc_qfilesystemwatcher_haiku_p.cpp"
diff --git a/src/corelib/io/qfilesystemwatcher_haiku_p.h b/src/corelib/io/qfilesystemwatcher_haiku_p.h
new file mode 100644
index 0000000..8a8d75a
index 0000000..0ae4bdf
--- /dev/null
+++ b/src/corelib/io/qfilesystemwatcher_haiku_p.h
@@ -0,0 +1,84 @@
@@ -630,7 +630,7 @@ index 0000000..8a8d75a
+ Q_OBJECT
+public:
+ QHaikuDirWatcher();
+ virtual void MessageReceived(BMessage* msg);
+ virtual void MessageReceived(BMessage* msg) override;
+Q_SIGNALS:
+ void directoryChanged(const QString &path, bool removed);
+};
@@ -639,7 +639,7 @@ index 0000000..8a8d75a
+ Q_OBJECT
+public:
+ QHaikuFileWatcher();
+ virtual void MessageReceived(BMessage* msg);
+ virtual void MessageReceived(BMessage* msg) override;
+Q_SIGNALS:
+ void fileChanged(const QString &path, bool removed);
+};
@@ -668,17 +668,17 @@ index 0000000..8a8d75a
+#endif // QFILESYSTEMWATCHER_HAIKU_P_H
+
--
2.36.1
2.37.3
From 0f2058f4df0362fcf0ad98db417f27a41edc00b2 Mon Sep 17 00:00:00 2001
From 98492a3f38ceab59d7c72e9bf6d47d1dba44ab13 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 4b5e93e..d47057f 100644
index dd3c57d..e8228a9 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -200,8 +200,12 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc
@@ -695,20 +695,20 @@ index 4b5e93e..d47057f 100644
int socket = qt_safe_socket(domain, type, protocol, O_NONBLOCK);
--
2.36.1
2.37.3
From 671b2bee6917a27b7c7d2b48206b6777b24d8c1c Mon Sep 17 00:00:00 2001
From bb8f5a841d930ca07b6bac7f14f5ed7d029502e2 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 7ad6e9e..7839494 100644
index 7478373..ed30375 100644
--- a/src/corelib/plugin/qlibrary_unix.cpp
+++ b/src/corelib/plugin/qlibrary_unix.cpp
@@ -158,7 +158,7 @@ bool QLibraryPrivate::load_sys()
@@ -163,7 +163,7 @@ bool QLibraryPrivate::load_sys()
prefixes.append(QString());
}
@@ -718,20 +718,20 @@ index 7ad6e9e..7839494 100644
auto transform = [](QStringList &list, void (*f)(QString *)) {
QStringList tmp;
--
2.36.1
2.37.3
From 533a530d56ecd6d7ee8f794639c3413b64b00904 Mon Sep 17 00:00:00 2001
From 360d98f51a7d49451419490140cbe333d687d229 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 12 Nov 2020 17:50:04 +0100
Subject: Haiku build setup
diff --git a/cmake/QtRpathHelpers.cmake b/cmake/QtRpathHelpers.cmake
index fc75b8f..e9b12ff 100644
index 2150b95..a88a0b4 100644
--- a/cmake/QtRpathHelpers.cmake
+++ b/cmake/QtRpathHelpers.cmake
@@ -5,6 +5,8 @@ function(qt_internal_get_relative_rpath_base_token out_var)
@@ -8,6 +8,8 @@ function(qt_internal_get_relative_rpath_base_token out_var)
set(rpath_rel_base "@loader_path")
elseif(LINUX OR SOLARIS OR FREEBSD OR HURD)
set(rpath_rel_base "$ORIGIN")
@@ -741,33 +741,33 @@ index fc75b8f..e9b12ff 100644
set(rpath_rel_base "NO_KNOWN_RPATH_REL_BASE")
endif()
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
index bcb629d..6d29d06 100644
index 90acbae..63a7648 100644
--- a/cmake/QtSetup.cmake
+++ b/cmake/QtSetup.cmake
@@ -114,7 +114,7 @@ elseif(APPLE)
@@ -117,7 +117,7 @@ elseif(APPLE)
endif()
## Position independent code:
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
# Do not relink dependent libraries when no header has changed:
set(CMAKE_LINK_DEPENDS_NO_SHARED ON)
# Does the linker support position independent code?
include(CheckPIESupported)
--
2.36.1
2.37.3
From 1bb2c919e01bc9116656802d6f297208155b92ec Mon Sep 17 00:00:00 2001
From 053c0c9f3668924bc35ded284a8aac06ce318953 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 98fcb5d..ae147ff 100644
index ec6e5f1..23e4200 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -210,6 +210,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
@@ -215,6 +215,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
kernel/qdnslookup_win.cpp
)
@@ -780,17 +780,17 @@ index 98fcb5d..ae147ff 100644
LIBRARIES
${FWCoreServices}
--
2.36.1
2.37.3
From 99b41ce36c7ddaefb9e9a90dbe39657c1c894beb Mon Sep 17 00:00:00 2001
From d7d1cb4821067981b2f186af9a04667f0d031a99 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 a789a58..eeee4b8 100644
index 2449564..617c76c 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -10,6 +10,9 @@
@@ -818,10 +818,10 @@ index a789a58..eeee4b8 100644
#else
diff --git a/src/corelib/kernel/qsharedmemory_haiku.cpp b/src/corelib/kernel/qsharedmemory_haiku.cpp
new file mode 100644
index 0000000..219c8ff
index 0000000..88e18af
--- /dev/null
+++ b/src/corelib/kernel/qsharedmemory_haiku.cpp
@@ -0,0 +1,183 @@
@@ -0,0 +1,174 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
@@ -850,15 +850,6 @@ index 0000000..219c8ff
+#ifndef QT_NO_SHAREDMEMORY
+QT_BEGIN_NAMESPACE
+
+QSharedMemoryPrivate::QSharedMemoryPrivate()
+ : QObjectPrivate(), memory(0), size(0), error(QSharedMemory::NoError),
+#ifndef QT_NO_SYSTEMSEMAPHORE
+ systemSemaphore(QString()), lockedByMe(false),
+#endif
+ hand(-1)
+{
+}
+
+void QSharedMemoryPrivate::setErrorString(QLatin1String function)
+{
+ Q_UNUSED(function);
@@ -1006,12 +997,12 @@ index 0000000..219c8ff
+
+#endif // QT_NO_SHAREDMEMORY
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index 57dcb2c..11fb8a4 100644
index 6d7973f..93512f4 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -42,10 +42,14 @@ QT_END_NAMESPACE
# include "private/qobject_p.h"
#endif
@@ -39,10 +39,14 @@ QT_END_NAMESPACE
#include "qsystemsemaphore.h"
#include "private/qobject_p.h"
-#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS) && !defined(Q_OS_HAIKU)
@@ -1024,8 +1015,8 @@ index 57dcb2c..11fb8a4 100644
+
QT_BEGIN_NAMESPACE
#ifndef QT_NO_SYSTEMSEMAPHORE
@@ -108,6 +112,8 @@ public:
#if QT_CONFIG(systemsemaphore)
@@ -98,6 +102,8 @@ public:
const QString &prefix = QStringLiteral("qipc_sharedmemory_"));
#ifdef Q_OS_WIN
Qt::HANDLE handle();
@@ -1034,31 +1025,31 @@ index 57dcb2c..11fb8a4 100644
#elif defined(QT_POSIX_IPC)
int handle();
#else
@@ -135,6 +141,8 @@ public:
@@ -125,6 +131,8 @@ public:
private:
#ifdef Q_OS_WIN
Qt::HANDLE hand;
Qt::HANDLE hand = nullptr;
+#elif defined(Q_OS_HAIKU)
+ area_id hand;
+ area_id hand = -1;
#elif defined(QT_POSIX_IPC)
int hand;
int hand = -1;
#else
--
2.36.1
2.37.3
From 7969199e8819fd97f79645abd3f9ea4fed0eec64 Mon Sep 17 00:00:00 2001
From 47e707b0c66e14d2b53c8562e2cd2f1e16ac3525 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 b0c23d5..d538ea7 100644
index 54e5a19..f5cea82 100644
--- a/src/corelib/plugin/qelfparser_p.cpp
+++ b/src/corelib/plugin/qelfparser_p.cpp
@@ -20,6 +20,12 @@
# error "Need ELF header to parse plugins."
@@ -25,6 +25,12 @@
# define ELFOSABI_GNU ELFOSABI_LINUX
#endif
+#ifdef __HAIKU__
@@ -1070,7 +1061,7 @@ index b0c23d5..d538ea7 100644
QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals;
@@ -196,18 +202,26 @@ struct ElfHeaderCheck : public ElfHeaderCommonCheck
@@ -207,18 +213,26 @@ struct ElfHeaderCheck : public ElfHeaderCommonCheck
// byte 7
static bool checkOsAbi(const uchar *ident)
{
@@ -1097,7 +1088,7 @@ index b0c23d5..d538ea7 100644
return true;
}
@@ -325,6 +339,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade
@@ -336,6 +350,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade
break;
}
@@ -1107,7 +1098,7 @@ index b0c23d5..d538ea7 100644
switch (e_ident[EI_OSABI]) {
case ELFOSABI_SYSV: d << " (SYSV"; break;
case ELFOSABI_HPUX: d << " (HP-UX"; break;
@@ -341,7 +358,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade
@@ -352,7 +369,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 +1107,7 @@ index b0c23d5..d538ea7 100644
if (e_ident[EI_VERSION] != 1) {
d << ", file version " << e_ident[EI_VERSION];
return d;
@@ -428,11 +445,12 @@ Q_DECL_UNUSED static QDebug &operator<<(QDebug &d, ElfSectionDebug s)
@@ -445,11 +462,12 @@ Q_DECL_UNUSED static QDebug &operator<<(QDebug &d, ElfSectionDebug s)
d << 'A';
if (s.shdr->sh_flags & SHF_EXECINSTR)
d << 'X';
@@ -1131,5 +1122,28 @@ index b0c23d5..d538ea7 100644
return d;
}
--
2.36.1
2.37.3
From 1787baf0209b776f0021e97f859cad9d3fdd8c04 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 7 Apr 2023 19:34:19 +1000
Subject: Don't use nl_langinfo
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 3feb4cf..5d069b6 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -615,7 +615,7 @@ void QCoreApplicationPrivate::initLocale()
// QLocal8Bit hard-codes this, and we need to be consistent.
# if defined(Q_OS_INTEGRITY)
setlocale(LC_CTYPE, "UTF-8");
-# elif defined(Q_OS_QNX)
+# elif defined(Q_OS_QNX) || defined(Q_OS_HAIKU)
// QNX has no nl_langinfo, so we can't check.
// FIXME: Shouldn't we still setlocale("UTF-8")?
# elif defined(Q_OS_ANDROID) && __ANDROID_API__ < __ANDROID_API_O__
--
2.37.3

63
dev-qt/qt6-base/qt6_base-6.4.0.recipe → dev-qt/qt6-base/qt6_base-6.5.0.recipe
View File

@@ -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-2022 The Qt Company Ltd."
COPYRIGHT="2015-2023 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="cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d"
CHECKSUM_SHA256="fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef"
SOURCE_DIR="qtbase-everywhere-src-$portVersion"
srcGitRev2="0cbd793279b7fa5ee971b216cbba03dd3d336440"
srcGitRev2="eca3ef635963a25fcca763a40b7eb96940efd28c"
SOURCE_URI_2="https://github.com/threedeyes/qt6-haikuplugins/archive/$srcGitRev2.tar.gz"
CHECKSUM_SHA256_2="49c186b32b41f932186616c5f7e8bdd902f66ad21d762f15e0fce2dc8b6b86d5"
CHECKSUM_SHA256_2="a6cb695f36a17b6e974027449025f0b454d13b16431afe30611d460c6b288a07"
SOURCE_DIR_2="qt6-haikuplugins-$srcGitRev2"
PATCHES="qt6_base-$portVersion.patchset"
@@ -86,6 +86,7 @@ REQUIRES_devel="
haiku${secondaryArchSuffix}_devel
qt6_base$secondaryArchSuffix == $portVersion base
devel:libgl$secondaryArchSuffix
devel:libvulkan$secondaryArchSuffix
"
BUILD_REQUIRES="
@@ -119,7 +120,7 @@ BUILD_PREREQUIRES="
cmd:ninja
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:python3.7
cmd:python3
cmd:sed
cmd:xargs
"
@@ -133,8 +134,8 @@ BUILD()
-S $sourceDir \
-G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_FLAGS=-fPIC \
-DCMAKE_CXX_FLAGS=-fPIC \
-DCMAKE_C_FLAGS="-fPIC -D_DEFAULT_SOURCE" \
-DCMAKE_CXX_FLAGS="-fPIC -D_DEFAULT_SOURCE" \
-DCMAKE_INSTALL_PREFIX=$prefix \
-DBUILD_WITH_PCH=ON \
-DINSTALL_BINDIR=$libDir/Qt6 \
@@ -147,7 +148,7 @@ BUILD()
-DINSTALL_DATADIR=$dataDir/Qt6 \
-DINSTALL_INCLUDEDIR=$includeDir/Qt6 \
-DINSTALL_MKSPECSDIR=$dataDir/Qt6/mkspecs \
-DINSTALL_EXAMPLESDIR=$dataDir/Qt6/examples \
-DINSTALL_EXAMPLESDIR=$developDir/sources/Qt6 \
-DINSTALL_QMLDIR=$dataDir/Qt6/qml \
-DINSTALL_TRANSLATIONSDIR=$dataDir/Qt6/translations \
-DQT_QMAKE_TARGET_MKSPEC=haiku-g++ \
@@ -166,25 +167,39 @@ INSTALL()
# build platform plugins
PATH=$PATH:$binDir:$libDir/Qt6
LIBRARY_PATH=$LIBRARY_PATH:$libDir
mkdir -p $sourceDir2/build $preferencesDir
mkdir -p $sourceDir2/build
cd $sourceDir2/build
qmake6 ../src
make $jobArgs
make install
# install platform plugins
mkdir -p $addOnsDir/Qt6/{platforms,imageformats,styles} $preferencesDir
cp platform/libqhaiku.so $addOnsDir/Qt6/platforms
cp imageformats/hvif/libqhvif.so $addOnsDir/Qt6/imageformats
cp style/libqhaikustyle.so $addOnsDir/Qt6/styles
cp preferences/Qt6Configurator $preferencesDir
prepareInstalledDevelLibs \
libQt6Concurrent libQt6Core libQt6DBus libQt6EglFSDeviceIntegration \
libQt6Gui libQt6Network libQt6OpenGL libQt6OpenGLWidgets \
libQt6PrintSupport libQt6Sql libQt6Test libQt6Widgets libQt6Xml \
libQt6FbSupport libQt6DeviceDiscoverySupport
libQt6Concurrent \
libQt6Core \
libQt6DBus \
libQt6DeviceDiscoverySupport \
libQt6EglFSDeviceIntegration \
libQt6FbSupport \
libQt6Gui \
libQt6Network \
libQt6OpenGL \
libQt6OpenGLWidgets \
libQt6PrintSupport \
libQt6Sql \
libQt6Test \
libQt6Widgets \
libQt6Xml
cd $libDir
for i in lib*.so.6.*;do
ln -fs $i $(echo $i | cut -f1,2 -d.)
done
# fix paths for static libs
# fix pkgconfig & cmake files
fixPkgconfig
sed -i "s|includedir=.*|includedir=$includeDir/Qt6|" \
$developLibDir/pkgconfig/*.pc
sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
$libDir/cmake/Qt6FbSupportPrivate/Qt6FbSupportPrivateTargets-release.cmake
sed -i 's,${_IMPORT_PREFIX}/lib',$developDir/lib, \
@@ -192,9 +207,13 @@ INSTALL()
mkdir -p $binDir
ln -s -t $binDir $libDir/Qt6/{qmake6,qtpaths6}
rm -rf $(dirname "$docDir")
cd $libDir
for i in lib*.so.6.*;do
ln -fs $i $(echo $i | cut -f1,2 -d.)
done
packageEntries devel \
$developDir \
$binDir \