From eec45c545a0506ecd720f68f78deaed1cd53fad2 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 24 Mar 2010 22:32:55 +0000 Subject: Bump nss dependency to prevent internal copy from being used. Fixes bug 311167 (Portage version: 2.1.8.3/cvs/Linux i686) --- net-libs/xulrunner/ChangeLog | 9 +- net-libs/xulrunner/xulrunner-1.9.2.2-r1.ebuild | 221 +++++++++++++++++++++++++ net-libs/xulrunner/xulrunner-1.9.2.2.ebuild | 221 ------------------------- 3 files changed, 229 insertions(+), 222 deletions(-) create mode 100644 net-libs/xulrunner/xulrunner-1.9.2.2-r1.ebuild delete mode 100644 net-libs/xulrunner/xulrunner-1.9.2.2.ebuild (limited to 'net-libs/xulrunner') diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog index 9c17c89c7600..ac90b7fd83b1 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.301 2010/03/24 12:49:15 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.302 2010/03/24 22:32:55 nirbheek Exp $ + +*xulrunner-1.9.2.2-r1 (24 Mar 2010) + + 24 Mar 2010; Nirbheek Chauhan + -xulrunner-1.9.2.2.ebuild, +xulrunner-1.9.2.2-r1.ebuild: + Bump nss dependency to prevent internal copy from being used. Fixes bug + 311167 *xulrunner-1.9.2.2 (24 Mar 2010) diff --git a/net-libs/xulrunner/xulrunner-1.9.2.2-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.2-r1.ebuild new file mode 100644 index 000000000000..61338409cc06 --- /dev/null +++ b/net-libs/xulrunner/xulrunner-1.9.2.2-r1.ebuild @@ -0,0 +1,221 @@ +# 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.2-r1.ebuild,v 1.1 2010/03/24 22:32:55 nirbheek 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 system-sqlite wifi" + +RDEPEND="java? ( >=virtual/jre-1.4 ) + >=dev-lang/python-2.3[threads] + >=sys-devel/binutils-2.16.1 + >=dev-libs/nss-3.12.6 + >=dev-libs/nspr-4.8 + system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) + 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() { + # Ensure we always build with C locale. + export LANG="C" + export LC_ALL="C" + export LC_MESSAGES="C" + export LC_CTYPE="C" + + 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" + + # Fix broken alignment + epatch "${FILESDIR}/1000_fix_alignment.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 +} + +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 + mozconfig_use_enable system-sqlite + + # 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 ." +} diff --git a/net-libs/xulrunner/xulrunner-1.9.2.2.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.2.ebuild deleted file mode 100644 index 78a05cef83e9..000000000000 --- a/net-libs/xulrunner/xulrunner-1.9.2.2.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# 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.2.ebuild,v 1.1 2010/03/24 12:49:15 nirbheek 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 system-sqlite 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 - system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) - 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() { - # Ensure we always build with C locale. - export LANG="C" - export LC_ALL="C" - export LC_MESSAGES="C" - export LC_CTYPE="C" - - 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" - - # Fix broken alignment - epatch "${FILESDIR}/1000_fix_alignment.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 -} - -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 - mozconfig_use_enable system-sqlite - - # 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 ." -} -- cgit v1.2.3-65-gdbad