updated xulrunner to 1.9.0.5

Signed-off-by: Zhang Le <r0bertz@gentoo.org>

4 files changed, 85 insertions, 35 deletions

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index c83c9ed..cabcc7d 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,7 +1,8 @@
-AUX xulrunner-1.9.0.4-mips-o32.patch 15856 RMD160 ce566e38083e4a64ff430d25ce829757052a7cb6 SHA1 f9c4194a7aebc1f1098aee32dafa92f09b782f29 SHA256 b8e6e009524e696dbf5a78de3fe6d3d2f4a90ce24158195fc323ab39deff7c5e
+AUX xulrunner-1.9.0.5-gcc4.4.patch 2175 RMD160 b936177429ae84bccc5b1dfaaf22fbae63910e00 SHA1 c2bbf6d5df7b60aa1f9522e2da6eb5fd8b1b9ae8 SHA256 73969e4c36517f50c527ec91e5b146fc8789ce01652b56acb478229ebac18376
+AUX xulrunner-mips-o32.patch 15862 RMD160 4232d7033e92a3057919cb077b9a90923fd46035 SHA1 75172f8241cb57f983d48ae24eb7aebba1f6991a SHA256 7adb297cbda0f80bfaa0e6e82fd214f48f2b09eb3f87461471cc2b5ad069f6d0
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
-DIST xulrunner-1.9.0.1-patches-0.1.tar.bz2 5730 RMD160 3b5acec5d09a1c818c51e794889a113fb2fcddf9 SHA1 74638b82cd9afd26530facd8ddc336edcc6daad0 SHA256 986f32661f6f3452f95da833b1a73dfdd8d6c6f18e0759cb7910b53709c21bf0
-DIST xulrunner-1.9.0.4.tar.bz2 34070622 RMD160 13d5054b6967ee8290bcc098592c7848bbdb6bbd SHA1 75725d0e10c5c65b70a539f01f9c3f49008e262f SHA256 51846df9417f346b747bb51e79b0f99b7ecbf1cf9eabee047c302b6b66dd13c1
-EBUILD xulrunner-1.9.0.4-r1.ebuild 5348 RMD160 f77b002b4ffc5a516ea1243bcd8a2bb91375dae3 SHA1 91ce83fd6abaf67584d3c2056083d7b9eaaca6c0 SHA256 8167a765446e295fa5167b054cd681291587e1fd8da6714323ab168124647485
+DIST xulrunner-1.9.0.5-patches-0.1.tar.bz2 6659 RMD160 6b77cd5f96e9b7c1eab7abd1d781853c425db6e2 SHA1 5b6d7e87a08dd779daf685a0516d149f4f83a071 SHA256 94c38808d4722fb5fe480af80cd88e4095a52fa82ffb6f0ea550f5decc780b4a
+DIST xulrunner-1.9.0.5.tar.bz2 34098825 RMD160 7bb4b42c9277ed1d16ebf40eac1e480664f999bf SHA1 f980f54d4ce5dd1e763eb41f9379c4e9729c066b SHA256 7d8c1f6338402fff99936d67b38fca21ce2099a7c9fdb0be91fdd3adbaf8742f
+EBUILD xulrunner-1.9.0.5.ebuild 5122 RMD160 37da0c1c4aedd0d49b1ee8a7eefc28db535b9f95 SHA1 33f377a4f77cc6444859044b2a979fa4ad63c218 SHA256 63c240ec1e28174b1eafeb1ec27bc6f97e287c802326605840670b65e9e586bf
 MISC ChangeLog 20231 RMD160 53d013acdc632eee5a57c68cc91590a9d97d322b SHA1 50a8a72f61cdf952923a6c40d3ddbdafa10682fc SHA256 4dc8981ad9cda5b06ff6f5e7b826a01d32082c6a306879ee1e3923a8aa93a449
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/xulrunner-1.9.0.5-gcc4.4.patch b/net-libs/xulrunner/files/xulrunner-1.9.0.5-gcc4.4.patch
new file mode 100644
index 0000000..d74dca7
--- /dev/null
+++ b/net-libs/xulrunner/files/xulrunner-1.9.0.5-gcc4.4.patch
@@ -0,0 +1,61 @@
+--- ./netwerk/socket/base/nsUDPSocketProvider.h.orig	2009-01-08 16:23:30.000000000 +0800
++++ ./netwerk/socket/base/nsUDPSocketProvider.h	2009-01-08 16:23:35.000000000 +0800
+@@ -45,7 +45,6 @@
+     NS_DECL_ISUPPORTS
+     NS_DECL_NSISOCKETPROVIDER
+ 
+-private:
+     ~nsUDPSocketProvider();
+ 
+ };
+--- ./toolkit/xre/nsAppRunner.cpp.orig	2009-01-09 00:33:39.000000000 +0800
++++ ./toolkit/xre/nsAppRunner.cpp	2009-01-09 00:33:48.000000000 +0800
+@@ -1459,7 +1459,7 @@
+   if (NS_FAILED(rv))
+     return rv;
+ 
+-#elif
++#else
+ #error Oops, you need platform-specific code here
+ #endif
+ 
+--- ./layout/base/nsLayoutHistoryState.cpp.orig	2009-01-08 19:41:07.000000000 +0800
++++ ./layout/base/nsLayoutHistoryState.cpp	2009-01-08 19:41:15.000000000 +0800
+@@ -59,10 +59,10 @@
+   NS_IMETHOD GetState(const nsCString& aKey, nsPresState** aState);
+   NS_IMETHOD RemoveState(const nsCString& aKey);
+   NS_IMETHOD_(PRBool) HasStates() const;
++  ~nsLayoutHistoryState() {}
+ 
+ 
+ private:
+-  ~nsLayoutHistoryState() {}
+ 
+   nsClassHashtable<nsCStringHashKey,nsPresState> mStates;
+ };
+--- ./widget/src/gtk2/nsImageToPixbuf.h.orig	2009-01-08 18:09:05.000000000 +0800
++++ ./widget/src/gtk2/nsImageToPixbuf.h	2009-01-08 18:13:20.000000000 +0800
+@@ -56,10 +56,10 @@
+                                           PRInt32 aWidth, PRInt32 aHeight);
+         static GdkPixbuf* PatternToPixbuf(gfxPattern* aPattern,
+                                           PRInt32 aWidth, PRInt32 aHeight);
++        ~nsImageToPixbuf() {}
+     private:
+         static GdkPixbuf* ImgSurfaceToPixbuf(gfxImageSurface* aImgSurface,
+                                              PRInt32 aWidth, PRInt32 aHeight);
+-        ~nsImageToPixbuf() {}
+ };
+ 
+ 
+--- ./widget/src/gtk2/nsNativeKeyBindings.h.orig	2009-01-08 18:13:33.000000000 +0800
++++ ./widget/src/gtk2/nsNativeKeyBindings.h	2009-01-08 18:13:59.000000000 +0800
+@@ -90,8 +90,8 @@
+                                    DoCommandCallback aCallback,
+                                    void *aCallbackData);
+ 
+-private:
+   ~nsNativeKeyBindings() NS_HIDDEN;
++private:
+ 
+   PRBool KeyPressInternal(const nsNativeKeyEvent& aEvent,
+                           DoCommandCallback aCallback,
diff --git a/net-libs/xulrunner/files/xulrunner-1.9.0.4-mips-o32.patch b/net-libs/xulrunner/files/xulrunner-mips-o32.patch
index c841e2d..2e3ed2c 100644
--- a/net-libs/xulrunner/files/xulrunner-1.9.0.4-mips-o32.patch
+++ b/net-libs/xulrunner/files/xulrunner-mips-o32.patch
@@ -412,7 +412,7 @@
 -ifdef GNU_CC
 -ASFLAGS		+= $(INCLUDES) -x assembler-with-cpp -D__GNUC__
 -endif
-+ASFLAGS		+= -I$(PUBLIC) -x assembler-with-cpp
++ASFLAGS		+= -I$(PUBLIC) -x assembler-with-cpp -fPIC
  endif
  endif
  
diff --git a/net-libs/xulrunner/xulrunner-1.9.0.4-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.0.5.ebuild
index 130acde..5b7060a 100644
--- a/net-libs/xulrunner/xulrunner-1.9.0.4-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.0.5.ebuild
@@ -1,25 +1,25 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.4-r1.ebuild,v 1.4 2008/12/14 21:49:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.0.5.ebuild,v 1.12 2008/12/31 03:40:00 mr_bones_ Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools
-PATCH="${PN}-1.9.0.1-patches-0.1"
+PATCH="${P}-patches-0.1"
 
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-	mirror://gentoo/${PATCH}.tar.bz2"
+	mirror://gentoo/${PATCH}.tar.bz2
+	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 -sparc x86"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="python"
+IUSE=""
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
-	python? ( >=dev-lang/python-2.3 )
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12
 	>=dev-libs/nspr-4.7.1
@@ -59,7 +59,8 @@ src_unpack() {
 
 	# Apply our patches
 	cd "${S}" || die "cd failed"
-	epatch ${FILESDIR}/xulrunner-1.9.0.4-mips-o32.patch
+	epatch ${FILESDIR}/xulrunner-mips-o32.patch
+	epatch ${FILESDIR}/xulrunner-1.9.0.5-gcc4.4.patch
 
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
@@ -84,9 +85,12 @@ src_compile() {
 	mozconfig_config
 
 	MEXTENSIONS="default"
-	if use python; then
-		MEXTENSIONS="${MEXTENSIONS},python/xpcom"
-	fi
+#	if use python; then
+#		MEXTENSIONS="${MEXTENSIONS},python/xpcom"
+#	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
 
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 	mozconfig_annotate '' --disable-mailnews
@@ -121,13 +125,11 @@ src_compile() {
 	# Finalize and report settings
 	mozconfig_final
 
-	# -fstack-protector breaks us
-	if gcc-version ge 4 1; then
-		gcc-specs-ssp && append-flags -fno-stack-protector
-	else
-		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	if use amd64 ; then
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			filter-flags -fstack-protector -fstack-protector-all
+		fi
 	fi
-	filter-flags -fstack-protector -fstack-protector-all
 
 	####################################
 	#
@@ -168,17 +170,3 @@ src_install() {
 	    rm -f "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
 	fi
 }
-
-pkg_postinst() {
-	if use python; then
-		python_version
-		python_mod_optimize ${ROOT}/usr/$(get_libdir)/${PN}-1.9/python/xpcom
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_version
-		python_mod_cleanup ${ROOT}/usr/$(get_libdir)/${PN}-1.9/python/xpcom
-	fi
-}