From 92e32fd173f3e5f3c086b304eb8a8c396192e87c Mon Sep 17 00:00:00 2001
From: Jiri Horner <laeqten@gmail.com>
Date: Thu, 19 Jan 2017 00:21:32 +0100
Subject: community/webkit2gtk: upgrade to 2.14.3

* fixes: CVE-2016-7656, CVE-2016-7635, CVE-2016-7654, CVE-2016-7639, CVE-2016-7645, CVE-2016-7652, CVE-2016-7641, CVE-2016-7632, CVE-2016-7599, CVE-2016-7592, CVE-2016-7589, CVE-2016-7623, CVE-2016-7586

* modernized APKBUILD
---
 community/webkit2gtk/APKBUILD | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'community/webkit2gtk/APKBUILD')

diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD
index 4593140059..a4a2ff02e6 100644
--- a/community/webkit2gtk/APKBUILD
+++ b/community/webkit2gtk/APKBUILD
@@ -7,8 +7,6 @@ pkgdesc="portable web rendering engine WebKit for GTK+"
 url="http://webkitgtk.org/"
 arch="x86 x86_64"
 license="LGPL2+ BSD"
-depends=""
-depends_dev=""
 makedepends="$depends_dev
 	bison
 	cmake
@@ -38,32 +36,22 @@ makedepends="$depends_dev
 	ruby
 	sqlite-dev
 	"
-install=
 replaces="webkit"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
 	musl-fixes.patch
 	"
 
-_srcdir="${srcdir}/webkitgtk-${pkgver}"
-_builddir="${srcdir}/build"
+builddir="${srcdir}/webkitgtk-${pkgver}"
 prepare() {
-	cd "$_srcdir"
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || return 1
-			;;
-		esac
-	done
+	default_prepare || return 1
 	rm -r Source/ThirdParty/gtest/ || return 1
 	rm -r Source/ThirdParty/qunit/ || return 1
 }
 
 build() {
-	mkdir "$_builddir"
-	cd "$_builddir"
+	cd "$builddir"
+	mkdir build && cd build
 	cmake -DPORT=GTK \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
@@ -73,12 +61,12 @@ build() {
 		-DENABLE_GTKDOC=ON \
 		-DENABLE_GEOLOCATION=OFF \
 		-DENABLE_PLUGIN_PROCESS_GTK2=OFF \
-		"$_srcdir" || return 1
+		.. || return 1
 	make || return 1
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install || return 1
 	# needed for JIT
 	paxmark -m "$pkgdir"/usr/lib/webkit2gtk-4.0/WebKitWebProcess || return 1
-- 
cgit v1.2.3