mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Qt5: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -1,4 +1,4 @@
|
||||
From 45ffbaaa25c68ba5301c6709d301fe9b126ad205 Mon Sep 17 00:00:00 2001
|
||||
From 72a1d6df493088dcc8afeb5739c95b00c0ad3e4d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 11 Feb 2019 15:51:31 +1000
|
||||
Subject: Fix Haiku build
|
||||
@@ -25,7 +25,7 @@ index e715ed2..1362a13 100644
|
||||
inline size_t systemPageSize()
|
||||
{
|
||||
diff --git a/qtdeclarative/src/3rdparty/masm/wtf/Platform.h b/qtdeclarative/src/3rdparty/masm/wtf/Platform.h
|
||||
index d5f6992..c2a1e4f 100644
|
||||
index ab1da21..5d8617e 100644
|
||||
--- a/qtdeclarative/src/3rdparty/masm/wtf/Platform.h
|
||||
+++ b/qtdeclarative/src/3rdparty/masm/wtf/Platform.h
|
||||
@@ -418,6 +418,11 @@
|
||||
@@ -40,7 +40,7 @@ index d5f6992..c2a1e4f 100644
|
||||
/* OS(SOLARIS) - Solaris */
|
||||
#if defined(sun) || defined(__sun)
|
||||
#define WTF_OS_SOLARIS 1
|
||||
@@ -448,6 +453,7 @@
|
||||
@@ -452,6 +457,7 @@
|
||||
|| OS(HURD) \
|
||||
|| OS(INTEGRITY) \
|
||||
|| OS(LINUX) \
|
||||
@@ -49,10 +49,10 @@ index d5f6992..c2a1e4f 100644
|
||||
|| OS(OPENBSD) \
|
||||
|| OS(QNX) \
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From f4752625faaf74622f89062da0a02eb9519a8800 Mon Sep 17 00:00:00 2001
|
||||
From 9faf753ec2a2bbeaf1589eacefa42fe53b97f256 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:20 +1000
|
||||
Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
|
||||
@@ -84,10 +84,10 @@ index 105d10a..80932e9 100644
|
||||
deviceDir.setNameFilters(deviceFileNameFilterList);
|
||||
deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 3b00bdebb7c14547038b323a2babb779fa487b03 Mon Sep 17 00:00:00 2001
|
||||
From 046dfb7d983844ed34061a7a313c73233123f719 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
|
||||
@@ -95,10 +95,10 @@ Subject: Make sure libs are searched in the develop/ dir by CMake
|
||||
Static libs at least are not in the lib[/x86] dirs...
|
||||
|
||||
diff --git a/qtbase/mkspecs/features/create_cmake.prf b/qtbase/mkspecs/features/create_cmake.prf
|
||||
index 376a7de..e153a55 100644
|
||||
index 346fbf2..74ad489 100644
|
||||
--- a/qtbase/mkspecs/features/create_cmake.prf
|
||||
+++ b/qtbase/mkspecs/features/create_cmake.prf
|
||||
@@ -109,6 +109,9 @@ win32:!static:!staticlib {
|
||||
@@ -112,6 +112,9 @@ win32:!static:!staticlib {
|
||||
CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/
|
||||
CMAKE_DLL_DIR_IS_ABSOLUTE = True
|
||||
}
|
||||
@@ -109,17 +109,17 @@ index 376a7de..e153a55 100644
|
||||
CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
|
||||
CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From c0d5cec605b50cd7891ad5254cc0dcdfd6ddd0d0 Mon Sep 17 00:00:00 2001
|
||||
From 7a6a340de9f96fd30a30d0276ffe00eafb9f0ba4 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 11 Feb 2019 15:55:08 +1000
|
||||
Subject: Disable built-in haiku QPA plugin
|
||||
|
||||
|
||||
diff --git a/qtbase/src/plugins/platforms/platforms.pro b/qtbase/src/plugins/platforms/platforms.pro
|
||||
index acc55ad..a36c18e 100644
|
||||
index c4f2b30..408d05c 100644
|
||||
--- a/qtbase/src/plugins/platforms/platforms.pro
|
||||
+++ b/qtbase/src/plugins/platforms/platforms.pro
|
||||
@@ -42,10 +42,6 @@ freebsd {
|
||||
@@ -132,12 +132,12 @@ index acc55ad..a36c18e 100644
|
||||
-
|
||||
wasm: SUBDIRS += wasm
|
||||
|
||||
qtConfig(mirclient): SUBDIRS += mirclient
|
||||
qtConfig(integrityfb): SUBDIRS += integrity
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 626d40ce70a4adf92ca742d9d5c40706a1f4c601 Mon Sep 17 00:00:00 2001
|
||||
From 66bb86e7716e7da580ba9b0b8d001ebb0cd1e250 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 11 Feb 2019 15:55:38 +1000
|
||||
Subject: disable mapbox-gl-native on Haiku.
|
||||
@@ -157,10 +157,10 @@ index b81ad34..7b642c0 100644
|
||||
warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
|
||||
} else {
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From bc250710ce2440a53edd85f97c7c4d63ce1dc83d Mon Sep 17 00:00:00 2001
|
||||
From 3b5b9974d32908e3dec7fdea738396adf97a9571 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
|
||||
@@ -220,20 +220,20 @@ index 044d69f..1f255a9 100644
|
||||
case GenericConfigLocation:
|
||||
paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 77b8f96ef7c5fc2a9dc878d75856c51a054cb5fa Mon Sep 17 00:00:00 2001
|
||||
From cdb559d0fd25be878365a09dc25b7f41da20cd5c 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/qtbase/src/network/ssl/qsslsocket.cpp b/qtbase/src/network/ssl/qsslsocket.cpp
|
||||
index e164217..ad0317a 100644
|
||||
index e302aa1..d4a96ba 100644
|
||||
--- a/qtbase/src/network/ssl/qsslsocket.cpp
|
||||
+++ b/qtbase/src/network/ssl/qsslsocket.cpp
|
||||
@@ -2866,6 +2866,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
|
||||
@@ -2875,6 +2875,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
|
||||
<< "/usr/local/ssl/certs/" // Solaris
|
||||
<< "/etc/openssl/certs/" // BlackBerry
|
||||
<< "/opt/openssl/certs/" // HP-UX
|
||||
@@ -242,10 +242,10 @@ index e164217..ad0317a 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 8dc3120d2c66a4618ca67e4850c55bf92868afd3 Mon Sep 17 00:00:00 2001
|
||||
From a9f9fa580272224d81fb3e5a9d0b7c3070fd2008 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
|
||||
@@ -265,10 +265,10 @@ index 03612e5..866ad17 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.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 6ef4365e955bf55647a6743d7de6ad9a1a31cb58 Mon Sep 17 00:00:00 2001
|
||||
From b009ddf96fa235739d0446a24324d455d1de28a3 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 11 Feb 2019 15:57:25 +1000
|
||||
Subject: Fix build qt3d zip module
|
||||
@@ -288,17 +288,17 @@ index 2e4e223..6436df5 100644
|
||||
#include <utime.h>
|
||||
#endif
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From b026abbfbad05a429e2d3470aff91af3ac515b13 Mon Sep 17 00:00:00 2001
|
||||
From 502d66bc4bc8c985d25839bfb6f5c7ae1914f58d 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
|
||||
|
||||
|
||||
diff --git a/qtbase/src/3rdparty/sha3/brg_endian.h b/qtbase/src/3rdparty/sha3/brg_endian.h
|
||||
index 09d2a8b..49d74ae 100644
|
||||
index 9bb306e..9f0ea58 100644
|
||||
--- a/qtbase/src/3rdparty/sha3/brg_endian.h
|
||||
+++ b/qtbase/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
|
||||
@@ -309,26 +309,26 @@ index 09d2a8b..49d74ae 100644
|
||||
+#elif defined( __linux__ ) || defined( __HAIKU__ ) || defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
|
||||
# if !defined( __MINGW32__ ) && !defined( _AIX ) && !defined(Q_OS_QNX)
|
||||
# include <endian.h>
|
||||
-# if !defined( __BEOS__ )
|
||||
+# if !defined( __BEOS__ ) && !defined( __HAIKU__ )
|
||||
-# if !defined( __BEOS__ ) && !defined(Q_OS_RTEMS)
|
||||
+# if !defined( __BEOS__ ) && !defined( __HAIKU__ ) && !defined(Q_OS_RTEMS)
|
||||
# include <byteswap.h>
|
||||
# endif
|
||||
# endif
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 4ab4274b80b5323bb98b61f64741be3f3212556d Mon Sep 17 00:00:00 2001
|
||||
From 6c841a9856e0c5b25631b82f0e2afaea4cb6acb4 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 27 Apr 2019 17:47:23 +1000
|
||||
Subject: Add dnslookup query function for Haiku
|
||||
|
||||
|
||||
diff --git a/qtbase/src/network/kernel/kernel.pri b/qtbase/src/network/kernel/kernel.pri
|
||||
index 7074fcd..2ff1ab7 100644
|
||||
index 110d9f5..9c80595 100644
|
||||
--- a/qtbase/src/network/kernel/kernel.pri
|
||||
+++ b/qtbase/src/network/kernel/kernel.pri
|
||||
@@ -53,6 +53,11 @@ android:qtConfig(dnslookup) {
|
||||
@@ -54,6 +54,11 @@ android:qtConfig(dnslookup) {
|
||||
SOURCES += kernel/qdnslookup_android.cpp
|
||||
}
|
||||
|
||||
@@ -403,20 +403,20 @@ index 0000000..0b387df
|
||||
+
|
||||
+QT_END_NAMESPACE
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From b00f4824e6daca1335414e014a8a2696717ef298 Mon Sep 17 00:00:00 2001
|
||||
From 9b8e2a7d64a7f285df76f4a0bd7ba6855fe3e504 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 24 Jun 2019 21:20:17 +1000
|
||||
Subject: Disable LibResolv for Haiku
|
||||
|
||||
|
||||
diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||
index e4810d6..04f5fa7 100644
|
||||
index 78a05f8..cd93ca0 100644
|
||||
--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||
+++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp
|
||||
@@ -98,7 +98,7 @@ typedef void (*res_nclose_proto)(res_state_ptr);
|
||||
@@ -87,7 +87,7 @@ typedef void (*res_nclose_proto)(res_state_ptr);
|
||||
static res_nclose_proto local_res_nclose = 0;
|
||||
static res_state_ptr local_res = 0;
|
||||
|
||||
@@ -426,17 +426,17 @@ index e4810d6..04f5fa7 100644
|
||||
struct LibResolv
|
||||
{
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From f38ba1fc85dde4d5941fbf27813088e2839b3769 Mon Sep 17 00:00:00 2001
|
||||
From de33269cc3951365f6313d5aa9273a16570c6a65 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/qtbase/src/network/kernel/qnetworkinterface_unix.cpp b/qtbase/src/network/kernel/qnetworkinterface_unix.cpp
|
||||
index c28c5ea..ea07283 100644
|
||||
index 4c57bff..0c8e38f 100644
|
||||
--- a/qtbase/src/network/kernel/qnetworkinterface_unix.cpp
|
||||
+++ b/qtbase/src/network/kernel/qnetworkinterface_unix.cpp
|
||||
@@ -51,7 +51,7 @@
|
||||
@@ -449,17 +449,17 @@ index c28c5ea..ea07283 100644
|
||||
#endif
|
||||
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From a5b02fd5debeda09e032307e58d6a6f29351858d Mon Sep 17 00:00:00 2001
|
||||
From 603e6f9281ac458cee016cf8540880bf868607aa Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 8 Sep 2019 18:32:05 +1000
|
||||
Subject: Add platform plugins installer
|
||||
|
||||
|
||||
diff --git a/qtbase/src/gui/gui.pro b/qtbase/src/gui/gui.pro
|
||||
index edf8124..ad11511 100644
|
||||
index 45c8c05..8c101d4 100644
|
||||
--- a/qtbase/src/gui/gui.pro
|
||||
+++ b/qtbase/src/gui/gui.pro
|
||||
@@ -34,6 +34,7 @@ testcocoon {
|
||||
@@ -471,10 +471,10 @@ index edf8124..ad11511 100644
|
||||
CONFIG += simd optimize_full
|
||||
|
||||
diff --git a/qtbase/src/gui/kernel/qguiapplication.cpp b/qtbase/src/gui/kernel/qguiapplication.cpp
|
||||
index f6e67e0..79651ad 100644
|
||||
index 54f3996..bf37f28 100644
|
||||
--- a/qtbase/src/gui/kernel/qguiapplication.cpp
|
||||
+++ b/qtbase/src/gui/kernel/qguiapplication.cpp
|
||||
@@ -115,6 +115,11 @@
|
||||
@@ -116,6 +116,11 @@
|
||||
# include <QtCore/QLibraryInfo>
|
||||
#endif // Q_OS_WIN
|
||||
|
||||
@@ -486,7 +486,7 @@ index f6e67e0..79651ad 100644
|
||||
#ifdef Q_OS_WASM
|
||||
#include <emscripten.h>
|
||||
#endif
|
||||
@@ -1214,6 +1219,27 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString
|
||||
@@ -1219,6 +1224,27 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString
|
||||
if (!availablePlugins.isEmpty())
|
||||
fatalMessage += QStringLiteral("\nAvailable platform plugins are: %1.\n").arg(availablePlugins.join(QLatin1String(", ")));
|
||||
|
||||
@@ -515,5 +515,52 @@ index f6e67e0..79651ad 100644
|
||||
// Windows: Display message box unless it is a console application
|
||||
// or debug build showing an assert box.
|
||||
--
|
||||
2.23.0
|
||||
2.24.0
|
||||
|
||||
|
||||
From 8e4435b73ebe67a37a8a9e7be5eea431ee4df091 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 15 Dec 2019 11:27:19 +1000
|
||||
Subject: Enable assembler for JIT
|
||||
|
||||
|
||||
diff --git a/qtdeclarative/src/qml/jit/qv4assemblercommon_p.h b/qtdeclarative/src/qml/jit/qv4assemblercommon_p.h
|
||||
index b18d082..0c3bb81 100644
|
||||
--- a/qtdeclarative/src/qml/jit/qv4assemblercommon_p.h
|
||||
+++ b/qtdeclarative/src/qml/jit/qv4assemblercommon_p.h
|
||||
@@ -66,7 +66,7 @@ namespace QV4 {
|
||||
namespace JIT {
|
||||
|
||||
#if defined(Q_PROCESSOR_X86_64) || defined(ENABLE_ALL_ASSEMBLERS_FOR_REFACTORING_PURPOSES)
|
||||
-#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN)
|
||||
+#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_HAIKU)
|
||||
|
||||
class PlatformAssembler_X86_64_SysV : public JSC::MacroAssembler<JSC::MacroAssemblerX86_64>
|
||||
{
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
||||
From 9784f6961228120ca3cc29b37fa7ed0ae2f05340 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 15 Dec 2019 18:42:38 +1000
|
||||
Subject: Disable sharedmemory feature for bootstrap
|
||||
|
||||
|
||||
diff --git a/qtbase/src/tools/bootstrap/bootstrap.pro b/qtbase/src/tools/bootstrap/bootstrap.pro
|
||||
index 9863ff5..1bde486 100644
|
||||
--- a/qtbase/src/tools/bootstrap/bootstrap.pro
|
||||
+++ b/qtbase/src/tools/bootstrap/bootstrap.pro
|
||||
@@ -17,7 +17,8 @@ MODULE_CONFIG = gc_binaries
|
||||
DEFINES += \
|
||||
$$MODULE_DEFINES \
|
||||
QT_NO_FOREACH \
|
||||
- QT_NO_CAST_FROM_ASCII
|
||||
+ QT_NO_CAST_FROM_ASCII \
|
||||
+ QT_NO_SHAREDMEMORY
|
||||
|
||||
SOURCES += \
|
||||
../../corelib/codecs/qlatincodec.cpp \
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -8,9 +8,9 @@ COPYRIGHT="2015-2019 The Qt Company Ltd."
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU LGPL v3
|
||||
FDL"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/single/qt-everywhere-src-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08"
|
||||
CHECKSUM_SHA256="be9a77cd4e1f9d70b58621d0753be19ea498e6b0da0398753e5038426f76a8ba"
|
||||
SOURCE_DIR="qt-everywhere-src-$portVersion"
|
||||
PATCHES="qt5-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
@@ -61,7 +61,14 @@ PROVIDES="
|
||||
lib:libQt5DataVisualization$secondaryArchSuffix = $portVersion compat >= 5
|
||||
# qtdeclarative
|
||||
lib:libQt5Qml$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5QmlModels$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5QmlWorkerScript$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5Quick$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5Quick3D$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5Quick3DAssetImport$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5Quick3DRender$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5Quick3DRuntimeRender$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5Quick3DUtils$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5QuickControls2$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5QuickParticles$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5QuickShapes$secondaryArchSuffix = $portVersion compat >= 5
|
||||
@@ -192,7 +199,14 @@ PROVIDES_devel="
|
||||
devel:libQt5PacketProtocol$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Qml$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5QmlDebug$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5QmlModels$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5QmlWorkerScript$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Quick$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Quick3D$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Quick3DAssetImport$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Quick3DRender$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Quick3DRuntimeRender$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Quick3DUtils$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5QuickControls2$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5QuickParticles$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5QuickShapes$secondaryArchSuffix = $portVersion compat >= 5
|
||||
@@ -268,8 +282,10 @@ PROVIDES_devel="
|
||||
devel:libQt5ThemeSupport$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5UiTools$secondaryArchSuffix = $portVersion compat >= 5
|
||||
|
||||
cmd:balsam$secondaryArchSuffix = $portVersion compat >= 5
|
||||
cmd:canbusutil$secondaryArchSuffix = $portVersion compat >= 5
|
||||
cmd:fixqt4headers.pl$secondaryArchSuffix = $portVersion compat >= 5
|
||||
cmd:meshdebug$secondaryArchSuffix = $portVersion compat >= 5
|
||||
cmd:moc$secondaryArchSuffix = $portVersion compat >= 5
|
||||
cmd:qgltf$secondaryArchSuffix = $portVersion compat >= 5
|
||||
cmd:qlalr$secondaryArchSuffix = $portVersion compat >= 5
|
||||
@@ -444,6 +460,8 @@ BUILD()
|
||||
-release -opensource \
|
||||
-confirm-license -no-iconv \
|
||||
-no-rpath -system-sqlite \
|
||||
-no-feature-flite_alsa \
|
||||
-feature-ipc_posix \
|
||||
-gstreamer 1.0 \
|
||||
-strip
|
||||
make $jobArgs
|
||||
@@ -491,8 +509,10 @@ INSTALL()
|
||||
libQt5MultimediaGstTools libQt5MultimediaQuick libQt5MultimediaWidgets \
|
||||
libQt5Network libQt5NetworkAuth libQt5Nfc libQt5OpenGL \
|
||||
libQt5Positioning libQt5PositioningQuick libQt5PrintSupport libQt5Purchasing \
|
||||
libQt5Qml libQt5Quick libQt5QuickControls2 libQt5QuickParticles \
|
||||
libQt5QuickTemplates2 libQt5QuickTest libQt5QuickWidgets \
|
||||
libQt5Qml libQt5QmlModels libQt5QmlWorkerScript libQt5Quick \
|
||||
libQt5Quick3D libQt5Quick3DAssetImport libQt5Quick3DRender \
|
||||
libQt5Quick3DRuntimeRender libQt5Quick3DUtils libQt5QuickControls2 \
|
||||
libQt5QuickParticles libQt5QuickTemplates2 libQt5QuickTest libQt5QuickWidgets \
|
||||
libQt5RemoteObjects libQt5Script libQt5ScriptTools libQt5Scxml \
|
||||
libQt5Sensors libQt5SerialBus libQt5SerialPort libQt5Sql libQt5Svg \
|
||||
libQt5Test libQt5TextToSpeech libQt5WebChannel libQt5WebSockets \
|
||||
@@ -509,8 +529,8 @@ INSTALL()
|
||||
# fix mkspec for static libs
|
||||
grep -rl $dataDir/Qt5/mkspecs/modules/*.pri -e "staticlib" | xargs sed -i 's%$$QT_MODULE_LIB_BASE%'${developLibDir}'%g'
|
||||
|
||||
devCommands="canbusutil fixqt4headers.pl
|
||||
moc qgltf qlalr qmake qml qmlcachegen qmleasing qmlimportscanner
|
||||
devCommands="balsam canbusutil fixqt4headers.pl
|
||||
meshdebug moc qgltf qlalr qmake qml qmlcachegen qmleasing qmlimportscanner
|
||||
qmllint qmlmin qmlplugindump qmlpreview qmlprofiler qmlscene qmltestrunner
|
||||
qscxmlc qvkgen rcc repc syncqt.pl tracegen uic xmlpatterns xmlpatternsvalidator"
|
||||
for i in $devCommands; do
|
||||
Reference in New Issue
Block a user