qt5: bump 5.9 to beta2.

dev-qt/qt5/patches/qt5-5.9.0~beta.patchset → dev-qt/qt5/patches/qt5-5.9.0~beta2.patchset

@@ -1,4 +1,4 @@
-From 92766a2b6526675d7e7f9610ad39226131444c66 Mon Sep 17 00:00:00 2001
+From 67d50bc47d788f577e36826e9dafab3a589631d5 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.11.0
+2.12.2
 
 
-From c520bf845f89e3ade6aa6889ea21355ef02cd850 Mon Sep 17 00:00:00 2001
+From 60aa1b20159d0bf878ca71f90fa8d6b4b47f63ad 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.11.0
+2.12.2
 
 
-From 310ce7aa799cc521f10de6382595f2e96a72fd6b Mon Sep 17 00:00:00 2001
+From 44cdcf1fa1b2e3eb6a7c7095d5d63eca437af059 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.11.0
+2.12.2
 
 
-From dfdd1b9dc97eb968142b1d288ea57cb9d21c73d0 Mon Sep 17 00:00:00 2001
+From b6cc1e8eabf0e12ea122fdccbcfff0bcfa9f1b86 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.11.0
+2.12.2
 
 
-From ddfadb51b4dd0c5d52b89467c0eca35ffb3fa265 Mon Sep 17 00:00:00 2001
+From e9b4a531b28ae8877d43e8b6088f521dbfbe7929 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.11.0
+2.12.2
 
 
-From 687237d948cc5e170019823549e7e337a8049744 Mon Sep 17 00:00:00 2001
+From 0b4cbf17aeb211458ef7b3a736ce288ac8404d59 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,10 +5291,10 @@ index 0b9235a..bfc2a0c 100644
      return 0;
  }
 -- 
-2.11.0
+2.12.2
 
 
-From 5f3c631ef5fdb8351ab04f1ccbe0028a8e67a6d1 Mon Sep 17 00:00:00 2001
+From 03b6561dc5b0507b1df7b5bb908dd6962304d9de 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.
@@ -5314,17 +5314,17 @@ index 0b5d24c..6c29d98 100644
  #include "qhaikuplatformfontdatabase.h"
 
 -- 
-2.11.0
+2.12.2
 
 
-From 43a03a0f3b00937d1593c8ec7a8912cfc6748e62 Mon Sep 17 00:00:00 2001
+From e9b9f27daa6402c42951edab448363864f84182a 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 ce61568..f26b56e 100644
+index 6d788f4..c4c47ea 100644
 --- a/qtdeclarative/src/qml/jit/qv4targetplatform_p.h
 +++ b/qtdeclarative/src/qml/jit/qv4targetplatform_p.h
 @@ -90,7 +90,7 @@ class TargetPlatform
