From aedf55bb6aa84a85e32f2018ae70fae57f0060d2 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 27 Nov 2017 07:12:39 +0100
Subject: [PATCH] haikuwebkit 1.6.3.

---
 .../haikuwebkit/haikuwebkit-1.6.1.recipe      | 102 ------------------
 ...-1.6.0.recipe => haikuwebkit-1.6.3.recipe} |   4 +-
 2 files changed, 3 insertions(+), 103 deletions(-)
 delete mode 100644 haiku-libs/haikuwebkit/haikuwebkit-1.6.1.recipe
 rename haiku-libs/haikuwebkit/{haikuwebkit-1.6.0.recipe => haikuwebkit-1.6.3.recipe} (94%)

diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.6.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.6.1.recipe
deleted file mode 100644
index ab6f83588..000000000
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.6.1.recipe
+++ /dev/null
@@ -1,102 +0,0 @@
-SUMMARY="Open source web browser engine"
-DESCRIPTION="
-WebKit is an open source web browser engine. WebKit is also the name of the \
-Mac OS X system framework version of the engine that's used by Safari, \
-Dashboard, Mail, and many other OS X applications. WebKit's HTML and \
-JavaScript code began as a branch of the KHTML and KJS libraries from KDE.
-"
-HOMEPAGE="http://www.webkit.org/"
-COPYRIGHT="1998-2016 Apple Inc., Google Inc., et al"
-LICENSE="
-	GNU LGPL v2
-	GNU LGPL v2.1
-	MIT
-	"
-REVISION="1"
-SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="8a4906b85bcfa5ae1ee54892586e4ec0dc95272c855abb0e28e8f70a594b6f70"
-SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
-SOURCE_DIR="webkit-$portVersion"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	haikuwebkit$secondaryArchSuffix = $portVersion
-	lib:libWebKit$secondaryArchSuffix = $portVersion
-	lib:libJavaScriptCore$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:jsc
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libicuuc$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libwebp$secondaryArchSuffix
-	lib:libsqlite3$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	lib:libxslt$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libexecinfo$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	haikuwebkit${secondaryArchSuffix}_devel = $portVersion
-	devel:libJavaScriptCore$secondaryArchSuffix = $portVersion
-	devel:libwebcore$secondaryArchSuffix = $portVersion
-	devel:libWebKit$secondaryArchSuffix = $portVersion
-	devel:libwtf$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	haikuwebkit$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	haiku_devel
-	devel:libicuuc$secondaryArchSuffix
-	devel:libjpeg$secondaryArchSuffix
-	devel:libpng16$secondaryArchSuffix
-	devel:libwebp$secondaryArchSuffix
-	devel:libsqlite3$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix
-	devel:libxslt$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	devel:libexecinfo$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:pkg_config
-	cmd:flex
-	cmd:bison
-	cmd:gcc$secondaryArchSuffix
-	cmd:gperf
-	cmd:ld$secondaryArchSuffix
-	cmd:m4
-	cmd:make
-	cmd:ninja
-	cmd:perl
-	cmd:python
-	cmd:cmake >= 3.0.0
-	cmd:ruby
-	cmd:which
-	"
-
-BUILD()
-{
-	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
-	Tools/Scripts/build-webkit --haiku --no-webkit2 \
-		--cmakeargs="-DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSHOULD_INSTALL_JS_SHELL=ON"
-}
-
-INSTALL()
-{
-	cd WebKitBuild/Release
-	ninja install
-
-	prepareInstalledDevelLibs libWebKit libJavaScriptCore
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
-
diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.6.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe
similarity index 94%
rename from haiku-libs/haikuwebkit/haikuwebkit-1.6.0.recipe
rename to haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe
index 5be176032..d659e2809 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.6.0.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.6.3.recipe
@@ -14,9 +14,9 @@ LICENSE="
 	"
 REVISION="1"
 SOURCE_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="e7d6345e5a6172682482ce5ec4be61c3fc59690a8faeaa50000a3e4fdca431c9"
 SOURCE_FILENAME="haikuwebkit-$portVersion.tar.gz"
 SOURCE_DIR="webkit-$portVersion"
+CHECKSUM_SHA256="49080d1b4fb09eed7bbcd160683144d8851b4cc5a77ecc922c27dabbfeb75e4d"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -38,6 +38,7 @@ REQUIRES="
 	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libexecinfo$secondaryArchSuffix
+	lib:libgnutls$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -63,6 +64,7 @@ BUILD_REQUIRES="
 	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	devel:libexecinfo$secondaryArchSuffix
+	devel:libgnutls$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:pkg_config