Fix sparc build issue thanks armin76, fix -alsa build error, change networkmanager to wifi useflag

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 253 insertions, 2 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index ebf68817f3c6..f481b7968513 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.288 2010/01/22 03:59:01 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.289 2010/01/29 15:00:31 anarchy Exp $
+
+*xulrunner-1.9.2-r1 (29 Jan 2010)
+
+  29 Jan 2010; <anarchy@gentoo.org> +xulrunner-1.9.2-r1.ebuild,
+  +files/xulrunner-1.9.2-noalsa-fixup.patch:
+  Fix sparc build issue thanks armin76, fix -alsa build error, change
+  networkmanager to wifi useflag
 
   22 Jan 2010; <anarchy@gentoo.org> +files/301-xulrunner-xpctools.diff,
   +files/xulrunner-1.9.2-fix-pkgconfig-file.patch:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 36376beef977..f3ff47d191e5 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -4,6 +4,7 @@ AUX 301-xulrunner-xpctools.diff 550 RMD160 12d370d5473de5c54233a70533cd35e37305e
 AUX xulrunner-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a4e5 SHA1 741a8679bb6d65d83dfdc1ea0cd277c08b3bcc7e SHA256 2bb5b927e11307daf14b4cdab381fba27c6fcb0ba8631e7952d38821282e2c6f
 AUX xulrunner-1.8.1.19-glibc-2.10-support.patch 696 RMD160 171629110f94ecf974e7d0ac71ac842f16786b27 SHA1 316f3f325ed219643362a1837dd8451000945393 SHA256 1cf9a4c0dd54a537886dff05be9e996fc25e63518f5eaef5781492a2a21150b2
 AUX xulrunner-1.9.2-fix-pkgconfig-file.patch 397 RMD160 f1724e2476d21751e59845826dfc76dadd9db048 SHA1 0f70bfb689cba2fc609b6642408c41b0032422bc SHA256 74590a970f96a767c353e5530e40048c3c1ea0f652029eb35e782029c0b45d6e
+AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 DIST firefox-3.5.4.source.tar.bz2 46905557 RMD160 e89ff54fef6d036538c9779176f5086a8eaa721e SHA1 ce250208371326d03e72a02d223bc136cd376e5d SHA256 b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4
@@ -19,6 +20,7 @@ DIST xulrunner-1.9.0.12-patches-0.1.tar.bz2 6548 RMD160 135cf202dd34c2dce5624d15
 DIST xulrunner-1.9.0.14.tar.bz2 34461953 RMD160 63d9e54f1a1ca5f1457ce4e59ebc330ae6e93c9b SHA1 8493943e9e2af37b447b178f5485792e2bd87f5a SHA256 17ff6bf9d87431962773eaaeebeb7fb7c0d4eac4c920bf4d65738932c47a2f15
 DIST xulrunner-1.9.1.5-patches-0.1.tar.bz2 9101 RMD160 36f8658905a286a20040b962b66529c073cf56bf SHA1 2a474a0d3a94ceea95e407829d9038a2b0777742 SHA256 137889839f8a57dd8e2fb231f8c67c906037958399cd65102299918a84ddf9ec
 DIST xulrunner-1.9.2-patches-0.2.tar.bz2 5221 RMD160 101cab908c979387db09b3a22172bdb22e9f094b SHA1 c0f0fd7fd320b2629856119e2df8a69b5263a5cc SHA256 8c5a09c6b09a4a4bca5825b58f056928dd077637624b5017bd9dd28c8d49ae63
+DIST xulrunner-1.9.2-patches-0.4.tar.bz2 5742 RMD160 d67504884a5959704d8cb2cfa7ff42401f328ac1 SHA1 3e1ba98046b9a4408e3eceb919ee9439ef328bdc SHA256 89db8d1cb166e97d56f911ebdfb8de852ab4335f137a4b7163345e8273a63d3f
 EBUILD xulrunner-1.8.1.19.ebuild 5164 RMD160 35f73e1a6e27b86f3e94e3000a6d5e197f5eff9b SHA1 0874e166bb9f80c0032bb79c881f8d281be9931d SHA256 53ef65858659ae8843234751632f2a806b73aec3a34cc846e9a42f175e4a6a2b
 EBUILD xulrunner-1.9.0.11-r1.ebuild 4789 RMD160 9b685ad897cb07e281d9afef45f55dd19411ab6c SHA1 d2dd0af1f255f677af64dfaa139df237f7b4686c SHA256 2f65999d4351f7758eb8f7eb0e592c352363f00f527bbac4e8d5e74a5e3afa00
 EBUILD xulrunner-1.9.0.14.ebuild 4938 RMD160 90dab4447b3470cca3da354555665fe4b8b2f4fa SHA1 0c7a70964acad5a9a59e379199914a4f440fc979 SHA256 5927ce6c646f4bc73edef6d404a8c253d59af276ee6ca8050181f059289a4d70
