public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-libs/xulrunner: ChangeLog xulrunner-1.9.1.1.ebuild
@ 2009-07-31 14:22 Nirbheek Chauhan (nirbheek)
  0 siblings, 0 replies; 2+ messages in thread
From: Nirbheek Chauhan (nirbheek) @ 2009-07-31 14:22 UTC (permalink / raw
  To: gentoo-commits

nirbheek    09/07/31 14:22:01

  Modified:             ChangeLog
  Added:                xulrunner-1.9.1.1.ebuild
  Log:
  Bump xulrunner from mozilla overlay (same release, new patch tarball and ebuild changes by Anarchy)
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.223                net-libs/xulrunner/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.223&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.223&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?r1=1.222&r2=1.223

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- ChangeLog	22 Jul 2009 17:45:26 -0000	1.222
+++ ChangeLog	31 Jul 2009 14:22:01 -0000	1.223
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.222 2009/07/22 17:45:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.223 2009/07/31 14:22:01 nirbheek Exp $
+
+*xulrunner-1.9.1.1 (31 Jul 2009)
+
+  31 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +xulrunner-1.9.1.1.ebuild:
+  Bump xulrunner from mozilla overlay (same release, new patch tarball and
+  ebuild changes by Anarchy)
 
 *xulrunner-1.9.0.12 (22 Jul 2009)
 



1.1                  net-libs/xulrunner/xulrunner-1.9.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild?rev=1.1&content-type=text/plain

Index: xulrunner-1.9.1.1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild,v 1.1 2009/07/31 14:22:01 nirbheek Exp $

EAPI="2"
WANT_AUTOCONF="2.1"

inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools

MY_PV="${PV/_beta/b}" # Handle betas
MY_PV="${PV/_/}" # Handle rc1, rc2 etc
MY_PV="${MY_PV/1.9.1.1/3.5.1}"
MAJ_PV="${PV/_*/}"
PATCH="${PN}-${MAJ_PV}-patches-0.2"

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.gentooexperimental.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="debug python" # qt-experimental

#	qt-experimental? (
#		x11-libs/qt-gui
#		x11-libs/qt-core )

# nspr-4.8 due to BMO #499144
RDEPEND="java? ( >=virtual/jre-1.4 )
	python? ( >=dev-lang/python-2.3 )

	>=sys-devel/binutils-2.16.1
	>=dev-libs/nss-3.12.3
	>=dev-libs/nspr-4.8
	media-libs/alsa-lib
	>=dev-db/sqlite-3.6.7
	>=app-text/hunspell-1.2
	>=media-libs/lcms-1.17

	>=x11-libs/cairo-1.8.8[X]
	x11-libs/pango[X]"

DEPEND="java? ( >=virtual/jdk-1.4 )
	${RDEPEND}
	dev-util/pkgconfig"

S="${WORKDIR}/mozilla-1.9.1"

# Needed by src_compile() and src_install().
# Would do in pkg_setup but that loses the export attribute, they
# become pure shell variables.
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1

pkg_setup(){
	java-pkg-opt-2_pkg_setup
}

src_prepare() {
	# Apply our patches
	EPATCH_SUFFIX="patch" \
	EPATCH_FORCE="yes" \
	epatch "${WORKDIR}"

	# 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 -e "s/@PV@/${MAJ_PV}/" -i "${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"
	fi

	eautoreconf

	cd js/src
	eautoreconf
}

src_configure() {
	####################################
	#
	# mozconfig, CFLAGS and CXXFLAGS setup
	#
	####################################

	mozconfig_init
	mozconfig_config

	MEXTENSIONS="default"
	if use python; then
		MEXTENSIONS="${MEXTENSIONS},python/xpcom"
	fi

	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-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
	# 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

	# 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 '' --enable-system-sqlite
	mozconfig_annotate '' --with-system-nspr
	mozconfig_annotate '' --with-system-nss
	mozconfig_annotate '' --enable-system-lcms
	mozconfig_annotate '' --with-system-bz2

	# IUSE qt-experimental
#	if use qt-experimental; then
#		ewarn "You are enabling the EXPERIMENTAL qt toolkit"
#		ewarn "Usage is at your own risk"
#		ewarn "Known to be broken. DO NOT file bugs."
#		mozconfig_annotate '' --disable-system-cairo
#		mozconfig_annotate 'qt-experimental' --enable-default-toolkit=cairo-qt
#	else
		mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
#	fi

	# Other ff-specific settings
	mozconfig_annotate '' --enable-jsd
	mozconfig_annotate '' --enable-xpctools
	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"

	#disable java
	if ! use java ; then
		mozconfig_annotate '-java' --disable-javaxpcom
	fi

	# 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-cxxflags -fno-stack-protector
	fi

	####################################
	#
	#  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
}

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" "${ROOT}/usr/bin/xulrunner-${MAJ_PV}"

	# Install python modules
	dosym "${MOZLIBDIR}/python/xpcom" "${ROOT}/$(python_get_sitedir)/xpcom"

	# 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"

	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() {

	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"

	if use python; then
		python_need_rebuild
		python_mod_optimize "${MOZLIBDIR}/python"
	fi

	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 threw and enable the basics."
}

pkg_postrm() {

	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"

	if use python; then
		python_mod_cleanup "${MOZLIBDIR}/python"
	fi
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-libs/xulrunner: ChangeLog xulrunner-1.9.1.1.ebuild
@ 2009-08-01  0:31 Jeremy Olexa (darkside)
  0 siblings, 0 replies; 2+ messages in thread
From: Jeremy Olexa (darkside) @ 2009-08-01  0:31 UTC (permalink / raw
  To: gentoo-commits

darkside    09/08/01 00:31:41

  Modified:             ChangeLog xulrunner-1.9.1.1.ebuild
  Log:
  Add missing file and die if cp failed, proxy commit for mozilla team
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.225                net-libs/xulrunner/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.225&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.225&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/ChangeLog?r1=1.224&r2=1.225

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- ChangeLog	31 Jul 2009 15:02:26 -0000	1.224
+++ ChangeLog	1 Aug 2009 00:31:41 -0000	1.225
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.224 2009/07/31 15:02:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.225 2009/08/01 00:31:41 darkside Exp $
+
+  01 Aug 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/xulrunner-default-prefs.js, xulrunner-1.9.1.1.ebuild:
+  Add missing file and die if cp failed, proxy commit for mozilla team
 
   31 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   xulrunner-1.9.1-r1.ebuild, xulrunner-1.9.1.1.ebuild:



1.3                  net-libs/xulrunner/xulrunner-1.9.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild?r1=1.2&r2=1.3

Index: xulrunner-1.9.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xulrunner-1.9.1.1.ebuild	31 Jul 2009 15:02:26 -0000	1.2
+++ xulrunner-1.9.1.1.ebuild	1 Aug 2009 00:31:41 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild,v 1.2 2009/07/31 15:02:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.1.ebuild,v 1.3 2009/08/01 00:31:41 darkside Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -202,7 +202,7 @@
 	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"
+	cp "${FILESDIR}"/xulrunner-default-prefs.js	"${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || die "cp failed"
 
 	if use java ; then
 		java-pkg_regjar "${D}/${MOZLIBDIR}/javaxpcom.jar"






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-08-01  0:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-31 14:22 [gentoo-commits] gentoo-x86 commit in net-libs/xulrunner: ChangeLog xulrunner-1.9.1.1.ebuild Nirbheek Chauhan (nirbheek)
  -- strict thread matches above, loose matches on Subject: below --
2009-08-01  0:31 Jeremy Olexa (darkside)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox