From a938b8a2a9d8e6f54d9aeb0615871eaea7e83909 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 13 Jul 2017 18:08:46 +0200
Subject: [PATCH] qtwebkit: fix packaging after cmakeDirArgs fix.

* clean patchset, to fix mkspecs.
---
 .../patches/qtwebkit-5.212.0~alpha2.patchset  | 39 ++++++-------------
 .../qtwebkit/qtwebkit-5.212.0~alpha2.recipe   | 11 +-----
 2 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset
index a06d3f5a9..1baa9bb30 100644
--- a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset
+++ b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~alpha2.patchset
@@ -1,4 +1,4 @@
-From 92bcb39e225b17edaa9a3a7034515c6215139a69 Mon Sep 17 00:00:00 2001
+From a89a827f7aed974f1c13892226e9b4d1f545514e Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 16 Jun 2017 21:38:08 +1000
 Subject: Fix build
@@ -861,10 +861,10 @@ index 6b6bcf5..042fccc 100644
  #endif
      RefPtr<ProcessLauncher> protector(this);
 diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
-index 6dc4231..a474d30 100644
+index 1930027..9c827a3 100644
 --- a/Source/cmake/OptionsQt.cmake
 +++ b/Source/cmake/OptionsQt.cmake
-@@ -88,7 +88,7 @@ if (APPLE)
+@@ -122,7 +122,7 @@ if (APPLE)
      set(MACOS_BUILD_FRAMEWORKS ON) # TODO: Make it an option
  endif ()
  
@@ -874,32 +874,17 @@ index 6dc4231..a474d30 100644
      set(USE_GSTREAMER_DEFAULT OFF)
      set(USE_QT_MULTIMEDIA_DEFAULT ON)
 -- 
-2.7.0
+2.12.2
 
 
-From 093545384e526f9bb8013e73bca2295958d19f70 Mon Sep 17 00:00:00 2001
+From a93c9cb0e4db0da22bbf4ad167ba278cb56f41c7 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 17 Jun 2017 12:22:33 +1000
 Subject: Add libnetwork
 
 
-diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
-index da199ae..a2424c2 100644
---- a/Source/WebKit/PlatformQt.cmake
-+++ b/Source/WebKit/PlatformQt.cmake
-@@ -445,6 +445,10 @@ if (ENABLE_PRINT_SUPPORT)
-     set(WEBKITWIDGETS_PRI_RUNTIME_DEPS "${WEBKITWIDGETS_PRI_RUNTIME_DEPS} printsupport")
- endif ()
- 
-+if (HAIKU)
-+	set(WEBKIT_PRI_EXTRA_LIBS "${WEBKIT_PRI_EXTRA_LIBS} -lnetwork")
-+endif ()
-+
- if (QT_STATIC_BUILD)
-     if (MSVC)
-         set(LIB_PREFIX "lib")
 diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
-index e5d08ed..e111055 100644
+index e5d08ed..deb9f68 100644
 --- a/Source/WebKit2/CMakeLists.txt
 +++ b/Source/WebKit2/CMakeLists.txt
 @@ -740,6 +740,12 @@ set(PluginProcess_LIBRARIES
@@ -907,19 +892,19 @@ index e5d08ed..e111055 100644
  )
  
 +if (HAIKU)
-+	list(APPEND WebKit2_LIBRARIES -lnetwork)
-+	list(APPEND WebProcess_LIBRARIES -lnetwork)
-+	list(APPEND NetworkProcess_LIBRARIES -lnetwork)
++	list(APPEND WebKit2_LIBRARIES network)
++	list(APPEND WebProcess_LIBRARIES network)
++	list(APPEND NetworkProcess_LIBRARIES network)
 +endif ()
 +
  # librt is needed for shm_open on Linux.
  find_library(LIBRT_LIBRARIES NAMES rt)
  mark_as_advanced(LIBRT_LIBRARIES)
 -- 
-2.7.0
+2.12.2
 
 
-From 80ea664b8995325254d8f430bcfa32e4af85e43e Mon Sep 17 00:00:00 2001
+From 54630a42e794671757e01fca0faab1472e2dd258 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 17 Jun 2017 12:23:20 +1000
 Subject: Add Haiku detection to useragent string
@@ -939,5 +924,5 @@ index 4b88762..fa564f9 100644
              "GNU Hurd"
  #elif OS(LINUX)
 -- 
-2.7.0
+2.12.2
 
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe b/dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe
index db7480d49..34c72365b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0~alpha2.recipe
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/annulen/webkit"
 COPYRIGHT="2015-2017 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/annulen/webkit/releases/download/qtwebkit-${portVersion/\~/-}/qtwebkit-${portVersion/\~/-}.tar.xz"
 CHECKSUM_SHA256="f8f901de567e11fc5659402b6b827eac75505ff9c5072d8e919aa306003f8f8a"
 SOURCE_DIR="qtwebkit-${portVersion/\~/-}"
@@ -136,21 +136,14 @@ INSTALL()
 	cd build
 	make install
 
-	mkdir -p $(dirname $includeDir)
-	mv $prefix/include $includeDir
-
 	mkdir -p $dataDir/Qt5
 	mv -f $prefix/lib/qml $dataDir/Qt5
 	mv -f $prefix/mkspecs $dataDir/Qt5
 
-	mv $prefix/lib $prefix/lib2
-	mkdir -p $(dirname $libDir)
-	mv $prefix/lib2 $libDir
-	
 	prepareInstalledDevelLibs libQt5WebKit libQt5WebKitWidgets
 	fixPkgconfig
 	
-	sed -i  -e "s|lib|develop/lib|" -e "s|include/Qt5WebKit|develop/headers/QtWebKit|" \
+	sed -i  -e "s|lib|develop/lib|" -e "s|headers/Qt5WebKit|headers/QtWebKit|" \
 		$developDir/lib/pkgconfig/Qt5*
 
 	cd $libDir