From 4fb5b8a2777a214579143fc7478dfae994428aae Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 30 Jan 2017 20:20:18 +0100
Subject: [PATCH] Recipe for HaikuWebkit 1.5.4.

Requires changes in Haiku HTTP kit API, which I'm pushing soon.
---
 .../haikuwebkit/haikuwebkit-1.5.4.recipe      | 102 ++++++++++++++++++
 .../patches/haikuwebkit-1.5.2.patch           |  22 ----
 2 files changed, 102 insertions(+), 22 deletions(-)
 create mode 100644 haiku-libs/haikuwebkit/haikuwebkit-1.5.4.recipe
 delete mode 100644 haiku-libs/haikuwebkit/patches/haikuwebkit-1.5.2.patch

diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.5.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.5.4.recipe
new file mode 100644
index 000000000..62116a5bf
--- /dev/null
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.5.4.recipe
@@ -0,0 +1,102 @@
+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="914011d160f1b59e5ce8fe3b822394ad0a5272d8192bc5cb0061f30c6c4d7500"
+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/patches/haikuwebkit-1.5.2.patch b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.5.2.patch
deleted file mode 100644
index 500c8b528..000000000
--- a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.5.2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Source/JavaScriptCore/runtime/Options.cpp.ori	2016-07-06 09:04:18.145489920 +0200
-+++ Source/JavaScriptCore/runtime/Options.cpp	2016-07-06 08:32:30.864550912 +0200
-@@ -28,8 +28,8 @@
- 
- #include "HeapStatistics.h"
- #include <algorithm>
-+#include <cmath>
- #include <limits>
--#include <math.h>
- #include <mutex>
- #include <stdlib.h>
- #include <string.h>
---- Source/WebCore/platform/haiku/RenderThemeHaiku.cpp.ori	2016-07-05 14:50:40.034078720 +0200
-+++ Source/WebCore/platform/haiku/RenderThemeHaiku.cpp	2016-07-05 14:54:06.209453056 +0200
-@@ -33,6 +33,7 @@
- #include "InputTypeNames.h"
- #include "NotImplemented.h"
- #include "PaintInfo.h"
-+#include "RenderElement.h"
- #include "UserAgentScripts.h"
- #include "UserAgentStyleSheets.h"
- #include <ControlLook.h>