diff --git a/dev-qt/qt5/patches/qt5-5.9.0~beta2.patchset b/dev-qt/qt5/patches/qt5-5.9.0~beta3.patchset similarity index 99% rename from dev-qt/qt5/patches/qt5-5.9.0~beta2.patchset rename to dev-qt/qt5/patches/qt5-5.9.0~beta3.patchset index 03af749f4..a48a02ba3 100644 --- a/dev-qt/qt5/patches/qt5-5.9.0~beta2.patchset +++ b/dev-qt/qt5/patches/qt5-5.9.0~beta3.patchset @@ -1,4 +1,4 @@ -From 67d50bc47d788f577e36826e9dafab3a589631d5 Mon Sep 17 00:00:00 2001 +From b8542db38b155abb644870d473a86f853a2240d2 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 @@ -49,10 +49,10 @@ index 044d69f..89653c1 100644 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 ab7a4d7..579ac9c 100644 +index ea9b827..928e949 100644 --- a/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc +++ b/qtbase/tests/auto/corelib/io/qfileselector/qfileselector.qrc -@@ -20,6 +20,7 @@ +@@ -21,6 +21,7 @@ platforms/+unix/+darwin/test platforms/+unix/+haiku/test platforms/+unix/+linux/test @@ -106,7 +106,7 @@ index 7f2023a..4b3d202 100644 2.12.2 -From 60aa1b20159d0bf878ca71f90fa8d6b4b47f63ad Mon Sep 17 00:00:00 2001 +From e2e75e20c3e9620dce569604feb278eb0ad5f5e7 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 44cdcf1fa1b2e3eb6a7c7095d5d63eca437af059 Mon Sep 17 00:00:00 2001 +From 62ce0e44756488c61b07ad95af64eaaa1073469e 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 b6cc1e8eabf0e12ea122fdccbcfff0bcfa9f1b86 Mon Sep 17 00:00:00 2001 +From 80dff523b5b418fa4dbc5f894277881fd28ce352 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 e9b4a531b28ae8877d43e8b6088f521dbfbe7929 Mon Sep 17 00:00:00 2001 +From 1c3bab9446fe088ef13c15392869554ba1f71ead 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 0b4cbf17aeb211458ef7b3a736ce288ac8404d59 Mon Sep 17 00:00:00 2001 +From aafa2ce69ddd8cfea53c791bf488816cd447dedb 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 03b6561dc5b0507b1df7b5bb908dd6962304d9de Mon Sep 17 00:00:00 2001 +From fd79a25d8fd576b6bc0c231b8932f5d6f923a915 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 e9b9f27daa6402c42951edab448363864f84182a Mon Sep 17 00:00:00 2001 +From ee83a8e94232e4725222902f18e213339e17f273 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 23 Mar 2017 21:08:37 +0100 Subject: enable QV4 JIT. @@ -5375,19 +5375,19 @@ index c2a5e75..c110077 100644 2.12.2 -From c1a4c5d5351a32557da3ef8cc26edbcd4f7d901f Mon Sep 17 00:00:00 2001 +From 97f9db7b51549ab410ccd7b73f0516d5e3346efb 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 ffcb5d1..0835589 100644 +index a0d2932..32eec80 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 +@@ -6,7 +6,7 @@ qtConfig(concurrent) { + SUBDIRS += osm + } -qtConfig(c++14):!win32:!qnx { +qtConfig(c++14):!win32:!qnx:!haiku { @@ -5398,7 +5398,7 @@ index ffcb5d1..0835589 100644 2.12.2 -From db5571f8ee42a10eabd91f067868df8735757b66 Mon Sep 17 00:00:00 2001 +From 6a9435bd151352a86f9e84094a0c9e11fcff23a4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 22 Apr 2017 13:10:20 +0200 Subject: Rename QBasicFontDatabase to QFreeTypeFontDatabase. diff --git a/dev-qt/qt5/patches/qtwebkit-5.9.0~beta2.patchset b/dev-qt/qt5/patches/qtwebkit-5.9.0~beta3.patchset similarity index 100% rename from dev-qt/qt5/patches/qtwebkit-5.9.0~beta2.patchset rename to dev-qt/qt5/patches/qtwebkit-5.9.0~beta3.patchset diff --git a/dev-qt/qt5/qt5-5.9.0~beta2.recipe b/dev-qt/qt5/qt5-5.9.0~beta3.recipe similarity index 99% rename from dev-qt/qt5/qt5-5.9.0~beta2.recipe rename to dev-qt/qt5/qt5-5.9.0~beta3.recipe index 34dfb9674..be50e5443 100644 --- a/dev-qt/qt5/qt5-5.9.0~beta2.recipe +++ b/dev-qt/qt5/qt5-5.9.0~beta3.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="b74c30cd80474880b4a0c2f0ed6efdbda16ebe72cdc26f2a85bb025a42d5d838" -CHECKSUM_SHA256_2="da5ef14d359beb1c3315c17fb00c9af447784996f39d5682c9a0741477696bd6" +CHECKSUM_SHA256="dfebc206eb4f15d34f8700af6dfbf87f164861018cba77e8ca6adfaf1c5814f9" +CHECKSUM_SHA256_2="5f69a6a4f89a9da31b51875033870a2113d99a802d36f7eeb7e97ee161e00a4c" SOURCE_DIR="qt-everywhere-opensource-src-${portVersion/\~/-}" SOURCE_DIR_2="qtwebkit-opensource-src-${portVersion/\~/-}" PATCHES="qt5-$portVersion.patchset"