main/webkitgtk: rename from webkit and upgrade to 1.10.0

3 files changed, 129 insertions, 0 deletions

diff --git a/main/webkitgtk/APKBUILD b/main/webkitgtk/APKBUILD
new file mode 100644
index 0000000000..d75175481b
--- /dev/null
+++ b/main/webkitgtk/APKBUILD
@@ -0,0 +1,97 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=webkitgtk
+pkgver=1.10.0
+pkgrel=0
+pkgdesc="portable web rendering engine WebKit for GTK+"
+url="http://webkitgtk.org/"
+arch="all"
+license="LGPL BSD"
+depends=
+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
+	gtk+2.0-dev
+	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
+	ruby
+	sqlite-dev
+	zlib-dev
+	"
+install=
+subpackages="$pkgname-dev $pkgname-lang"
+source="http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
+	webkit-gtk-1.7.90-parallel-make-hack.patch
+	webkitgtk-1.10-textrels.patch
+	"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case "$i" in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+	libtoolize --force && aclocal -I Source/autotools && autoconf && automake || return 1
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--disable-geolocation \
+		--with-gtk=3.0 \
+		|| 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() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+	# verify so we don't have textrels
+	if scanelf -qRt "$pkgdir" | grep TEXTREL; then
+		error "found textrels"
+		return 1
+	fi
+}
+
+md5sums="6da450ec7793c0a7873d8c8c2cae4eb8  webkitgtk-1.10.0.tar.xz
+de77a3e7e61753e7f1cce3f4bd00a3f6  webkit-gtk-1.7.90-parallel-make-hack.patch
+9ace721086b25f0f32d7f76b29789f67  webkitgtk-1.10-textrels.patch"
diff --git a/main/webkitgtk/webkit-gtk-1.7.90-parallel-make-hack.patch b/main/webkitgtk/webkit-gtk-1.7.90-parallel-make-hack.patch
new file mode 100644
index 0000000000..b632ca2791
--- /dev/null
+++ b/main/webkitgtk/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)
diff --git a/main/webkitgtk/webkitgtk-1.10-textrels.patch b/main/webkitgtk/webkitgtk-1.10-textrels.patch
new file mode 100644
index 0000000000..7f2dda2d48
--- /dev/null
+++ b/main/webkitgtk/webkitgtk-1.10-textrels.patch
@@ -0,0 +1,11 @@
+--- ./Source/WTF/wtf/InlineASM.h.orig
++++ ./Source/WTF/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 GLOBAL_REFERENCE(name) #name "@plt"
+ #elif CPU(X86) && COMPILER(MINGW)
+ #define GLOBAL_REFERENCE(name) "@" #name "@4"