diff options
author | 2012-07-04 20:00:48 +0200 | |
---|---|---|
committer | 2012-07-04 20:02:03 +0200 | |
commit | 06465c14a95f570dd11631dfe25f3e11413e2473 (patch) | |
tree | c7b6e740110de1068fcabe2011c2dfeeb8a722e9 | |
parent | Use x86-gentoo's layout.conf for Manifest generation. (diff) | |
download | DuPol-06465c14a95f570dd11631dfe25f3e11413e2473.tar.gz DuPol-06465c14a95f570dd11631dfe25f3e11413e2473.tar.bz2 DuPol-06465c14a95f570dd11631dfe25f3e11413e2473.zip |
[net-libs/xulrunner] Drop version without upstream release tarball.
-rw-r--r-- | net-libs/xulrunner/ChangeLog | 6 | ||||
-rw-r--r-- | net-libs/xulrunner/Manifest | 9 | ||||
-rw-r--r-- | net-libs/xulrunner/files/bug-606109.patch | 48 | ||||
-rw-r--r-- | net-libs/xulrunner/files/xulrunner-default-prefs.js | 14 | ||||
-rw-r--r-- | net-libs/xulrunner/xulrunner-1.9.2.24.ebuild | 262 |
5 files changed, 7 insertions, 332 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog index 65be1ec..c7d1b2e 100644 --- a/net-libs/xulrunner/ChangeLog +++ b/net-libs/xulrunner/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for net-libs/xulrunner -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Jul 2012; Dustin Polke <DuPol@gmx.de> -xulrunner-1.9.2.24.ebuild, + -files/bug-606109.patch, -files/xulrunner-default-prefs.js: + Drop version with removed release tarball. + 18 Dec 2011; Dustin Polke <DuPol@gmx.de> metadata.xml: Change email address. diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest index 60c26d5..56be04a 100644 --- a/net-libs/xulrunner/Manifest +++ b/net-libs/xulrunner/Manifest @@ -1,7 +1,2 @@ -AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc -AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8 -DIST firefox-3.6.24.source.tar.bz2 51684019 RMD160 61d00f2976353d13c119b922c2ee677b7f3e9dfd SHA1 973d298e2fc177beb815fc5371e0383ec638cee0 SHA256 4e3606672ed54d977981d3331b8aaf1f5572eabc351d95eec25390fabcc72fee -DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a -EBUILD xulrunner-1.9.2.24.ebuild 8424 RMD160 357ebf4cbf030c47f4ecc534cad491efde16ea2a SHA1 5adf25db379e2ef2f796f9061908b980aa96049b SHA256 37c3426c59f1d2dfef2fd41454e43a9b827a2bfc4dc6fcce29918f878b1fea10 -MISC ChangeLog 479 RMD160 f6e8c6da176e7577faf2b2e3a2dfa01de97d3c0e SHA1 b5e78583803bade6af7c71ec9a8fd7593d1e6ef4 SHA256 137c6fc3dd0f42ee235667ce28fc2e853d595bdbf73f5795cbf2a30d7a400acf -MISC metadata.xml 604 RMD160 14fda7c09072273b75a304cf5c122a7e76ac95e7 SHA1 502a9a00c7a48bda1915563bdf292da5726385a6 SHA256 8c9c776bb6419db14ae072c196c93f533b3f61b175ccde97388a5b551e969720 +MISC ChangeLog 658 SHA256 726447b6907cff61eea09091168c8886682eeda68d6ea2dcc0667f03583e4876 SHA512 90cc058b25901ce994d0b038356f1798b17d1bdd33997cc5c766a781d770ce2a385d0bc0d35770461d57b24ee4a9be711669c4e251d58b07d229f307ebb02b88 WHIRLPOOL 2e8ff24a255b03edc7a9a40d311cf8a495c57daec7bcb0572005741f0eaf130f9f624b4bfd2721f668947a3f58c9d73f886833e3cd5ef7e7ad94609c0b47a0d3 +MISC metadata.xml 604 SHA256 8c9c776bb6419db14ae072c196c93f533b3f61b175ccde97388a5b551e969720 SHA512 bdb73eee73282e8bd450fe8f46be60c915c58db36fb8938c924f48ed9b602e7a942c0d35b6bafedd5542f8e547cc34e6a70e3a2b83d4dca3a4b3f06767aff93f WHIRLPOOL 30f7972fb8a44ca08f65a1ce9f387bb3e3fa8917886c532c9296912d3c742e723544f1924351dfc5720b42e03917f0b31bd7f20a0a939750563a0b722be69668 diff --git a/net-libs/xulrunner/files/bug-606109.patch b/net-libs/xulrunner/files/bug-606109.patch deleted file mode 100644 index 93f1142..0000000 --- a/net-libs/xulrunner/files/bug-606109.patch +++ /dev/null @@ -1,48 +0,0 @@ -# HG changeset patch -# User Jory A. Pratt <anarchy@gentoo.org> -# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c -Add missing ifde MOZ_MEDIA - -diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp ---- a/content/base/src/nsContentSink.cpp -+++ b/content/base/src/nsContentSink.cpp -@@ -1860,17 +1860,19 @@ nsIAtom** const kDefaultAllowedTags [] = - &nsGkAtoms::nobr, - &nsGkAtoms::noscript, - &nsGkAtoms::ol, - &nsGkAtoms::optgroup, - &nsGkAtoms::option, - &nsGkAtoms::output, - &nsGkAtoms::p, - &nsGkAtoms::pre, -+#ifdef MOZ_MEDIA - &nsGkAtoms::progress, -+#endif - &nsGkAtoms::q, - &nsGkAtoms::rp, - &nsGkAtoms::rt, - &nsGkAtoms::ruby, - &nsGkAtoms::s, - &nsGkAtoms::samp, - &nsGkAtoms::section, - &nsGkAtoms::select, -@@ -1952,17 +1954,19 @@ nsIAtom** const kDefaultAllowedAttribute - &nsGkAtoms::itemref, - &nsGkAtoms::itemscope, - &nsGkAtoms::itemtype, - &nsGkAtoms::kind, - &nsGkAtoms::label, - &nsGkAtoms::lang, - &nsGkAtoms::list, - &nsGkAtoms::longdesc, -+#ifdef MOZ_MEDIA - &nsGkAtoms::loop, -+#endif - &nsGkAtoms::low, - &nsGkAtoms::max, - &nsGkAtoms::maxlength, - &nsGkAtoms::media, - &nsGkAtoms::min, - &nsGkAtoms::mozdonotsend, - &nsGkAtoms::method, - &nsGkAtoms::multiple, diff --git a/net-libs/xulrunner/files/xulrunner-default-prefs.js b/net-libs/xulrunner/files/xulrunner-default-prefs.js deleted file mode 100644 index 4546d3f..0000000 --- a/net-libs/xulrunner/files/xulrunner-default-prefs.js +++ /dev/null @@ -1,14 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.display.use_system_colors", true); -pref("browser.link.open_external", 3); -pref("general.smoothScroll", true); -pref("general.autoScroll", false); -pref("browser.tabs.tabMinWidth", 15); -pref("browser.backspace_action", 0); -pref("browser.urlbar.hideGoButton", true); -pref("accessibility.typeaheadfind", true); -pref("browser.shell.checkDefaultBrowser", false); -pref("browser.EULA.override", true); -pref("general.useragent.vendor", "Gentoo"); -pref("intl.locale.matchOS", true); diff --git a/net-libs/xulrunner/xulrunner-1.9.2.24.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.24.ebuild deleted file mode 100644 index 988d62a..0000000 --- a/net-libs/xulrunner/xulrunner-1.9.2.24.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -WANT_AUTOCONF="2.1" - -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils - -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.9" - -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/mozilla/patchsets/${PATCH}.tar.bz2" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="1.9" -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi" - -RDEPEND=" - >=sys-devel/binutils-2.16.1 - >=dev-libs/nss-3.12.8 - >=dev-libs/nspr-4.8.6 - system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) - alsa? ( media-libs/alsa-lib ) - >=app-text/hunspell-1.2 - >=x11-libs/cairo-1.8.8[X] - x11-libs/libXt - x11-libs/pixman - >=dev-libs/libevent-1.4.7 - gnome? ( >=gnome-base/gnome-vfs-2.16.3 - >=gnome-base/libgnomeui-2.16.1 - >=gnome-base/gconf-2.16.0 - >=gnome-base/libgnome-2.16.0 ) - wifi? ( net-wireless/wireless-tools ) - libnotify? ( >=x11-libs/libnotify-0.4 )" - -DEPEND="java? ( >=virtual/jdk-1.4 ) - ${RDEPEND} - =dev-lang/python-2*[threads] - dev-util/pkgconfig" - -# virtual/jre should not be in DEPEND. bug 325981 -RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}" - -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 - - python_set_active_version 2 -} - -src_prepare() { - # Apply our patches - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}" - - epatch "${FILESDIR}/bug-606109.patch" - - eprefixify \ - extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \ - xpcom/build/nsXPCOMPrivate.h \ - xulrunner/installer/Makefile.in \ - xulrunner/app/nsRegisterGREUnix.cpp - - # fix double symbols due to double -ljemalloc - sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \ - xulrunner/stub/Makefile.in || die - - #Fix compilation with curl-7.21.7 bug 376027 - sed -e '/#include <curl\/types\.h>/d' \ - -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \ - -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \ - || die - sed -e '/curl\/types\.h/d' \ - -i "${S}"/config/system-headers \ - -i "${S}"/js/src/config/system-headers \ - || die - - # Allow user to apply additional patches without modifing ebuild - epatch_user - - # 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 '' --enable-crypto - 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 --with-nspr-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --with-system-bz2 - mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr - - mozconfig_use_enable gnome gnomevfs - mozconfig_use_enable gnome gnomeui - mozconfig_use_enable ipc # +ipc, upstream default - 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!" - - # hack added to workaround bug 299905 on hosts with libc that doesn't - # support tls, (probably will only hit this condition with Gentoo Prefix) - tc-has-tls -l || export ac_cv_thread_keyword=no - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - rm "${ED}"/usr/bin/xulrunner - - MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}" - SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk" - - if has_multilib_profile; then - local config - for config in "${ED}"/etc/gre.d/*.system.conf ; do - mv "${config}" "${config%.conf}.${CHOST}.conf" - done - fi - - 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=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed" - - # Add our defaults to xulrunner and out of firefox - cp "${FILESDIR}"/xulrunner-default-prefs.js \ - "${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \ - die "failed to cp xulrunner-default-prefs.js" - - pax-mark m "${D}"/${MOZLIBDIR}/plugin-container - - if use java ; then - java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar" - java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so" - java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar" - java-pkg_regjar "${ED}/${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 ." -} |