@@ -26,6 +28,7 @@ EBUILD xulrunner-1.9.1.4.ebuild 8083 RMD160 cf019f3caf30cf392e02db5c40a4efc598d6
 EBUILD xulrunner-1.9.1.5.ebuild 7904 RMD160 ca18e0d56bab21213b7d4b69bad6a13430df4466 SHA1 a8a96494ea2744661f0905436083068057b6a809 SHA256 b7168787c64404c1bd33414332aa5899c8cc5868d15d6dfaff11a140beb40434
 EBUILD xulrunner-1.9.1.6.ebuild 7948 RMD160 695e34e5df196b6c419610069f6d0ee9274baa97 SHA1 2dfc7b3426fc14953c220993f53a129376ae54ff SHA256 7bf9dfd7c026c41c4d0d4c261b086c6b79b66076e97439d8a3e39d184f2bf516
 EBUILD xulrunner-1.9.1.7.ebuild 7957 RMD160 a11e27794c9725dfb73b612ad97078eb7242adde SHA1 4d6be4e40714128b3f28ad22744e12e7b35b1577 SHA256 78a3b4e11c57a685f73eadcd5353c2e154cfef3e694857d115771d18100b7b17
+EBUILD xulrunner-1.9.2-r1.ebuild 6721 RMD160 c20afdbf1a3a20fd07b5fa60d57abddde2f27a36 SHA1 2bd53157fdd5dc08c57933a131df3c2e37aa7682 SHA256 16683ac8aee65d9f1ef0563c824bcdd485887e7f14a9fe870c726a2e2ad4db8b
 EBUILD xulrunner-1.9.2.ebuild 6667 RMD160 99b51dd34252db395772b8203a1fc576d0fdb943 SHA1 8b2753ad25d05a0c18e34fc0df8c743adf411a38 SHA256 d586cb8ec4e4915213b86233b3cecdc7ae98cab0e99a9e14a08339963774460e
