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,53 +1,9 @@
|
||||
From e081a3b990f4fb3ea3bee907fc99c9e6f475b8e8 Mon Sep 17 00:00:00 2001
|
||||
From 3515207d5ae84131609c34a06953233bc4315ce0 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 16 Oct 2015 23:07:40 +1000
|
||||
Subject: Fix Haiku build
|
||||
|
||||
|
||||
diff --git a/qtbase/src/corelib/io/qstandardpaths_haiku.cpp b/qtbase/src/corelib/io/qstandardpaths_haiku.cpp
|
||||
index 044d69f..89653c1 100644
|
||||
--- a/qtbase/src/corelib/io/qstandardpaths_haiku.cpp
|
||||
+++ b/qtbase/src/corelib/io/qstandardpaths_haiku.cpp
|
||||
@@ -145,15 +145,15 @@ QString QStandardPaths::writableLocation(StandardLocation type)
|
||||
return haikuStandardPath(B_USER_NONPACKAGED_BIN_DIRECTORY);
|
||||
case TempLocation:
|
||||
return haikuStandardPath(B_SYSTEM_TEMP_DIRECTORY);
|
||||
- case AppDataLocation: // fall through
|
||||
- case AppLocalDataLocation:
|
||||
- return haikuAppStandardPath(B_USER_NONPACKAGED_DATA_DIRECTORY);
|
||||
- case GenericDataLocation:
|
||||
- return haikuStandardPath(B_USER_NONPACKAGED_DATA_DIRECTORY);
|
||||
+// case AppDataLocation: // fall through
|
||||
+// case AppLocalDataLocation:
|
||||
+// return haikuAppStandardPath(B_USER_NONPACKAGED_DATA_DIRECTORY);
|
||||
+// case GenericDataLocation:
|
||||
+// return haikuStandardPath(B_USER_NONPACKAGED_DATA_DIRECTORY);
|
||||
case CacheLocation:
|
||||
return haikuAppStandardPath(B_USER_CACHE_DIRECTORY);
|
||||
case GenericCacheLocation:
|
||||
- return haikuStandardPath(B_USER_CACHE_DIRECTORY);
|
||||
+ return haikuStandardPath(B_SYSTEM_CACHE_DIRECTORY);
|
||||
case ConfigLocation: // fall through
|
||||
case AppConfigLocation:
|
||||
return haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY);
|
||||
@@ -179,7 +179,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
|
||||
case MoviesLocation:
|
||||
case DownloadLocation:
|
||||
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)
|
||||
break;
|
||||
case ConfigLocation: // fall through
|
||||
case AppConfigLocation:
|
||||
- paths += haikuAppStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
|
||||
+ paths += haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY);
|
||||
break;
|
||||
case GenericConfigLocation:
|
||||
paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
|
||||
diff --git a/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc
|
||||
index ea9b827..928e949 100644
|
||||
--- a/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc
|
||||
@@ -106,7 +62,7 @@ index 7f2023a..4b3d202 100644
|
||||
2.13.1
|
||||
|
||||
|
||||
From 477ecc53c96ed8cb39fa571607805ea853396845 Mon Sep 17 00:00:00 2001
|
||||
From 56d29c87119c0b67f6b44f8741cfda7d5fdeb49b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Mon, 11 Apr 2016 01:04:24 +0200
|
||||
Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/*
|
||||
@@ -141,7 +97,7 @@ index 0f62a9d..afd5c0b 100644
|
||||
2.13.1
|
||||
|
||||
|
||||
From 36c2479cded1d7d08ef16e1f963144a97adb17ca Mon Sep 17 00:00:00 2001
|
||||
From 4406a869ef26839ecd5df0ef61d748a3a4336f24 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sat, 12 Nov 2016 03:19:40 +0100
|
||||
Subject: Make sure libs are searched in the develop/ dir by CMake
|
||||
@@ -166,7 +122,7 @@ index bb5083c..b286bed 100644
|
||||
2.13.1
|
||||
|
||||
|
||||
From 97bb3755d60843402b08a3c6baf7cb4ff3709f09 Mon Sep 17 00:00:00 2001
|
||||
From c28ebe137e4965c64f089951722d9f87112e568a Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 4 Mar 2017 10:41:09 +0100
|
||||
Subject: Haiku also provides bluetooth/bluetooth.h, so check for Bluez a bit
|
||||
@@ -188,7 +144,7 @@ index 0b9235a..bfc2a0c 100644
|
||||
2.13.1
|
||||
|
||||
|
||||
From ccec6c6e59c6d8b59715e2cb0ae00907af996fe2 Mon Sep 17 00:00:00 2001
|
||||
From fa7ffbd94dff7191ad7b6280a13774dd34251a53 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 23 Mar 2017 21:08:37 +0100
|
||||
Subject: enable QV4 JIT.
|
||||
@@ -246,30 +202,7 @@ index 3abda68..0eef251 100644
|
||||
2.13.1
|
||||
|
||||
|
||||
From ab0694f98021022c01672aa7f217885cfa0ac3ee Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 10 Apr 2017 19:52:46 +0200
|
||||
Subject: disable mapbox-gl-native on Haiku.
|
||||
|
||||
|
||||
diff --git a/qtlocation/src/plugins/geoservices/geoservices.pro b/qtlocation/src/plugins/geoservices/geoservices.pro
|
||||
index 459897a..6d19b96 100644
|
||||
--- a/qtlocation/src/plugins/geoservices/geoservices.pro
|
||||
+++ b/qtlocation/src/plugins/geoservices/geoservices.pro
|
||||
@@ -6,7 +6,7 @@ qtConfig(concurrent) {
|
||||
SUBDIRS += osm
|
||||
}
|
||||
|
||||
-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
|
||||
+qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx:!haiku {
|
||||
!exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
|
||||
warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
|
||||
} else {
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
||||
From 32d934ef8ebdf2a8a00ac1d111a34161bbc5b5db Mon Sep 17 00:00:00 2001
|
||||
From c8e7181d6bafdac6c1cfcb7afd6593b0efdf27f0 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 31 May 2017 20:58:35 +0200
|
||||
Subject: fix build in tiff imageformats plugin.
|
||||
@@ -295,7 +228,7 @@ index 81ad7e9..8f3d3e4 100644
|
||||
2.13.1
|
||||
|
||||
|
||||
From 92e8b216cbc9d3d5f187a9ba2a03e95fe6db02a6 Mon Sep 17 00:00:00 2001
|
||||
From 4af5ebdbcb027e0622fc119245e0e3298e4004c8 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 31 May 2017 21:59:22 +0200
|
||||
Subject: fix qt3d build on x86.
|
||||
@@ -327,17 +260,17 @@ index 98053cb..57ca638 100644
|
||||
2.13.1
|
||||
|
||||
|
||||
From 4057c46bec20109b45c457a0950390d0eea278bc Mon Sep 17 00:00:00 2001
|
||||
From eac8fbf6e07763797a8d08d9160d722b50eb7af1 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 9 Jun 2017 19:47:02 +0200
|
||||
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 84b8f3a..62b63ab 100644
|
||||
index 9d11506..16be997 100644
|
||||
--- a/qtbase/src/network/ssl/qsslsocket.cpp
|
||||
+++ b/qtbase/src/network/ssl/qsslsocket.cpp
|
||||
@@ -2658,6 +2658,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
|
||||
@@ -2670,6 +2670,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
|
||||
<< "/usr/local/ssl/certs/" // Solaris
|
||||
<< "/etc/openssl/certs/" // BlackBerry
|
||||
<< "/opt/openssl/certs/" // HP-UX
|
||||
@@ -349,7 +282,7 @@ index 84b8f3a..62b63ab 100644
|
||||
2.13.1
|
||||
|
||||
|
||||
From 420523bcdd2781cee26b12da4eeeb7ceedabbf00 Mon Sep 17 00:00:00 2001
|
||||
From 3d43557d7986828feb01f74967aeb0fbd40daaa7 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 16 Jul 2017 21:55:25 +1000
|
||||
Subject: Disable built-in haiku QPA plugin
|
||||
@@ -373,3 +306,121 @@ index 9ccc2b5..9e404e2 100644
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
||||
From 72f5ad38cbfd067145ee063824fb69308c58d5e7 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 9 Oct 2017 22:57:10 +1000
|
||||
Subject: disable mapbox-gl-native on Haiku.
|
||||
|
||||
|
||||
diff --git a/qtlocation/src/plugins/geoservices/geoservices.pro b/qtlocation/src/plugins/geoservices/geoservices.pro
|
||||
index b81ad34..7b642c0 100644
|
||||
--- a/qtlocation/src/plugins/geoservices/geoservices.pro
|
||||
+++ b/qtlocation/src/plugins/geoservices/geoservices.pro
|
||||
@@ -8,7 +8,7 @@ qtConfig(geoservices_esri): SUBDIRS += esri
|
||||
qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay
|
||||
qtConfig(geoservices_osm): SUBDIRS += osm
|
||||
|
||||
-qtConfig(geoservices_mapboxgl) {
|
||||
+qtConfig(geoservices_mapboxgl):!haiku {
|
||||
!exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) {
|
||||
warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
|
||||
} else {
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
||||
From bdd776d33994af83530b31ef8a735b9f00bfd0f7 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 9 Oct 2017 22:58:38 +1000
|
||||
Subject: Fix QStandartPaths for Haiku
|
||||
|
||||
|
||||
diff --git a/qtbase/src/corelib/io/qstandardpaths_haiku.cpp b/qtbase/src/corelib/io/qstandardpaths_haiku.cpp
|
||||
index 044d69f..1f255a9 100644
|
||||
--- a/qtbase/src/corelib/io/qstandardpaths_haiku.cpp
|
||||
+++ b/qtbase/src/corelib/io/qstandardpaths_haiku.cpp
|
||||
@@ -145,22 +145,22 @@ QString QStandardPaths::writableLocation(StandardLocation type)
|
||||
return haikuStandardPath(B_USER_NONPACKAGED_BIN_DIRECTORY);
|
||||
case TempLocation:
|
||||
return haikuStandardPath(B_SYSTEM_TEMP_DIRECTORY);
|
||||
- case AppDataLocation: // fall through
|
||||
+ case AppDataLocation:
|
||||
+ return haikuAppStandardPath(B_SYSTEM_CACHE_DIRECTORY);
|
||||
case AppLocalDataLocation:
|
||||
- return haikuAppStandardPath(B_USER_NONPACKAGED_DATA_DIRECTORY);
|
||||
+ return haikuAppStandardPath(B_USER_CACHE_DIRECTORY);
|
||||
case GenericDataLocation:
|
||||
- return haikuStandardPath(B_USER_NONPACKAGED_DATA_DIRECTORY);
|
||||
+ return haikuAppStandardPath(B_SYSTEM_CACHE_DIRECTORY);
|
||||
case CacheLocation:
|
||||
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 AppConfigLocation:
|
||||
- return haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY);
|
||||
case GenericConfigLocation:
|
||||
- return haikuStandardPath(B_USER_SETTINGS_DIRECTORY);
|
||||
+ return haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY);
|
||||
default:
|
||||
- return QString();
|
||||
+ return haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
|
||||
case MoviesLocation:
|
||||
case DownloadLocation:
|
||||
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)
|
||||
break;
|
||||
case ConfigLocation: // fall through
|
||||
case AppConfigLocation:
|
||||
- paths += haikuAppStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
|
||||
+ paths += haikuAppStandardPath(B_USER_SETTINGS_DIRECTORY);
|
||||
break;
|
||||
case GenericConfigLocation:
|
||||
paths += haikuStandardPath(B_SYSTEM_SETTINGS_DIRECTORY);
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
||||
From 35d82fbd54ecedfaea63fc44b42057d7104ffc35 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 9 Oct 2017 22:59:21 +1000
|
||||
Subject: Fix build for Haiku platform
|
||||
|
||||
|
||||
diff --git a/qtbase/mkspecs/features/toolchain.prf b/qtbase/mkspecs/features/toolchain.prf
|
||||
index 35175f1..f8cffb5 100644
|
||||
--- a/qtbase/mkspecs/features/toolchain.prf
|
||||
+++ b/qtbase/mkspecs/features/toolchain.prf
|
||||
@@ -120,7 +120,7 @@ isEmpty($${target_prefix}.INCDIRS) {
|
||||
}
|
||||
}
|
||||
}
|
||||
- !darwin:clang {
|
||||
+ if(!darwin:clang)|haiku {
|
||||
# Clang on a non-Apple system (that is, a system without ld64 -- say, with GNU ld
|
||||
# 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
|
||||
@@ -205,7 +205,7 @@ isEmpty($${target_prefix}.COMPILER_MACROS) {
|
||||
vars = $$qtVariablesFromGCC($$QMAKE_CXX)
|
||||
}
|
||||
for (v, vars) {
|
||||
- isEmpty(v)|contains(v, $${LITERAL_HASH}.*): next()
|
||||
+ contains(v, $${LITERAL_HASH}.*)|contains(v, " *"): next()
|
||||
# Set both <varname> for the outer scope ...
|
||||
eval($$v)
|
||||
v ~= s/ .*//
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@@ -7,9 +7,9 @@ HOMEPAGE="https://qt.io/"
|
||||
COPYRIGHT="2015-2017 The Qt Company Ltd."
|
||||
LICENSE="GNU LGPL v2.1
|
||||
GNU LGPL v3"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://download.qt.io/official_releases/qt/5.9/${portVersion/\~/-}/single/qt-everywhere-opensource-src-${portVersion/\~/-}.tar.xz"
|
||||
CHECKSUM_SHA256="7b41a37d4fe5e120cdb7114862c0153f86c07abbec8db71500443d2ce0c89795"
|
||||
CHECKSUM_SHA256="6c6171a4d1ea3fbd4212d6a04899650218583df3ec583a8a6a4a589fe18620ff"
|
||||
SOURCE_DIR="qt-everywhere-opensource-src-${portVersion/\~/-}"
|
||||
PATCHES="qt5-$portVersion.patchset"
|
||||
|
||||
Reference in New Issue
Block a user