main/webkit: upgrade to 1.8.1, switch to gtk3

4 files changed, 81 insertions, 41 deletions

diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD
index e5c12581ae..c367d1a3c3 100644
--- a/main/webkit/APKBUILD
+++ b/main/webkit/APKBUILD
@@ -1,28 +1,52 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=webkit
-pkgver=1.6.3
-pkgrel=1
+pkgver=1.8.1
+pkgrel=0
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="http://webkitgtk.org/"
 arch="all"
 license="LGPL BSD"
 depends=
-makedepends="
-	libsoup-dev pango-dev gtk+-dev jpeg-dev libpng-dev libxml2-dev
-	gperf pkgconfig bison flex icu-dev cairo-dev atk-dev
-	gnutls-dev sqlite-dev libxslt-dev libxt-dev libiconv-dev gettext-dev
-	zlib-dev libgcrypt-dev libgpg-error-dev expat-dev e2fsprogs-dev
-	enchant-dev libxi-dev libxrandr-dev libxcursor-dev libxdamage-dev
-	libxcomposite-dev gstreamer-dev gst-plugins-base-dev
-	gobject-introspection-dev perl-switch
+depends_dev="gtk+3.0-dev libsoup-dev gstreamer-dev"
+makedepends="$depends_dev
+	autoconf automake libtool
+	bison
+	enchant-dev
+	expat-dev
+	flex
+	gnutls-dev
+	gobject-introspection-dev
+	gperf
+	gst-plugins-base-dev
+	gstreamer-dev
+	gtk-doc
+	icu-dev
+	jpeg-dev
+	libgcrypt-dev
+	libgpg-error-dev
+	libpng-dev
+	libsoup-dev
+	libxcomposite-dev
+	libxcursor-dev
+	libxdamage-dev
+	libxi-dev
+	libxml2-dev
+	libxrandr-dev
+	libxslt-dev
+	libxt-dev
+	mesa-dev
+	pango-dev
+	perl-switch
+	sqlite-dev
+	zlib-dev
 	"
 install=
 subpackages="$pkgname-dev gtklauncher $pkgname-lang"
-source="http://webkitgtk.org/$pkgname-$pkgver.tar.xz
-	webkit-1.6.1-alt-fix-TEXTREL.patch
+source="http://webkitgtk.org/releases/webkit-$pkgver.tar.xz
+	webkit-gtk-1.7.90-parallel-make-hack.patch
+	webkit-1.8-textrels.patch
 	"
 
-depends_dev="gtk+-dev libsoup-dev gstreamer-dev"
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
@@ -35,6 +59,7 @@ prepare() {
 			;;
 		esac
 	done
+	libtoolize --force && aclocal -I Source/autotools && autoconf && automake || return 1
 }
 
 build() {
@@ -43,9 +68,15 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-gtk=2.0 \
+		--disable-geolocation \
+		--with-gtk=3.0 \
 		|| return 1
-	make || return 1
+	# hack to work around parallel make problems,
+	# see https://bugs.webkit.org/show_bug.cgi?id=79498
+	make -j1 all-built-sources-local \
+		&& make all-ltlibraries-local \
+		&& make all-programs-local \
+		&& make || return 1
 }
 
 package() {
@@ -67,5 +98,6 @@ gtklauncher() {
 		"$subpkgdir"/usr/bin/GtkLauncher
 }
 
-md5sums="c476d9335419df061510d31e21175df1  webkit-1.6.3.tar.xz
-4e47996e3bb87ca27c0e49ce6a2abbc7  webkit-1.6.1-alt-fix-TEXTREL.patch"
+md5sums="f2f01b1fdc7262a2eede81ebed0970b2  webkit-1.8.1.tar.xz
+de77a3e7e61753e7f1cce3f4bd00a3f6  webkit-gtk-1.7.90-parallel-make-hack.patch
+8de7b9f904387a798e10ac4add61640c  webkit-1.8-textrels.patch"
diff --git a/main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch b/main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch
deleted file mode 100644
index 3757e719d3..0000000000
--- a/main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur webkit-1.6.1/Source/JavaScriptCore/jit/JITStubs.cpp webkit-1.6.1.new/Source/JavaScriptCore/jit/JITStubs.cpp
---- webkit-1.6.1/Source/JavaScriptCore/jit/JITStubs.cpp	2011-10-21 21:18:46.000000000 +0400
-+++ webkit-1.6.1.new/Source/JavaScriptCore/jit/JITStubs.cpp	2011-10-21 21:19:51.397529165 +0400
-@@ -80,7 +80,7 @@
- #define THUMB_FUNC_PARAM(name)
- #endif
- 
--#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86) || CPU(X86_64))
- #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
- #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
- #define SYMBOL_STRING_RELOCATION(name) "_" #name
-diff -ur webkit-1.6.1/Source/JavaScriptCore/jit/ThunkGenerators.cpp webkit-1.6.1.new/Source/JavaScriptCore/jit/ThunkGenerators.cpp
---- webkit-1.6.1/Source/JavaScriptCore/jit/ThunkGenerators.cpp	2011-10-21 21:18:46.000000000 +0400
-+++ webkit-1.6.1.new/Source/JavaScriptCore/jit/ThunkGenerators.cpp	2011-10-21 21:20:01.029529805 +0400
-@@ -108,7 +108,7 @@
- #define SYMBOL_STRING(name) #name
- #endif
-     
--#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86) || CPU(X86_64))
- #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
- #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
- #define SYMBOL_STRING_RELOCATION(name) "_" #name
diff --git a/main/webkit/webkit-1.8-textrels.patch b/main/webkit/webkit-1.8-textrels.patch
new file mode 100644
index 0000000000..77edc745d3
--- /dev/null
+++ b/main/webkit/webkit-1.8-textrels.patch
@@ -0,0 +1,11 @@
+--- ./Source/JavaScriptCore/wtf/InlineASM.h.orig
++++ ./Source/JavaScriptCore/wtf/InlineASM.h
+@@ -42,7 +42,7 @@
+ #define THUMB_FUNC_PARAM(name)
+ #endif
+ 
+-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
++#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86_64) || CPU(X86))
+ #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
+ #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
+ #define SYMBOL_STRING_RELOCATION(name) "_" #name
diff --git a/main/webkit/webkit-gtk-1.7.90-parallel-make-hack.patch b/main/webkit/webkit-gtk-1.7.90-parallel-make-hack.patch
new file mode 100644
index 0000000000..b632ca2791
--- /dev/null
+++ b/main/webkit/webkit-gtk-1.7.90-parallel-make-hack.patch
@@ -0,0 +1,21 @@
+Horrible failure of a hack to enable workaround for
+https://bugs.webkit.org/show_bug.cgi?id=79498
+
+--- a/GNUmakefile.am
++++ b/GNUmakefile.am
+@@ -285,6 +285,15 @@
+ all-local: stamp-po
+ 	$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
+ 
++# Horrible hack to enable workaround for parallel make failure
++all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
++
++all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
++
++all-programs-local: GNUmakefile $(PROGRAMS)
++
++all-data-local: GNUmakefile $(DATA)
++
+ # remove built sources and program directories
+ clean-local:
+ 	-rm -rf $(GENPROGRAMS)