@@ -5372,10 +5372,10 @@ index c2a5e75..c110077 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.11.0
+2.12.2
 
 
-From f3341464857458f28981309fce42f219646dda57 Mon Sep 17 00:00:00 2001
+From c1a4c5d5351a32557da3ef8cc26edbcd4f7d901f 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.
@@ -5395,5 +5395,55 @@ index ffcb5d1..0835589 100644
          warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
      } else {
 -- 
-2.11.0
+2.12.2
+
+
+From db5571f8ee42a10eabd91f067868df8735757b66 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 22 Apr 2017 13:10:20 +0200
+Subject: Rename QBasicFontDatabase to QFreeTypeFontDatabase.
+
+
+diff --git a/qtbase/src/plugins/platforms/haiku/qhaikuintegration.cpp b/qtbase/src/plugins/platforms/haiku/qhaikuintegration.cpp
+index abe5c88..96c90ae 100644
+--- a/qtbase/src/plugins/platforms/haiku/qhaikuintegration.cpp
++++ b/qtbase/src/plugins/platforms/haiku/qhaikuintegration.cpp
+@@ -45,7 +45,7 @@
+ #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
+ #include <qpa/qplatformfontdatabase.h>
+ #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+-#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
++#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h>
+ #include <QtGui/private/qpixmap_raster_p.h>
+ #include <QtGui/private/qguiapplication_p.h>
+
+diff --git a/qtbase/src/plugins/platforms/haiku/qhaikuplatformfontdatabase.cpp b/qtbase/src/plugins/platforms/haiku/qhaikuplatformfontdatabase.cpp
+index 6c29d98..a3858ba 100644
+--- a/qtbase/src/plugins/platforms/haiku/qhaikuplatformfontdatabase.cpp
++++ b/qtbase/src/plugins/platforms/haiku/qhaikuplatformfontdatabase.cpp
+@@ -145,5 +145,5 @@ void QHaikuPlatformFontDatabase::releaseHandle(void *handle)
+ {
+     if (!handle)
+         return;
+-    QBasicFontDatabase::releaseHandle(handle);
++    QFreeTypeFontDatabase::releaseHandle(handle);
+ }
+diff --git a/qtbase/src/plugins/platforms/haiku/qhaikuplatformfontdatabase.h b/qtbase/src/plugins/platforms/haiku/qhaikuplatformfontdatabase.h
+index 2d27d06..f79f087 100644
+--- a/qtbase/src/plugins/platforms/haiku/qhaikuplatformfontdatabase.h
++++ b/qtbase/src/plugins/platforms/haiku/qhaikuplatformfontdatabase.h
+@@ -40,9 +40,9 @@
+ #ifndef QANDROIDPLATFORMFONTDATABASE_H
+ #define QANDROIDPLATFORMFONTDATABASE_H
+
+-#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
++#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h>
+
+-class QHaikuPlatformFontDatabase: public QBasicFontDatabase
++class QHaikuPlatformFontDatabase: public QFreeTypeFontDatabase
+ {
+ public:
+     QString fontDir() const;
+-- 
+2.12.2
 

dev-qt/qt5/patches/qtwebkit-5.9.0~beta.patchset → dev-qt/qt5/patches/qtwebkit-5.9.0~beta2.patchset

@@ -1,4 +1,4 @@
-From 5e8ccab215ac4e6a86985df322f62a306050cc11 Mon Sep 17 00:00:00 2001
+From 243c45b09329138bad208ce12ca968c0bc8aa642 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 26 Oct 2015 10:51:40 +0000
 Subject: Fix qtwebkit build
@@ -153,10 +153,10 @@ index 7d02034..9d3a018 100644
  #endif
      RunLoop::main()->dispatch(bind(&WebKit::ProcessLauncher::didFinishLaunchingProcess, this, webProcessOrSUIDHelper, connector));
 -- 
-2.10.2
+2.12.2
 
 
-From 251d7bd192219835f1a594c2fa25b642272023ae Mon Sep 17 00:00:00 2001
+From dd78d57061e497e78fd67b4b2edf12a13ddb1bf5 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 13 Aug 2016 08:53:38 +0000
 Subject: Haiku doesn't need pthread
@@ -176,5 +176,5 @@ index 77375c6..b79046c 100644
 
  creating_module {
 -- 
-2.10.2
+2.12.2
 

dev-qt/qt5/qt5-5.9.0~beta.recipe → dev-qt/qt5/qt5-5.9.0~beta2.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="d7c4b08f96ac099353184fb30753b8e7a82540d99df8a5e1f7b3b4e2b289c08b"
-CHECKSUM_SHA256_2="1eeec0431312cf8382e33661664101af1c4112d9d35f62cca13ac3f291350e8c"
+CHECKSUM_SHA256="b74c30cd80474880b4a0c2f0ed6efdbda16ebe72cdc26f2a85bb025a42d5d838"
+CHECKSUM_SHA256_2="da5ef14d359beb1c3315c17fb00c9af447784996f39d5682c9a0741477696bd6"
 SOURCE_DIR="qt-everywhere-opensource-src-${portVersion/\~/-}"
 SOURCE_DIR_2="qtwebkit-opensource-src-${portVersion/\~/-}"
 PATCHES="qt5-$portVersion.patchset"
@@ -34,6 +34,7 @@ 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
@@ -117,6 +118,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
+	lib:libegl$secondaryArchSuffix
 	lib:libflite$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
@@ -142,6 +144,7 @@ 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
@@ -235,6 +238,7 @@ PROVIDES_devel="
 	devel:libQt5PlatformCompositorSupport$secondaryArchSuffix = $portVersion compat >= 5
 	devel:libQt5ServiceSupport$secondaryArchSuffix = $portVersion compat >= 5
 	devel:libQt5ThemeSupport$secondaryArchSuffix = $portVersion compat >= 5
+	devel:libQt5EGLSupport$secondaryArchSuffix = $portVersion compat >= 5
 
 	cmd:assistant$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:canbusutil$secondaryArchSuffix = $portVersion compat >= 5
@@ -290,6 +294,7 @@ REQUIRES_devel="
 	lib:libcrypto$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
+	devel:libgl$secondaryArchSuffix
 	"
 
 PROVIDES_docs="
@@ -302,6 +307,7 @@ REQUIRES_docs="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcrypto$secondaryArchSuffix
+	devel:libegl$secondaryArchSuffix
 	devel:libflite$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
@@ -382,7 +388,8 @@ INSTALL()
 	fixPkgconfig
 
 	prepareInstalledDevelLibs \
-		libQt5Concurrent libQt5Core libQt5DBus libQt5Gui \
+		libQt5Concurrent libQt5Core libQt5DBus libQt5EglFSDeviceIntegration \
+		libQt5Gui \
 		libQt5Network libQt5NetworkAuth libQt5PrintSupport libQt5OpenGL \
 		libQt5Sql libQt5Test libQt5Widgets libQt5Xml \
 		libQt5XmlPatterns libQt5WebSockets libQt5WebKitWidgets \
@@ -403,7 +410,7 @@ INSTALL()
 		libQt5FbSupport libQt5FontDatabaseSupport \
 		libQt5PlatformCompositorSupport libQt5ServiceSupport\
 		libQt5ThemeSupport libQt53DAnimation libQt53DQuickAnimation \
-		libQt5RemoteObjects
+		libQt5RemoteObjects libQt5EglSupport
 
 	cd $libDir
 	for i in lib*.so.5.*;do