-MISC ChangeLog 38590 RMD160 3b4124ad4244dad82dfc48e5b87be40b25f0bb73 SHA1 f2f55e162867c56f165eeb27fee4de01eb1c6569 SHA256 babcf714ba97db2ed84e9d2d37bdc8c35ac5e5a3b7b2cb0e30089355f2d3e76e
+MISC ChangeLog 38838 RMD160 6b6528ed845462ae3089bc4a3fc1d25f04873a2e SHA1 c1d8a159d9e2238c4c9bed8274b3da5d7cf48b6f SHA256 a6fb10f5c1ab2c1fba655c4f2129b5cd0ee869c9d17925615373041546c737b8
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
diff --git a/net-libs/xulrunner/files/xulrunner-1.9.2-noalsa-fixup.patch b/net-libs/xulrunner/files/xulrunner-1.9.2-noalsa-fixup.patch
new file mode 100644
index 000000000000..1fc7b6f87e65
--- /dev/null
+++ b/net-libs/xulrunner/files/xulrunner-1.9.2-noalsa-fixup.patch
@@ -0,0 +1,26 @@
+diff -urN mozilla-1.9.2-orig/content/base/src/nsDocument.cpp mozilla-1.9.2/content/base/src/nsDocument.cpp
+--- mozilla-1.9.2-orig/content/base/src/nsDocument.cpp	2010-01-28 22:16:08.683135912 -0600
++++ mozilla-1.9.2/content/base/src/nsDocument.cpp	2010-01-28 22:17:57.605126833 -0600
+@@ -169,7 +169,9 @@
+ #include "nsIPropertyBag2.h"
+ #include "nsIDOMPageTransitionEvent.h"
+ #include "nsFrameLoader.h"
++#ifdef MOZ_MEDIA
+ #include "nsHTMLMediaElement.h"
++#endif
+ 
+ #include "mozAutoDocUpdate.h"
+ 
+diff -urN mozilla-1.9.2-orig/content/base/src/nsNodeUtils.cpp mozilla-1.9.2/content/base/src/nsNodeUtils.cpp
+--- mozilla-1.9.2-orig/content/base/src/nsNodeUtils.cpp	2010-01-28 22:16:08.686138846 -0600
++++ mozilla-1.9.2/content/base/src/nsNodeUtils.cpp	2010-01-28 22:17:14.618150370 -0600
+@@ -55,7 +55,9 @@
+ #endif
+ #include "nsBindingManager.h"
+ #include "nsGenericHTMLElement.h"
++#ifdef MOZ_MEDIA
+ #include "nsHTMLMediaElement.h"
++#endif
+ 
+ // This macro expects the ownerDocument of content_ to be in scope as
+ // |nsIDocument* doc|
diff --git a/net-libs/xulrunner/xulrunner-1.9.2-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..28d354a61348
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.2-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2-r1.ebuild,v 1.1 2010/01/29 15:00:31 anarchy Exp $
+
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools
+
+MY_PV="${PV/_rc/rc}" # Handle beta
+MY_PV="${MY_PV/1.9.2/3.6}"
+MAJ_PV="1.9.2" # from mozilla-* branch name
+PATCH="${PN}-1.9.2-patches-0.4"
+
+DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
+HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
+	http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="1.9"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa debug libnotify wifi"
+
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	>=dev-lang/python-2.3[threads]
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.4
+	>=dev-libs/nspr-4.8
+	>=dev-db/sqlite-3.6.20-r1[fts3]
+	alsa? ( media-libs/alsa-lib )
+	>=app-text/hunspell-1.2
+	>=media-libs/lcms-1.17
+	>=x11-libs/cairo-1.8.8[X]
+	x11-libs/pango[X]
+	x11-libs/libXt
+	wifi? ( net-wireless/wireless-tools )
+	libnotify? ( >=x11-libs/libnotify-0.4 )"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )
+	${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/mozilla-${MAJ_PV}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Fix build error for xpctools
+	epatch "${FILESDIR}/301-xulrunner-xpctools.diff"
+
+	# Fix broken mozilla-plugin.pc
+	epatch "${FILESDIR}/${PN}-1.9.2-fix-pkgconfig-file.patch"
+
+	# Fix broken media support
+	epatch "${FILESDIR}/${PN}-1.9.2-noalsa-fixup.patch"
+
+	# Same as in config/autoconf.mk.in
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
+
+	# Gentoo install dirs
+	sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
+		|| die "${MAJ_PV} sed failed!"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+
+	# Patch in support to reset all LANG variables to C
+	# Do NOT add to patchset as it must be applied after eautoreconf
+	epatch "${FILESDIR}/000_flex-configure-LANG.patch"
+}
+
+src_configure() {
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	MEXTENSIONS="default"
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-application=xulrunner
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'places' --enable-storage --enable-places
+	mozconfig_annotate '' --enable-safe-browsing
+
+	# Build mozdevelop permately
+	mozconfig_annotate ''  --enable-jsd --enable-xpctools
+
+	# System-wide install specs
+	mozconfig_annotate '' --disable-installer
+	mozconfig_annotate '' --disable-updater
+	mozconfig_annotate '' --disable-strip
+	mozconfig_annotate '' --disable-install-strip
+
+	# Use system libraries
+	mozconfig_annotate '' --enable-system-cairo
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --enable-system-lcms
+	mozconfig_annotate '' --with-system-bz2
+
+	mozconfig_use_enable libnotify
+	mozconfig_use_enable java javaxpcom
+	mozconfig_use_enable wifi necko-wifi
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+
+	# Debug
+	if use debug ; then
+		mozconfig_annotate 'debug' --disable-optimize
+		mozconfig_annotate 'debug' --enable-debug=-ggdb
+		mozconfig_annotate 'debug' --enable-debug-modules=all
+		mozconfig_annotate 'debug' --enable-debugger-info-modules
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-flags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${D}"/usr/bin/xulrunner
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
+
+	dodir /usr/bin
+	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
+
+	# env.d file for ld search path
+	dodir /etc/env.d
+	echo "LDPATH=${MOZLIBDIR}" > "${D}"/etc/env.d/08xulrunner || die "env.d failed"
+
+	# Add our defaults to xulrunner and out of firefox
+	cp "${FILESDIR}"/xulrunner-default-prefs.js \
+		"${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
+			die "failed to cp xulrunner-default-prefs.js"
+
+	if use java ; then
+		java-pkg_regjar "${D}/${MOZLIBDIR}/javaxpcom.jar"
+		java-pkg_regjar "${D}/${SDKDIR}/lib/MozillaGlue.jar"
+		java-pkg_regjar "${D}/${SDKDIR}/lib/MozillaInterfaces.jar"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
+	ewarn "If that does not fix the problem, rebuild dev-libs/nss"
+	ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
+
+	einfo
+	einfo "All prefs can be overridden by the user. The preferences are to make"
+	einfo "use of xulrunner out of the box on an average system without the user"
+	einfo "having to go through and enable the basics."
+
+	einfo
+	ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
+	ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
+	ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
+}