From ee16c39f47deb13fdb0ca086dfe3c97b59d47738 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 31 May 2017 22:33:10 +0200 Subject: [PATCH] qt5: bump 5.9 to beta4. --- ...eta3.patchset => qt5-5.9.0~beta4.patchset} | 88 +++++++++++++++---- ...patchset => qtwebkit-5.9.0~beta4.patchset} | 0 ....0~beta3.recipe => qt5-5.9.0~beta4.recipe} | 12 ++- 3 files changed, 78 insertions(+), 22 deletions(-) rename dev-qt/qt5/patches/{qt5-5.9.0~beta3.patchset => qt5-5.9.0~beta4.patchset} (98%) rename dev-qt/qt5/patches/{qtwebkit-5.9.0~beta3.patchset => qtwebkit-5.9.0~beta4.patchset} (100%) rename dev-qt/qt5/{qt5-5.9.0~beta3.recipe => qt5-5.9.0~beta4.recipe} (97%) diff --git a/dev-qt/qt5/patches/qt5-5.9.0~beta3.patchset b/dev-qt/qt5/patches/qt5-5.9.0~beta4.patchset similarity index 98% rename from dev-qt/qt5/patches/qt5-5.9.0~beta3.patchset rename to dev-qt/qt5/patches/qt5-5.9.0~beta4.patchset index a48a02ba3..889053655 100644 --- a/dev-qt/qt5/patches/qt5-5.9.0~beta3.patchset +++ b/dev-qt/qt5/patches/qt5-5.9.0~beta4.patchset @@ -1,4 +1,4 @@ -From b8542db38b155abb644870d473a86f853a2240d2 Mon Sep 17 00:00:00 2001 +From feb6dd5c8c20120ab691e60cd81f0fa0e4b530c7 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 @@ -106,7 +106,7 @@ index 7f2023a..4b3d202 100644 2.12.2 -From e2e75e20c3e9620dce569604feb278eb0ad5f5e7 Mon Sep 17 00:00:00 2001 +From 7ff32683491da4eb5a045184d6f4c1733bf741de 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 @@ -5088,7 +5088,7 @@ index 75403fb..d540219 100644 2.12.2 -From 62ce0e44756488c61b07ad95af64eaaa1073469e Mon Sep 17 00:00:00 2001 +From 2f1ee3642221be0a656169b40b904f8bab0133c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 11 Apr 2016 01:04:24 +0200 Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/* @@ -5123,7 +5123,7 @@ index 0f62a9d..afd5c0b 100644 2.12.2 -From 80dff523b5b418fa4dbc5f894277881fd28ce352 Mon Sep 17 00:00:00 2001 +From edeaebe279864a8793fd725aa822349fe0ed6e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 12 Nov 2016 03:19:40 +0100 Subject: Make sure libs are searched in the develop/ dir by CMake @@ -5148,7 +5148,7 @@ index bb5083c..b286bed 100644 2.12.2 -From 1c3bab9446fe088ef13c15392869554ba1f71ead Mon Sep 17 00:00:00 2001 +From 9c5f98d8caadc3ac92909bca772351ebc2cfbb30 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 4 Mar 2017 10:39:18 +0100 Subject: Haiku PlatformSupport changes. @@ -5272,7 +5272,7 @@ index dba27ee..0af18a6 100644 2.12.2 -From aafa2ce69ddd8cfea53c791bf488816cd447dedb Mon Sep 17 00:00:00 2001 +From 7865acafd10b1fd7813ea67a8f4c00341644f65e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 4 Mar 2017 10:41:09 +0100 Subject: Haiku also provides bluetooth/bluetooth.h, so check for Bluez a bit @@ -5294,7 +5294,7 @@ index 0b9235a..bfc2a0c 100644 2.12.2 -From fd79a25d8fd576b6bc0c231b8932f5d6f923a915 Mon Sep 17 00:00:00 2001 +From a9efc4f4b705a1d7c489f8fd495522d3bff5dd79 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 9 Mar 2017 23:57:24 +0100 Subject: update to QtFontDatabaseSupport. @@ -5317,7 +5317,7 @@ index 0b5d24c..6c29d98 100644 2.12.2 -From ee83a8e94232e4725222902f18e213339e17f273 Mon Sep 17 00:00:00 2001 +From e10e621b3535641268aa6eb2b06528b1a946ed9c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 23 Mar 2017 21:08:37 +0100 Subject: enable QV4 JIT. @@ -5355,10 +5355,10 @@ index 6d788f4..c4c47ea 100644 class TargetPlatform { diff --git a/qtdeclarative/src/qml/jsruntime/qv4global_p.h b/qtdeclarative/src/qml/jsruntime/qv4global_p.h -index c2a5e75..c110077 100644 +index 3abda68..0eef251 100644 --- a/qtdeclarative/src/qml/jsruntime/qv4global_p.h +++ b/qtdeclarative/src/qml/jsruntime/qv4global_p.h -@@ -96,10 +96,10 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } +@@ -92,10 +92,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) \ @@ -5375,22 +5375,22 @@ index c2a5e75..c110077 100644 2.12.2 -From 97f9db7b51549ab410ccd7b73f0516d5e3346efb Mon Sep 17 00:00:00 2001 +From 395380b9d5071f4509c6c1baada9b060a9ed28e3 Mon Sep 17 00:00:00 2001 From: Jerome Duval 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 a0d2932..32eec80 100644 +index 0810d39..9933bf8 100644 --- a/qtlocation/src/plugins/geoservices/geoservices.pro +++ b/qtlocation/src/plugins/geoservices/geoservices.pro @@ -6,7 +6,7 @@ qtConfig(concurrent) { SUBDIRS += osm } --qtConfig(c++14):!win32:!qnx { -+qtConfig(c++14):!win32:!qnx:!haiku { +-qtConfig(c++14):!win32|mingw:!qnx { ++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 { @@ -5398,7 +5398,7 @@ index a0d2932..32eec80 100644 2.12.2 -From 6a9435bd151352a86f9e84094a0c9e11fcff23a4 Mon Sep 17 00:00:00 2001 +From b07e4ee2a7a8d651a6001b3e971d238cecbe1c31 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 22 Apr 2017 13:10:20 +0200 Subject: Rename QBasicFontDatabase to QFreeTypeFontDatabase. @@ -5447,3 +5447,61 @@ index 2d27d06..f79f087 100644 -- 2.12.2 + +From 6eb430f6076019d2267763a158c11bd8a3a912e4 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 31 May 2017 20:58:35 +0200 +Subject: fix build in tiff imageformats plugin. + +tip from 3deyes! + +diff --git a/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp b/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp +index 81ad7e9..8f3d3e4 100644 +--- a/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp ++++ b/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp +@@ -335,8 +335,8 @@ bool QTiffHandler::read(QImage *image) + } + + TIFF *const tiff = d->tiff; +- const uint32 width = d->size.width(); +- const uint32 height = d->size.height(); ++ const quint32 width = d->size.width(); ++ const quint32 height = d->size.height(); + + if (format == QImage::Format_Mono || format == QImage::Format_Indexed8 || format == QImage::Format_Grayscale8) { + if (format == QImage::Format_Mono) { +-- +2.12.2 + + +From 3edfbdb1e153e610395c9bcca84d96467ae54614 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 31 May 2017 21:59:22 +0200 +Subject: fix qt3d build on x86. + + +diff --git a/qt3d/src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/document.h b/qt3d/src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/document.h +index 98053cb..57ca638 100644 +--- a/qt3d/src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/document.h ++++ b/qt3d/src/3rdparty/assimp/contrib/rapidjson/include/rapidjson/document.h +@@ -545,7 +545,8 @@ public: + flags_ |= kIntFlag; + } + +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__HAIKU__) ++#if !defined(__HAIKU__) + //! Constructor for unsigned long value. + explicit GenericValue(unsigned long u64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUint64Flag) { + data_.n.u64 = u64; +@@ -556,6 +557,7 @@ public: + if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000))) + flags_ |= kIntFlag; + } ++#endif + + #if !defined(__x86_64__) && !defined(__arm64__) + //! Constructor for size_t value. +-- +2.12.2 + diff --git a/dev-qt/qt5/patches/qtwebkit-5.9.0~beta3.patchset b/dev-qt/qt5/patches/qtwebkit-5.9.0~beta4.patchset similarity index 100% rename from dev-qt/qt5/patches/qtwebkit-5.9.0~beta3.patchset rename to dev-qt/qt5/patches/qtwebkit-5.9.0~beta4.patchset diff --git a/dev-qt/qt5/qt5-5.9.0~beta3.recipe b/dev-qt/qt5/qt5-5.9.0~beta4.recipe similarity index 97% rename from dev-qt/qt5/qt5-5.9.0~beta3.recipe rename to dev-qt/qt5/qt5-5.9.0~beta4.recipe index be50e5443..77012d3f2 100644 --- a/dev-qt/qt5/qt5-5.9.0~beta3.recipe +++ b/dev-qt/qt5/qt5-5.9.0~beta4.recipe @@ -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="dfebc206eb4f15d34f8700af6dfbf87f164861018cba77e8ca6adfaf1c5814f9" -CHECKSUM_SHA256_2="5f69a6a4f89a9da31b51875033870a2113d99a802d36f7eeb7e97ee161e00a4c" +CHECKSUM_SHA256="29216afec34a0f8302b3b5cb7e610666d713071bf226951e5d335a005305ba9e" +CHECKSUM_SHA256_2="a36746406c9624f1bd7f66fc3675a710099ad58208e71aae9decc042733afe54" SOURCE_DIR="qt-everywhere-opensource-src-${portVersion/\~/-}" SOURCE_DIR_2="qtwebkit-opensource-src-${portVersion/\~/-}" PATCHES="qt5-$portVersion.patchset" @@ -24,7 +24,7 @@ ADDITIONAL_FILES=" qhelpconverter.rdef.in " -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="?x86" PROVIDES=" @@ -34,7 +34,6 @@ PROVIDES=" lib:libQt5Concurrent$secondaryArchSuffix = $portVersion compat >= 5 lib:libQt5Core$secondaryArchSuffix = $portVersion compat >= 5 lib:libQt5DBus$secondaryArchSuffix = $portVersion compat >= 5 - lib:libQt5EglFSDeviceIntegration$secondaryArchSuffix = $portVersion compat >= 5 lib:libQt5Gui$secondaryArchSuffix = $portVersion compat >= 5 lib:libQt5Network$secondaryArchSuffix = $portVersion compat >= 5 lib:libQt5OpenGL$secondaryArchSuffix = $portVersion compat >= 5 @@ -144,7 +143,6 @@ PROVIDES_devel=" devel:libQt5Concurrent$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Core$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5DBus$secondaryArchSuffix = $portVersion compat >= 5 - devel:libQt5EglFSDeviceIntegration$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Gui$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Network$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5OpenGL$secondaryArchSuffix = $portVersion compat >= 5 @@ -388,7 +386,7 @@ INSTALL() fixPkgconfig prepareInstalledDevelLibs \ - libQt5Concurrent libQt5Core libQt5DBus libQt5EglFSDeviceIntegration \ + libQt5Concurrent libQt5Core libQt5DBus \ libQt5Gui \ libQt5Network libQt5NetworkAuth libQt5PrintSupport libQt5OpenGL \ libQt5Sql libQt5Test libQt5Widgets libQt5Xml \ @@ -410,7 +408,7 @@ INSTALL() libQt5FbSupport libQt5FontDatabaseSupport \ libQt5PlatformCompositorSupport libQt5ServiceSupport\ libQt5ThemeSupport libQt53DAnimation libQt53DQuickAnimation \ - libQt5RemoteObjects libQt5EglSupport + libQt5RemoteObjects cd $libDir for i in lib*.so.5.*;do