From e9f64384a96618179e39a2797d3c4dac2ce341eb Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 27 May 2018 10:55:17 +1000 Subject: [PATCH] Qt5: bump version --- ...t5-5.10.1.patchset => qt5-5.11.0.patchset} | 167 +++++++----------- .../{qt5-5.10.1.recipe => qt5-5.11.0.recipe} | 27 ++- 2 files changed, 80 insertions(+), 114 deletions(-) rename dev-qt/qt5/patches/{qt5-5.10.1.patchset => qt5-5.11.0.patchset} (65%) rename dev-qt/qt5/{qt5-5.10.1.recipe => qt5-5.11.0.recipe} (96%) diff --git a/dev-qt/qt5/patches/qt5-5.10.1.patchset b/dev-qt/qt5/patches/qt5-5.11.0.patchset similarity index 65% rename from dev-qt/qt5/patches/qt5-5.10.1.patchset rename to dev-qt/qt5/patches/qt5-5.11.0.patchset index 1681b3999..0571f9a17 100644 --- a/dev-qt/qt5/patches/qt5-5.10.1.patchset +++ b/dev-qt/qt5/patches/qt5-5.11.0.patchset @@ -1,4 +1,4 @@ -From b9ad223ca73735683316cb98dc8bdeb7512103f9 Mon Sep 17 00:00:00 2001 +From 3de1c0dac0dac1d29b4a171f57187f1f89e5325b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 22 Apr 2018 10:49:00 +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 7f2023a..4b3d202 100644 +index 4f37245..e9c0c95 100644 --- a/qtdeclarative/src/3rdparty/masm/wtf/Platform.h +++ b/qtdeclarative/src/3rdparty/masm/wtf/Platform.h @@ -412,6 +412,11 @@ @@ -52,7 +52,7 @@ index 7f2023a..4b3d202 100644 2.16.2 -From c96c0e7327190e6db7039543ff61732d7fd456f6 Mon Sep 17 00:00:00 2001 +From a8f3b2b3fee674dd15b94db8c12dc023a9ea3eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 22 Apr 2018 10:50:57 +1000 Subject: Add filteredDeviceFilePaths for Haiku's /dev/ports/* @@ -87,7 +87,7 @@ index 0f62a9d..afd5c0b 100644 2.16.2 -From 2f1d469d8cd6d0ef41915c0e2da34fb7ee418e0a Mon Sep 17 00:00:00 2001 +From d288d26e046c22cd9789f13f98a8038fc99f5338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 22 Apr 2018 10:52:35 +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 bb5083c..b286bed 100644 +index 66acede..9468bde 100644 --- a/qtbase/mkspecs/features/create_cmake.prf +++ b/qtbase/mkspecs/features/create_cmake.prf -@@ -84,6 +84,9 @@ win32:!static:!staticlib { +@@ -86,6 +86,9 @@ win32:!static:!staticlib { CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ CMAKE_DLL_DIR_IS_ABSOLUTE = True } @@ -112,105 +112,14 @@ index bb5083c..b286bed 100644 2.16.2 -From b21ba2b743bcff8088db0ac541220cdc23efee68 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sun, 22 Apr 2018 10:54:37 +1000 -Subject: enable QV4 JIT. - - -diff --git a/qtdeclarative/src/qml/jit/qv4targetplatform_p.h b/qtdeclarative/src/qml/jit/qv4targetplatform_p.h -index 6d788f4..d6529d7 100644 ---- a/qtdeclarative/src/qml/jit/qv4targetplatform_p.h -+++ b/qtdeclarative/src/qml/jit/qv4targetplatform_p.h -@@ -90,7 +90,7 @@ class TargetPlatform - { - }; - --#if CPU(X86) && (OS(LINUX) || OS(WINDOWS) || OS(QNX) || OS(FREEBSD) || defined(Q_OS_IOS)) -+#if CPU(X86) && (OS(LINUX) || OS(WINDOWS) || OS(QNX) || OS(FREEBSD) || OS(HAIKU) || defined(Q_OS_IOS)) - template <> - class TargetPlatform - { -@@ -150,7 +150,7 @@ public: - } - - #if OS(WINDOWS) || OS(QNX) || \ -- ((OS(LINUX) || OS(FREEBSD)) && (defined(__PIC__) || defined(__PIE__))) -+ ((OS(LINUX) || OS(FREEBSD) || OS(HAIKU)) && (defined(__PIC__) || defined(__PIE__))) - - static const int gotRegister = JSC::X86Registers::ebx; - static int savedGOTRegisterSlotOnStack() { -@@ -178,7 +178,7 @@ public: - }; - #endif // x86 - --#if CPU(X86_64) && (OS(LINUX) || OS(MAC_OS_X) || OS(FREEBSD) || OS(QNX) || defined(Q_OS_IOS)) -+#if CPU(X86_64) && (OS(LINUX) || OS(MAC_OS_X) || OS(FREEBSD) || OS(QNX) || OS(HAIKU) || defined(Q_OS_IOS)) - template <> - class TargetPlatform - { -diff --git a/qtdeclarative/src/qml/jsruntime/qv4global_p.h b/qtdeclarative/src/qml/jsruntime/qv4global_p.h -index 5cddf2e..74ae422 100644 ---- a/qtdeclarative/src/qml/jsruntime/qv4global_p.h -+++ b/qtdeclarative/src/qml/jsruntime/qv4global_p.h -@@ -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) \ -- && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD)) -+ && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)) - # define V4_ENABLE_JIT - #elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \ -- && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)) -+ && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)) - # define V4_ENABLE_JIT - #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.16.2 - - -From 1b4eb3335f0a2481a566c4002500bb1113077adf Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sun, 22 Apr 2018 10:55:23 +1000 -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..aac3c8f 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,7 +557,7 @@ public: - if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000))) - flags_ |= kIntFlag; - } -- -+#endif - #if !defined(__x86_64__) && !defined(__arm64__) - //! Constructor for size_t value. - explicit GenericValue( size_t u ) RAPIDJSON_NOEXCEPT : data_(), flags_( kNumberUintFlag ) { --- -2.16.2 - - -From 8e83ae312c47ff83f070bd292f7b6da7475be819 Mon Sep 17 00:00:00 2001 +From a854665fedc45156468c69d1176a15830d26966f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 22 Apr 2018 10:55:55 +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 9414f01..dccd41e 100644 +index e618876..42c830c 100644 --- a/qtbase/src/plugins/platforms/platforms.pro +++ b/qtbase/src/plugins/platforms/platforms.pro @@ -42,10 +42,6 @@ freebsd { @@ -228,7 +137,7 @@ index 9414f01..dccd41e 100644 2.16.2 -From 67744051e82ffc234cdecc11178dd49886ff6407 Mon Sep 17 00:00:00 2001 +From 3d9cd2a1a5cffecdb04176482da587b8d6abed2f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 22 Apr 2018 10:56:50 +1000 Subject: disable mapbox-gl-native on Haiku. @@ -251,7 +160,7 @@ index b81ad34..7b642c0 100644 2.16.2 -From 69108472115fe694b483c7512c5459f48e90e5c5 Mon Sep 17 00:00:00 2001 +From ca73dd2c016d9451a4f8812e6a0eab7b2dc4a457 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 22 Apr 2018 10:57:22 +1000 Subject: Fix QStandartPaths for Haiku @@ -314,17 +223,17 @@ index 044d69f..1f255a9 100644 2.16.2 -From 5231637ee9af585b4dd8e90d572857a87c27c77f Mon Sep 17 00:00:00 2001 +From 83a0095958ef58e95163f1aedb15dbc64c8a78a0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 22 Apr 2018 10:57:46 +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 adff568..2197843 100644 +index 4273904..57fa06d 100644 --- a/qtbase/src/network/ssl/qsslsocket.cpp +++ b/qtbase/src/network/ssl/qsslsocket.cpp -@@ -2693,6 +2693,7 @@ QList QSslSocketPrivate::unixRootCertDirectories() +@@ -2709,6 +2709,7 @@ QList QSslSocketPrivate::unixRootCertDirectories() << "/usr/local/ssl/certs/" // Solaris << "/etc/openssl/certs/" // BlackBerry << "/opt/openssl/certs/" // HP-UX @@ -336,7 +245,7 @@ index adff568..2197843 100644 2.16.2 -From c04be273c2223640948c788ccf4491188736bd01 Mon Sep 17 00:00:00 2001 +From 84830b0cdf502e9f606819f4fcff93f03057b201 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 22 Apr 2018 10:58:17 +1000 Subject: Fix build for Haiku platform @@ -358,3 +267,51 @@ index fdf3d1c..6424b71 100644 -- 2.16.2 + +From e0dfd2001e522927dc0b9a42fe3d76d53d2b85a1 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 26 May 2018 15:46:27 +1000 +Subject: Fix clang-config detection on Haiku + + +diff --git a/qttools/mkspecs/features/qt_find_clang.prf b/qttools/mkspecs/features/qt_find_clang.prf +index 583cf0e..58e1bf4 100644 +--- a/qttools/mkspecs/features/qt_find_clang.prf ++++ b/qttools/mkspecs/features/qt_find_clang.prf +@@ -64,6 +64,10 @@ for(_, $$list(_)) { # just a way to break easily + clangInstallDir = /usr + } + ++ equals(QMAKE_HOST.os, Haiku) { ++ clangInstallDir = "/system" ++ } ++ + # note: llvm_config only exits on unix + llvm_config = $$clangInstallDir/bin/llvm-config + exists($$llvm_config) { +-- +2.16.2 + + +From de8c4776e3595358663b1ab3ee51071729fb9f25 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 26 May 2018 20:05:01 +1000 +Subject: Fix build qt3d zip module + + +diff --git a/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h b/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h +index 916fb1f..8834128 100644 +--- a/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h ++++ b/qt3d/src/3rdparty/assimp/contrib/zip/src/miniz.h +@@ -2917,7 +2917,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, + #define MZ_FFLUSH fflush + #define MZ_FREOPEN(f, m, s) freopen(f, m, s) + #define MZ_DELETE_FILE remove +- #elif defined(__GNUC__) && _LARGEFILE64_SOURCE ++ #elif defined(__GNUC__) && _LARGEFILE64_SOURCE && !defined(__HAIKU__) + #ifndef MINIZ_NO_TIME + #include + #endif +-- +2.16.2 + diff --git a/dev-qt/qt5/qt5-5.10.1.recipe b/dev-qt/qt5/qt5-5.11.0.recipe similarity index 96% rename from dev-qt/qt5/qt5-5.10.1.recipe rename to dev-qt/qt5/qt5-5.11.0.recipe index 55181c356..c1c413d78 100644 --- a/dev-qt/qt5/qt5-5.10.1.recipe +++ b/dev-qt/qt5/qt5-5.11.0.recipe @@ -8,8 +8,8 @@ COPYRIGHT="2015-2018 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" REVISION="1" -SOURCE_URI="https://download.qt.io/official_releases/qt/5.10/${portVersion/\~/-}/single/qt-everywhere-src-${portVersion/\~/-}.tar.xz" -CHECKSUM_SHA256="05ffba7b811b854ed558abf2be2ddbd3bb6ddd0b60ea4b5da75d277ac15e740a" +SOURCE_URI="https://download.qt.io/official_releases/qt/5.11/${portVersion/\~/-}/single/qt-everywhere-src-${portVersion/\~/-}.tar.xz" +CHECKSUM_SHA256="67ddb8bf33bbfd19ebc641467ccce2e57fd0b80c6082457f1f5a76e8df83c865" SOURCE_DIR="qt-everywhere-src-${portVersion/\~/-}" PATCHES="qt5-$portVersion.patchset" @@ -73,6 +73,7 @@ PROVIDES=" # qtlocation lib:libQt5Location$secondaryArchSuffix = $portVersion compat >= 5 lib:libQt5Positioning$secondaryArchSuffix = $portVersion compat >= 5 + lib:libQt5PositioningQuick$secondaryArchSuffix = $portVersion compat >= 5 # qtmultimedia lib:libQt5Multimedia$secondaryArchSuffix = $portVersion compat >= 5 lib:libQt5MultimediaGstTools$secondaryArchSuffix = $portVersion compat >= 5 @@ -109,6 +110,8 @@ PROVIDES=" lib:libQt5WebSockets$secondaryArchSuffix = $portVersion compat >= 5 # qtxmlpatterns lib:libQt5XmlPatterns$secondaryArchSuffix = $portVersion compat >= 5 + # qtwebview + lib:libQt5WebView$secondaryArchSuffix = $portVersion compat >= 5 " REQUIRES=" @@ -196,6 +199,7 @@ PROVIDES_devel=" # qtlocation devel:libQt5Location$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5Positioning$secondaryArchSuffix = $portVersion compat >= 5 + devel:libQt5PositioningQuick$secondaryArchSuffix = $portVersion compat >= 5 # qtmultimedia devel:libQt5Multimedia$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5MultimediaGstTools$secondaryArchSuffix = $portVersion compat >= 5 @@ -235,6 +239,8 @@ PROVIDES_devel=" devel:libQt5WebSockets$secondaryArchSuffix = $portVersion compat >= 5 # qtxmlpatterns devel:libQt5XmlPatterns$secondaryArchSuffix = $portVersion compat >= 5 + # qtwebview + devel:libQt5WebView$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5AccessibilitySupport$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5DeviceDiscoverySupport$secondaryArchSuffix = $portVersion compat >= 5 @@ -304,11 +310,12 @@ PROVIDES_devel=" REQUIRES_devel=" qt5$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libssl$secondaryArchSuffix + lib:libclang$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libgl$secondaryArchSuffix lib:libglu$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix devel:libgl$secondaryArchSuffix " @@ -330,6 +337,7 @@ REQUIRES_examples=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libclang$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix >= 1.0.0 devel:libdouble_conversion$secondaryArchSuffix devel:libegl$secondaryArchSuffix @@ -369,6 +377,7 @@ BUILD_PREREQUIRES=" cmd:gperf cmd:grep cmd:ld$secondaryArchSuffix + cmd:llvm_config cmd:ninja cmd:make cmd:orcc$secondaryArchSuffix @@ -416,6 +425,7 @@ INSTALL() # build and install docs PATH=$PATH:$binDir LIBRARY_PATH=$LIBRARY_PATH:$libDir + export QT_INSTALL_HEADERS=$includeDir make $jobArgs docs make install_docs @@ -430,7 +440,6 @@ INSTALL() if [ -e "$_dir/README" ]; then cp $_dir/README $_dir/README.$_mod fi -# mkdir $_base/$_mod cp -rn $_dir/* $_base done @@ -448,13 +457,13 @@ INSTALL() libQt5Gamepad libQt5Gui libQt5Help libQt5Location libQt5Multimedia \ libQt5MultimediaGstTools libQt5MultimediaQuick libQt5MultimediaWidgets \ libQt5Network libQt5NetworkAuth libQt5Nfc libQt5OpenGL \ - libQt5Positioning libQt5PrintSupport libQt5Purchasing libQt5Qml \ - libQt5Quick libQt5QuickControls2 libQt5QuickParticles \ + libQt5Positioning libQt5PositioningQuick libQt5PrintSupport libQt5Purchasing \ + libQt5Qml libQt5Quick libQt5QuickControls2 libQt5QuickParticles \ libQt5QuickTemplates2 libQt5QuickTest libQt5QuickWidgets \ libQt5RemoteObjects libQt5Script libQt5ScriptTools libQt5Scxml \ libQt5Sensors libQt5SerialBus libQt5SerialPort libQt5Sql libQt5Svg \ libQt5Test libQt5TextToSpeech libQt5WebChannel libQt5WebSockets \ - libQt5Widgets libQt5Xml libQt5XmlPatterns + libQt5WebView libQt5Widgets libQt5Xml libQt5XmlPatterns cd $libDir for i in lib*.so.5.*;do @@ -481,7 +490,7 @@ INSTALL() local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="0" + local MINOR="`echo "$portVersion" | cut -d. -f3`" local VARIETY="B_APPV_DEVELOPMENT" iconFiles="assistant designer linguist qdbusviewer qhelpconverter"