Version bump. (bug #325817)
authorLars Wendler <polynomial-c@gentoo.org>
Sun, 27 Jun 2010 12:27:27 +0000 (12:27 +0000)
committerLars Wendler <polynomial-c@gentoo.org>
Sun, 27 Jun 2010 12:27:27 +0000 (12:27 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-libs/sofia-sip/Manifest
net-libs/xulrunner/ChangeLog
net-libs/xulrunner/xulrunner-1.9.2.6.ebuild [new file with mode: 0644]

index 403eae67179a54a9330551475439652f59784fcf..c3cadb904c976b84681d02a5a843e712304adfa1 100644 (file)
@@ -2,9 +2,9 @@ DIST sofia-sip-1.12.10.tar.gz 2855890 RMD160 35d3c3d348af1553d1a6fe2e0425efcd5da
 DIST sofia-sip-1.12.5.tar.gz 2634263 RMD160 36740faee69d2c615c8662463717d7b88beccf7e SHA1 ac91110f746af15b984821bfdf9f4a7c6a75d72d SHA256 0b0e67e899749bc06abad8970047c816800213f92ac5f3df566c5537333b8a1d
 DIST sofia-sip-1.12.8.tar.gz 2818781 RMD160 aa7310935c367ef68599a0237ce63b1fea09b25f SHA1 10d2430f109e25c3cb9debae4ac8df8aa238b512 SHA256 003dc9a8c3b926312e94736609bd01bc32c6d0062287436824c3b67d266641b2
 DIST sofia-sip-1.12.9.tar.gz 2859095 RMD160 b8e4c09e90da180e3cc7b43ea48ae7a71681f381 SHA1 f5dcabacffe3f5637a0da60e75d46309ea687005 SHA256 830675b96292677626528e72916df572e7698d595c36765f6941240871807b3b
-EBUILD sofia-sip-1.12.10.ebuild 757 RMD160 561fb0eaaf4e972af1fce6dbe284bf8386fe4a89 SHA1 4c2a500b4844e362f08c8c352a64d1b8a398d190 SHA256 2601cef50ba9890abe93a8aba3fad5a712fc4984c5f8c8b7094b81bd97930abe
+EBUILD sofia-sip-1.12.10.ebuild 755 RMD160 050bffc47d85260ca9073b0c18f7d5e85c9568c8 SHA1 dd081b0440ae1fd988ff85041cd84cd926a0a9b0 SHA256 05d6b6e5a79a1115419214c7c2af4774e8d0a3e1695fcebbc1831dfaacb4d8e6
 EBUILD sofia-sip-1.12.5.ebuild 751 RMD160 0850db0d3500e7304b89468478eb4228d0949770 SHA1 811139530c6c53ef07c0f8f2d0d62d1a03dd1e4c SHA256 2b16c462259bb2e09bb18ab69fe4dc30e06ca2b467ef0251d97db838fd812835
 EBUILD sofia-sip-1.12.8.ebuild 751 RMD160 292ffb296a8500236b385e84a36e24ba334ee4cf SHA1 913db2ad28921c970546f9c3e3947c2e2cc39e1b SHA256 3120895b7fc13d6f96e5becca72c962075e1babefd703703ff67dae8ec76ff0a
 EBUILD sofia-sip-1.12.9.ebuild 756 RMD160 ebac22330a71420a17d72b399da61096cc346b24 SHA1 7d2c841323932a1217267561948ea97191152cbf SHA256 d174952bd37f255d2652ee69b7051d2c81b713598518fbdfcd5a24c7215a4311
-MISC ChangeLog 1699 RMD160 b68a3cca78d575f0bed276cf88438a6d5757c0e8 SHA1 e05ee76e9cf52857954d6eaa84cb6ebf38ba2d41 SHA256 8ca2272845ed65ca0562115bd6f42695fa5c7269782e2dc4501498926f1113a6
+MISC ChangeLog 1781 RMD160 7f8b4fe1a272c2c93ffc0da333a5e0dae7843bd0 SHA1 32967462771dafc21a9a0bd41c2dab481490a168 SHA256 f90cc580832cee1cc395a572ed1fe8ff215eca5b76d7c936575a418441b130e2
 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
index b76e704aafa4762dc9f5810c7136ee70d57bc3e3..d46d0939d5db4d78525c1c1630826ec9b9bf55b0 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.321 2010/06/25 17:56:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.322 2010/06/27 12:27:27 polynomial-c Exp $
+
+*xulrunner-1.9.2.6 (27 Jun 2010)
+
+  27 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +xulrunner-1.9.2.6.ebuild:
+  Version bump. Thanks to tman who reported this in bug #325817.
 
   25 Jun 2010; Raúl Porcel <armin76@gentoo.org> xulrunner-1.9.2.4.ebuild:
   alpha/arm/ia64/sparc stable wrt #324735
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.6.ebuild
new file mode 100644 (file)
index 0000000..d4f9479
--- /dev/null
@@ -0,0 +1,232 @@
+# 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.6.ebuild,v 1.1 2010/06/27 12:27:27 polynomial-c Exp $
+
+EAPI="2"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python
+
+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 +ipc libnotify system-sqlite wifi"
+
+RDEPEND="java? ( >=virtual/jre-1.4 )
+       >=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*
+       >=x11-libs/cairo-1.8.8[X]
+       x11-libs/pango[X]
+       x11-libs/libXt
+       x11-libs/pixman
+       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"
+
+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}"
+
+       # 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"
+
+       # Ensure we find myspell dict.
+       epatch "${FILESDIR}/1002_fix-system-hunspell-dict-detections.patch"
+
+       # 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 '' --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 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!"
+
+       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" 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_regso "${D}/${MOZLIBDIR}/libjavaxpcomglue.so"
+               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 ."
+}