Remove xulrunner:1.8 wrt #282162 and #324953.
authorSamuli Suominen <ssuominen@gentoo.org>
Mon, 19 Jul 2010 06:44:40 +0000 (06:44 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Mon, 19 Jul 2010 06:44:40 +0000 (06:44 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-libs/xulrunner/ChangeLog
net-libs/xulrunner/files/xulrunner-1.8-gcc-4.4.patch [deleted file]
net-libs/xulrunner/files/xulrunner-1.8.1.19-glibc-2.10-support.patch [deleted file]
net-libs/xulrunner/files/xulrunner-1.8.1.19-libpng14.patch [deleted file]
net-libs/xulrunner/files/xulrunner.conf [deleted file]
net-libs/xulrunner/xulrunner-1.8.1.19.ebuild [deleted file]

index a58a7bd3729eed175b52cd342234035941b8cfa7..f8bcfb66c70e7f3722daff1403bfd50c42c0c508 100644 (file)
@@ -1,6 +1,12 @@
 # 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.327 2010/07/18 23:34:36 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.328 2010/07/19 06:44:39 ssuominen Exp $
+
+  19 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xulrunner-1.8-gcc-4.4.patch, -xulrunner-1.8.1.19.ebuild,
+  -files/xulrunner-1.8.1.19-glibc-2.10-support.patch,
+  -files/xulrunner-1.8.1.19-libpng14.patch, -files/xulrunner.conf:
+  Remove xulrunner:1.8 wrt #282162 and #324953.
 
   18 Jul 2010; Jory A. Pratt <anarchy@gentoo.org> xulrunner-1.9.2.4.ebuild,
   xulrunner-1.9.2.6.ebuild:
diff --git a/net-libs/xulrunner/files/xulrunner-1.8-gcc-4.4.patch b/net-libs/xulrunner/files/xulrunner-1.8-gcc-4.4.patch
deleted file mode 100644 (file)
index 583656b..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Port to gcc-4.4, bug 270093
-Patch by Evan Teran
----
---- mozilla/toolkit/xre/nsAppRunner.cpp
-+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -1370,7 +1370,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
-   if (NS_FAILED(rv))
-     return rv;
--#elif
-+#else
- #error Oops, you need platform-specific code here
- #endif
diff --git a/net-libs/xulrunner/files/xulrunner-1.8.1.19-glibc-2.10-support.patch b/net-libs/xulrunner/files/xulrunner-1.8.1.19-glibc-2.10-support.patch
deleted file mode 100644 (file)
index 4a4cefc..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN mozilla.orig/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp mozilla.dwokfur/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp
---- mozilla.orig/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp 2009-08-23 08:56:52.000000000 +0200
-+++ mozilla.dwokfur/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp      2009-08-23 10:00:46.000000000 +0200
-@@ -87,7 +87,8 @@
- XPCOMGlueLoad(const char *xpcomFile)
- {
-     char xulFile[MAXPATHLEN];
--    char *lastSlash = strrchr(xpcomFile, '/');
-+    char *xpcomFileb = const_cast<char*>(xpcomFile);
-+    char *lastSlash = strrchr(xpcomFileb, '/');
-     if (!lastSlash) {
-         snprintf(xulFile, MAXPATHLEN, "./%s", xpcomFile);
-         return XPCOMGlueLoad(xulFile);
-
diff --git a/net-libs/xulrunner/files/xulrunner-1.8.1.19-libpng14.patch b/net-libs/xulrunner/files/xulrunner-1.8.1.19-libpng14.patch
deleted file mode 100644 (file)
index 2626e41..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
-+++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
-@@ -111,9 +111,7 @@
-   // initialize
-   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                                png_voidp_NULL,
--                                                png_error_ptr_NULL,
--                                                png_error_ptr_NULL);
-+                                                NULL, NULL, NULL);
-   if (! png_ptr)
-     return NS_ERROR_OUT_OF_MEMORY;
-   png_info* info_ptr = png_create_info_struct(png_ptr);
diff --git a/net-libs/xulrunner/files/xulrunner.conf b/net-libs/xulrunner/files/xulrunner.conf
deleted file mode 100644 (file)
index e622e0b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-# Registration file generated by xulrunner. Do not edit.
-
-[version]
-GRE_PATH=instpath
-xulrunner=true
-javaxpcom=1
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.19.ebuild
deleted file mode 100644 (file)
index 66471e7..0000000
+++ /dev/null
@@ -1,167 +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.8.1.19.ebuild,v 1.11 2010/05/13 19:22:04 ssuominen Exp $
-
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils makeedit multilib autotools mozconfig-2 java-pkg-opt-2
-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}-source.tar.bz2
-       mirror://gentoo/${PATCH}.tar.bz2"
-
-SLOT="1.8"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-       >=sys-devel/binutils-2.16.1
-       >=dev-libs/nss-3.11.5
-       >=dev-libs/nspr-4.6.5-r1
-       java? ( >=virtual/jre-1.4 )"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
-       ${RDEPEND}
-       dev-util/pkgconfig"
-
-S="${WORKDIR}/mozilla"
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-export MOZ_CO_PROJECT=xulrunner
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-
-pkg_setup(){
-       if ! built_with_use x11-libs/cairo X; then
-               eerror "Cairo is not built with X useflag."
-               eerror "Please add 'X' to your USE flags, and re-emerge cairo."
-               die "Cairo needs X"
-       fi
-
-       if ! built_with_use --missing true x11-libs/pango X; then
-               eerror "Pango is not built with X useflag."
-               eerror "Please add 'X' to your USE flags, and re-emerge pango."
-               die "Pango needs X"
-       fi
-       java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-       unpack ${P}-source.tar.bz2  ${PATCH}.tar.bz2
-
-       # Apply our patches
-       cd "${S}" || die "cd failed"
-       EPATCH_SUFFIX="patch" \
-       EPATCH_FORCE="yes" \
-       epatch "${WORKDIR}"/patch
-
-       # gcc-4.4 #elif -> #else, bug 270093
-       epatch "${FILESDIR}/xulrunner-1.8-gcc-4.4.patch"
-       epatch "${FILESDIR}/${P}-glibc-2.10-support.patch"
-       epatch "${FILESDIR}/${P}-libpng14.patch"
-
-       eautoreconf || die "failed  running eautoreconf"
-}
-
-src_compile() {
-       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-       ####################################
-       #
-       # mozconfig, CFLAGS and CXXFLAGS setup
-       #
-       ####################################
-
-       mozconfig_init
-       mozconfig_config
-
-       mozconfig_annotate '' --enable-extensions="default,cookie,permissions,spellcheck"
-       mozconfig_annotate '' --enable-native-uconv
-       mozconfig_annotate '' --enable-image-encoder=all
-       mozconfig_annotate '' --enable-canvas
-       #mozconfig_annotate '' --enable-js-binary
-       mozconfig_annotate '' --enable-embedding-tests
-       mozconfig_annotate '' --with-system-nspr
-       mozconfig_annotate '' --with-system-nss
-       mozconfig_annotate '' --with-system-bz2
-       mozconfig_annotate '' --enable-jsd
-       mozconfig_annotate '' --enable-xpctools
-       # Bug 60668: Galeon doesn't build without oji enabled, so enable it
-       # regardless of java setting.
-       mozconfig_annotate '' --enable-oji --enable-mathml
-       mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-       #disable java
-       if ! use java ; then
-               mozconfig_annotate '-java' --disable-javaxpcom
-       fi
-
-       # Finalize and report settings
-       mozconfig_final
-
-       # -fstack-protector{,-all} breaks us
-       filter-flags -fstack-protector -fstack-protector-all
-
-       ####################################
-       #
-       #  Configure and build
-       #
-       ####################################
-
-       CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-       econf || die
-
-       # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-       # to econf, but the quotes cause configure to fail.
-       sed -i -e \
-               's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-               "${S}"/config/autoconf.mk \
-               "${S}"/toolkit/content/buildconfig.html
-
-       # This removes extraneous CFLAGS from the Makefiles to reduce RAM
-       # requirements while compiling
-       edit_makefiles
-
-       emake || die "emake failed"
-}
-
-src_install() {
-       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       X_DATE=`date +%Y%m%d`
-       # Add Gentoo package version to preferences - copied from debian rules
-       echo "pref(\"general.useragent.product\",\"Gecko\");" \
-               >> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
-       echo "pref(\"general.useragent.productSub\",\"${X_DATE}\");" \
-               >> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
-       # Add vendor
-       echo "pref(\"general.useragent.vendor\",\"Gentoo\");" \
-               >> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/vendor.js
-
-       if use java ; then
-           java-pkg_dojar "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
-           rm -f "${D}"${MOZILLA_FIVE_HOME}/javaxpcom.jar
-       fi
-
-       # xulrunner registration, the gentoo way
-       insinto /etc/gre.d
-       newins "${FILESDIR}"/${PN}.conf ${PV}.conf
-       sed -i -e \
-               "s|version|${PV}|
-                       s|instpath|${MOZILLA_FIVE_HOME}|" \
-               "${D}"/etc/gre.d/${PV}.conf
-}
-
-pkg_postinst() {
-       elog "Please remember to rebuild any packages that you have built"
-       elog "against xulrunner. Some packages might be broken by the upgrade; if this"
-       elog "is the case, please search at http://bugs.gentoo.org and open a new bug"
-       elog "if one does not exist."
-}