mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
qt5: bump 5.9 to beta.
This commit is contained in:
Jerome Duval
@@ -1,4 +1,4 @@
|
||||
From 1380344eb7a044eeb63ed6d00e62e034e85721da Mon Sep 17 00:00:00 2001
|
||||
From 92766a2b6526675d7e7f9610ad39226131444c66 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
|
||||
@@ -103,10 +103,10 @@ index 7f2023a..4b3d202 100644
|
||||
|| OS(OPENBSD) \
|
||||
|| OS(QNX) \
|
||||
--
|
||||
2.10.2
|
||||
2.11.0
|
||||
|
||||
|
||||
From 68de70206bea81d095798772839b8da0aa1224dd Mon Sep 17 00:00:00 2001
|
||||
From c520bf845f89e3ade6aa6889ea21355ef02cd850 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 16 Oct 2015 23:07:40 +1000
|
||||
Subject: Set Experimental Haiku QPA plugin
|
||||
@@ -5085,10 +5085,10 @@ index 75403fb..d540219 100644
|
||||
|
||||
QT_END_NAMESPACE
|
||||
--
|
||||
2.10.2
|
||||
2.11.0
|
||||
|
||||
|
||||
From 7e286f4ec1e468b28412e7bcd1894b96faf12331 Mon Sep 17 00:00:00 2001
|
||||
From 310ce7aa799cc521f10de6382595f2e96a72fd6b 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/*
|
||||
@@ -5120,10 +5120,10 @@ index 0f62a9d..afd5c0b 100644
|
||||
deviceDir.setNameFilters(deviceFileNameFilterList);
|
||||
deviceDir.setFilter(QDir::Files | QDir::System | QDir::NoSymLinks);
|
||||
--
|
||||
2.10.2
|
||||
2.11.0
|
||||
|
||||
|
||||
From 4bacdf4805a72d85348492f65d894fcabefbb735 Mon Sep 17 00:00:00 2001
|
||||
From dfdd1b9dc97eb968142b1d288ea57cb9d21c73d0 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
|
||||
@@ -5145,10 +5145,10 @@ index bb5083c..b286bed 100644
|
||||
CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
|
||||
CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
--
|
||||
2.10.2
|
||||
2.11.0
|
||||
|
||||
|
||||
From 0621b1a2ba15a006a315b1f4f6f6ff31e8d40d61 Mon Sep 17 00:00:00 2001
|
||||
From ddfadb51b4dd0c5d52b89467c0eca35ffb3fa265 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 4 Mar 2017 10:39:18 +0100
|
||||
Subject: Haiku PlatformSupport changes.
|
||||
@@ -5269,10 +5269,10 @@ index dba27ee..0af18a6 100644
|
||||
|
||||
private:
|
||||
--
|
||||
2.10.2
|
||||
2.11.0
|
||||
|
||||
|
||||
From 95062855d9186fa7a23757d87d1939a7c47dd9fa Mon Sep 17 00:00:00 2001
|
||||
From 687237d948cc5e170019823549e7e337a8049744 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
|
||||
@@ -5291,35 +5291,10 @@ index 0b9235a..bfc2a0c 100644
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.10.2
|
||||
2.11.0
|
||||
|
||||
|
||||
From 2f04560b8206c27beefc257deb0c11b5d47bf8d7 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Tue, 7 Mar 2017 22:11:02 +0100
|
||||
Subject: createDirectory should handle EROFS on Haiku.
|
||||
|
||||
|
||||
diff --git a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
index 40eadfb..07fbab2 100644
|
||||
--- a/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
+++ b/qtbase/src/corelib/io/qfilesystemengine_unix.cpp
|
||||
@@ -576,6 +576,10 @@ bool QFileSystemEngine::createDirectory(const QFileSystemEntry &entry, bool crea
|
||||
// on the QNet mountpoint returns successfully and reports S_IFDIR.
|
||||
|| errno == ENOENT
|
||||
#endif
|
||||
+#if defined(Q_OS_HAIKU)
|
||||
+ // On Haiku some shine-through directories (ie "non-packaged") returns EROFS.
|
||||
+ || errno == EROFS
|
||||
+#endif
|
||||
) {
|
||||
QT_STATBUF st;
|
||||
if (QT_STAT(chunk.constData(), &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR)
|
||||
--
|
||||
2.10.2
|
||||
|
||||
|
||||
From b5ef4d29c35c5fc50bf7455ee57cb8b8369b5f1d Mon Sep 17 00:00:00 2001
|
||||
From 5f3c631ef5fdb8351ab04f1ccbe0028a8e67a6d1 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 9 Mar 2017 23:57:24 +0100
|
||||
Subject: update to QtFontDatabaseSupport.
|
||||
@@ -5339,20 +5314,20 @@ index 0b5d24c..6c29d98 100644
|
||||
#include "qhaikuplatformfontdatabase.h"
|
||||
|
||||
--
|
||||
2.10.2
|
||||
2.11.0
|
||||
|
||||
|
||||
From 10f8fcf09559fe091dbdcf5a53124717729fe6c0 Mon Sep 17 00:00:00 2001
|
||||
From 43a03a0f3b00937d1593c8ec7a8912cfc6748e62 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.
|
||||
|
||||
|
||||
diff --git a/qtdeclarative/src/qml/jit/qv4targetplatform_p.h b/qtdeclarative/src/qml/jit/qv4targetplatform_p.h
|
||||
index fcc600e..dee0037 100644
|
||||
index ce61568..f26b56e 100644
|
||||
--- a/qtdeclarative/src/qml/jit/qv4targetplatform_p.h
|
||||
+++ b/qtdeclarative/src/qml/jit/qv4targetplatform_p.h
|
||||
@@ -89,7 +89,7 @@ class TargetPlatform
|
||||
@@ -90,7 +90,7 @@ class TargetPlatform
|
||||
{
|
||||
};
|
||||
|
||||
@@ -5361,7 +5336,7 @@ index fcc600e..dee0037 100644
|
||||
template <>
|
||||
class TargetPlatform<JSC::MacroAssemblerX86, NoOperatingSystemSpecialization>
|
||||
{
|
||||
@@ -148,7 +148,7 @@ public:
|
||||
@@ -150,7 +150,7 @@ public:
|
||||
}
|
||||
|
||||
#if OS(WINDOWS) || OS(QNX) || \
|
||||
@@ -5370,7 +5345,7 @@ index fcc600e..dee0037 100644
|
||||
|
||||
static const int gotRegister = JSC::X86Registers::ebx;
|
||||
static int savedGOTRegisterSlotOnStack() {
|
||||
@@ -176,7 +176,7 @@ public:
|
||||
@@ -178,7 +178,7 @@ public:
|
||||
};
|
||||
#endif // x86
|
||||
|
||||
@@ -5380,10 +5355,10 @@ index fcc600e..dee0037 100644
|
||||
class TargetPlatform<JSC::MacroAssemblerX86_64, NoOperatingSystemSpecialization>
|
||||
{
|
||||
diff --git a/qtdeclarative/src/qml/jsruntime/qv4global_p.h b/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
||||
index 66861bf..723cf6b 100644
|
||||
index c2a5e75..c110077 100644
|
||||
--- a/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
||||
+++ b/qtdeclarative/src/qml/jsruntime/qv4global_p.h
|
||||
@@ -98,10 +98,10 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
|
||||
@@ -96,10 +96,10 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
|
||||
// NOTE: This should match the logic in qv4targetplatform_p.h!
|
||||
|
||||
#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) \
|
||||
@@ -5397,5 +5372,28 @@ index 66861bf..723cf6b 100644
|
||||
#elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4)
|
||||
# if defined(thumb2) || defined(__thumb2__) || ((defined(__thumb) || defined(__thumb__)) && __TARGET_ARCH_THUMB-0 == 4)
|
||||
--
|
||||
2.10.2
|
||||
2.11.0
|
||||
|
||||
|
||||
From f3341464857458f28981309fce42f219646dda57 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 ffcb5d1..0835589 100644
|
||||
--- a/qtlocation/src/plugins/geoservices/geoservices.pro
|
||||
+++ b/qtlocation/src/plugins/geoservices/geoservices.pro
|
||||
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
|
||||
|
||||
SUBDIRS = nokia osm mapbox esri itemsoverlay
|
||||
|
||||
-qtConfig(c++14):!win32:!qnx {
|
||||
+qtConfig(c++14):!win32:!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.11.0
|
||||
|
||||
@@ -10,8 +10,8 @@ LICENSE="GNU LGPL v2.1
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://download.qt.io/development_releases/qt/5.9/${portVersion/\~/-}/single/qt-everywhere-opensource-src-${portVersion/\~/-}.tar.xz"
|
||||
SOURCE_URI_2="http://download.qt.io/community_releases/5.9/${portVersion/\~/-}/qtwebkit-opensource-src-${portVersion/\~/-}.tar.xz"
|
||||
CHECKSUM_SHA256="414365935ad03df142ee7a069a50a267dce0a47dc5bb2c4c7f50b4b67a592fd8"
|
||||
CHECKSUM_SHA256_2="6567b14a4ad71501d4a4b0288a12a318a9699ecd24ab52a3262c91221320ab0f"
|
||||
CHECKSUM_SHA256="d7c4b08f96ac099353184fb30753b8e7a82540d99df8a5e1f7b3b4e2b289c08b"
|
||||
CHECKSUM_SHA256_2="1eeec0431312cf8382e33661664101af1c4112d9d35f62cca13ac3f291350e8c"
|
||||
SOURCE_DIR="qt-everywhere-opensource-src-${portVersion/\~/-}"
|
||||
SOURCE_DIR_2="qtwebkit-opensource-src-${portVersion/\~/-}"
|
||||
PATCHES="qt5-$portVersion.patchset"
|
||||
@@ -54,6 +54,7 @@ PROVIDES="
|
||||
lib:libQt53DQuickExtras$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt53DQuickInput$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt53DQuickRender$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt53DQuickScene2D$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt53DRender$secondaryArchSuffix = $portVersion compat >= 5
|
||||
# qtcharts
|
||||
lib:libQt5Charts$secondaryArchSuffix = $portVersion compat >= 5
|
||||
@@ -100,7 +101,6 @@ PROVIDES="
|
||||
# qtsvg
|
||||
lib:libQt5Svg$secondaryArchSuffix = $portVersion compat >= 5
|
||||
# qttools
|
||||
lib:libQt5CLucene$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5Help$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5Designer$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libQt5DesignerComponents$secondaryArchSuffix = $portVersion compat >= 5
|
||||
@@ -163,6 +163,7 @@ PROVIDES_devel="
|
||||
devel:libQt53DQuickExtras$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt53DQuickInput$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt53DQuickRender$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt53DQuickScene2D$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt53DRender$secondaryArchSuffix = $portVersion compat >= 5
|
||||
# qtcharts
|
||||
devel:libQt5Charts$secondaryArchSuffix = $portVersion compat >= 5
|
||||
@@ -214,7 +215,6 @@ PROVIDES_devel="
|
||||
# qtsvg
|
||||
devel:libQt5Svg$secondaryArchSuffix = $portVersion compat >= 5
|
||||
# qttools
|
||||
devel:libQt5CLucene$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Designer$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5DesignerComponents$secondaryArchSuffix = $portVersion compat >= 5
|
||||
devel:libQt5Help$secondaryArchSuffix = $portVersion compat >= 5
|
||||
@@ -395,11 +395,11 @@ INSTALL()
|
||||
libQt5Qml libQt5Positioning libQt5Nfc libQt5Gamepad \
|
||||
libQt5MultimediaWidgets libQt5MultimediaQuick_p libQt5Multimedia \
|
||||
libQt5Location libQt5Help libQt5Designer libQt5DesignerComponents \
|
||||
libQt5CLucene libQt5Bluetooth libQt5TextToSpeech \
|
||||
libQt5Bluetooth libQt5TextToSpeech \
|
||||
libQt5Charts libQt5DataVisualization libQt53DQuickInput \
|
||||
libQt53DQuickExtras libQt53DExtras \
|
||||
libQt53DQuick libQt53DLogic libQt53DInput libQt53DCore \
|
||||
libQt53DQuickRender libQt53DRender libQt5PacketProtocol \
|
||||
libQt53DQuickRender libQt53DRender libQt53DQuickScene2D libQt5PacketProtocol \
|
||||
libQt5QmlDebug libQt5Scxml libQt5Purchasing libQt5AccessibilitySupport \
|
||||
libQt5DeviceDiscoverySupport libQt5EventDispatcherSupport \
|
||||
libQt5FbSupport libQt5FontDatabaseSupport \
|
||||
Reference in New Issue
Block a user