From 08927d07ec02e105a236333719fe255f4c54d93d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sun, 6 Nov 2011 17:03:02 +0000
Subject: main/webkit: fix textrels

ref #793
---
 main/webkit/APKBUILD                           | 14 +++++++++++---
 main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch

diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD
index c90bfb4bb..34534e7c3 100644
--- a/main/webkit/APKBUILD
+++ b/main/webkit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=webkit
 pkgver=1.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="http://webkitgtk.org/"
 arch="all"
@@ -18,7 +18,9 @@ makedepends="
 	"
 install=
 subpackages="$pkgname-dev gtklauncher $pkgname-lang"
-source="http://webkitgtk.org/$pkgname-$pkgver.tar.gz"
+source="http://webkitgtk.org/$pkgname-$pkgver.tar.gz
+	webkit-1.6.1-alt-fix-TEXTREL.patch
+	"
 
 depends_dev="gtk+-dev libsoup-dev gstreamer-dev"
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -50,6 +52,11 @@ 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
 }
 
 gtklauncher() {
@@ -60,4 +67,5 @@ gtklauncher() {
 		"$subpkgdir"/usr/bin/GtkLauncher
 }
 
-md5sums="c11743694b1b71dad287b2e7a9e73b05  webkit-1.6.1.tar.gz"
+md5sums="c11743694b1b71dad287b2e7a9e73b05  webkit-1.6.1.tar.gz
+4e47996e3bb87ca27c0e49ce6a2abbc7  webkit-1.6.1-alt-fix-TEXTREL.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
new file mode 100644
index 000000000..3757e719d
--- /dev/null
+++ b/main/webkit/webkit-1.6.1-alt-fix-TEXTREL.patch
@@ -0,0 +1,24 @@
+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
-- 
cgit v1.2.3