Revert "main/xulrunner: upgrade to 9.0.1"

Firefox 9.0.1 freezes.

This reverts commit e4e33bfa311c50c286065444cae974e224457a18.

2 files changed, 89 insertions, 4 deletions

diff --git a/main/xulrunner/0001-mozilla-pkgconfig.patch.patch b/main/xulrunner/0001-mozilla-pkgconfig.patch.patch
new file mode 100644
index 0000000000..b8beae40f6
--- /dev/null
+++ b/main/xulrunner/0001-mozilla-pkgconfig.patch.patch
@@ -0,0 +1,83 @@
+From f00f666955c2e4053e0cff90f787dc5b980bcb18 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 25 Nov 2011 08:23:35 +0000
+Subject: [PATCH 1/4] mozilla-pkgconfig.patch
+
+---
+ xulrunner/installer/Makefile.in                    |    1 +
+ xulrunner/installer/libxul-embedding.pc.in         |    1 +
+ xulrunner/installer/libxul.pc.in                   |    1 +
+ .../installer/mozilla-gtkmozembed-embedding.pc.in  |    1 +
+ xulrunner/installer/mozilla-gtkmozembed.pc.in      |    1 +
+ xulrunner/installer/mozilla-js.pc.in               |    2 +-
+ 6 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
+index 35febf9..38d854d 100644
+--- a/xulrunner/installer/Makefile.in
++++ b/xulrunner/installer/Makefile.in
+@@ -110,6 +110,7 @@ endif
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
++	-e "s|%libdir%|$(installdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
+diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in
+index 100e0a7..97b7cb4 100644
+--- a/xulrunner/installer/libxul-embedding.pc.in
++++ b/xulrunner/installer/libxul-embedding.pc.in
+@@ -6,5 +6,6 @@ idldir=%idldir%
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue -ldl
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
+diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in
+index ccce9aa..92e8502 100644
+--- a/xulrunner/installer/libxul.pc.in
++++ b/xulrunner/installer/libxul.pc.in
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ idldir=%idldir%
+ 
+diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+index 03bd646..4d2b62d 100644
+--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
++++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ 
+ Name: mozilla-gtkembedmoz
+diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in
+index a25c05e..cd0d600 100644
+--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in
++++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in
+@@ -1,5 +1,6 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
++libdir=%libdir%
+ includedir=%includedir%
+ 
+ Name: mozilla-gtkembedmoz
+diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in
+index c1428f1..a528ef1 100644
+--- a/xulrunner/installer/mozilla-js.pc.in
++++ b/xulrunner/installer/mozilla-js.pc.in
+@@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
+-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+-- 
+1.7.7.4
+
diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 6fadead67f..24f95afa8f 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xulrunner
-pkgver=9.0.1
-_ffoxver=9.0.1
-pkgrel=0
+pkgver=8.0.1
+_ffoxver=8.0.1
+pkgrel=1
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -45,6 +45,7 @@ subpackages="$pkgname-dev"
 source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
 
 	mozconfig
+	0001-mozilla-pkgconfig.patch.patch
 	0002-Use-C99-math-isfinite.patch
 	0003-xulrunner-jemalloc-aslr.patch
 	0004-xulrunner-malloc_usable_size.patch
@@ -101,8 +102,9 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="7cf2bd379792a9b232267c6a79680566  firefox-9.0.1.source.tar.bz2
+md5sums="b7d09b082e88a74860a51a8e04e29333  firefox-8.0.1.source.tar.bz2
 b0f7d491bc800b69ec718667a4b08acb  mozconfig
+731ec4084e57eb05e93000c971aad0d4  0001-mozilla-pkgconfig.patch.patch
 1867db217d10722675c88b655db8c2d7  0002-Use-C99-math-isfinite.patch
 7faa279d64c9ec2e7abc7c0497c7e07e  0003-xulrunner-jemalloc-aslr.patch
 7cf18be3ada3eed5856fbab24219126d  0004-xulrunner-malloc_usable_size.patch"