added rpath patch, p.masked for further testing

(Portage version: 2.0.51.22-r2)

5 files changed, 402 insertions, 2 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index ed5c117bc01f..da65a01f296a 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.67 2005/08/14 21:06:43 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.68 2005/08/15 18:47:48 anarchy Exp $
+
+*mozilla-firefox-1.0.6-r6 (15 Aug 2005)
+
+  15 Aug 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +files/mozilla-rpath-1.patch, +mozilla-firefox-1.0.6-r6.ebuild:
+  add rpath patch, p.masked for further testing, also mozcalendar removed as
+  it is busted majoryly
 
   14 Aug 2005; Jory A. Pratt <anarchy@gentoo.org>
   mozilla-firefox-1.0.6-r5.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 66e0f022cc64..01fda26db8a6 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,9 +1,10 @@
-MD5 f18164566c2e256dfc1150c369c15554 ChangeLog 28942
+MD5 37d465b54fdf6101e20f78000096be36 ChangeLog 29156
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 6d3af6331c1b75d7991a5680fc9602c7 mozilla-firefox-1.0.6-r2.ebuild 8318
 MD5 06023401dbf9f17149696616a240647d mozilla-firefox-1.0.6-r3.ebuild 9154
 MD5 7f073b544e7967d3453ab8579292ef3e mozilla-firefox-1.0.6-r4.ebuild 9543
 MD5 6438ffcb1bd42fb9f3a340084dd0dea8 mozilla-firefox-1.0.6-r5.ebuild 9636
+MD5 44a4fc02bad23cbc255f03c2ae59471e mozilla-firefox-1.0.6-r6.ebuild 10960
 MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32
 MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382
 MD5 6da2b9dec8c7fbe104122a424727fb39 files/digest-mozilla-firefox-1.0.6-r3 451
@@ -21,5 +22,7 @@ MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818
 MD5 07a5a1ce0146f1badc4e04849a9b1830 files/mozilla-firefox-1.0.6-gcc4.patch 6131
 MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r4 447
 MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r5 447
+MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
+MD5 8e6ffd5837cb4de55271592e3448b177 files/digest-mozilla-firefox-1.0.6-r6 447
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r6 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r6
new file mode 100644
index 000000000000..fee491043da3
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r6
@@ -0,0 +1,6 @@
+MD5 7b4c1d10d478dcb4c52fbbe3e41745d9 firefox-1.0.6-source.tar.bz2 32782840
+MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
+MD5 39c7b08477b68fe0cb3fba75970c8125 mozilla-firefox-1.0.3-ia64.patch.bz2 2531
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
+MD5 e0442e619add9045d0d04e97c274bc85 embed-typeaheadfind.patch 41038
diff --git a/www-client/mozilla-firefox/files/mozilla-rpath-1.patch b/www-client/mozilla-firefox/files/mozilla-rpath-1.patch
new file mode 100644
index 000000000000..39969cd63ec1
--- /dev/null
+++ b/www-client/mozilla-firefox/files/mozilla-rpath-1.patch
@@ -0,0 +1,47 @@
+--- config/rules.mk.orig	2005-07-28 01:45:18.000000000 +0000
++++ config/rules.mk	2005-07-28 01:45:21.000000000 +0000
+@@ -507,5 +507,10 @@
+ # 
+ ifeq ($(OS_ARCH),Linux)
+ ifdef IS_COMPONENT
++DSO_LDOPTS += -Wl,-R#RPATH_FIXER
++OS_LDFLAGS += -Wl,-R#RPATH_FIXER
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++else
++DSO_LDOPTS += -Wl,-R#RPATH_FIXER
++OS_LDFLAGS += -Wl,-R#RPATH_FIXER
+ endif
+--- nsprpub/config/rules.mk.orig	2003-09-16 02:00:28.000000000 +0000
++++ nsprpub/config/rules.mk	2005-07-30 04:00:21.000000000 +0000
+@@ -87,6 +87,9 @@
+ endif
+ endif
+ 
++DSO_LDOPTS += -Wl,-R#RPATH_FIXER
++OS_LDFLAGS += -Wl,-R#RPATH_FIXER
++
+ #
+ # This makefile contains rules for building the following kinds of
+ # libraries:
+--- security/coreconf/rules.mk.orig	2005-07-31 16:31:37.000000000 +0000
++++ security/coreconf/rules.mk	2005-07-31 16:37:27.000000000 +0000
+@@ -349,7 +349,7 @@
+ ifdef XP_OS2_VACPP
+ 	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+ else
+-	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
++	$(MKSHLIB) -Wl,-R#RPATH_FIXER -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+ endif
+ 	chmod +x $@
+ ifeq ($(OS_TARGET),Darwin)
+--- security/coreconf/rules.mk.orig	2005-08-01 11:40:54.000000000 +0000
++++ security/coreconf/rules.mk	2005-08-01 11:50:31.000000000 +0000
+@@ -291,7 +291,7 @@
+ ifdef XP_OS2_VACPP
+ 	$(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ else
+-	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++	$(MKPROG) -Wl,-R#RPATH_FIXER -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ endif
+ endif
+ 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r6.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r6.ebuild
new file mode 100644
index 000000000000..cb5dc7509a2a
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r6.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r6.ebuild,v 1.1 2005/08/15 18:47:48 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="http://www.mozilla.org/projects/firefox/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2
+	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
+	mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2
+	mirror://gentoo/mozilla-jslibmath-alpha.patch
+	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch
+	http://dev.gentoo.org/~anarchy/dist/embed-typeaheadfind.patch"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="gnome java mozdevelop mozsvg ssl"
+
+# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
+# and is required to build with support for cairo.  #71504
+RDEPEND="java? ( virtual/jre )
+	>=media-libs/libmng-1.0.0
+	mozsvg? (
+		!<=x11-base/xorg-x11-6.7.0-r2
+		x11-libs/cairo
+	)
+	>=www-client/mozilla-launcher-1.39"
+
+DEPEND="${RDEPEND}
+	java? ( >=dev-java/java-config-0.2.0 )"
+
+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 BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_PHOENIX=1
+
+src_unpack() {
+	declare x
+
+	for x in ${A}; do
+		[[ $x == *.tar.* ]] || continue
+		unpack $x || die "unpack failed"
+	done
+	cd ${S} || die "cd failed"
+
+	####################################
+	#
+	# architecture patches
+	#
+	####################################
+
+	# alpha stubs patch from lfs project.
+	# <taviso@gentoo.org> (26 Jun 2003)
+	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
+
+	# hppa patches from Ivar <orskaug@stud.ntnu.no>
+	# <gmsoft@gentoo.org> (22 Dec 2004)
+	epatch ${FILESDIR}/mozilla-hppa.patch
+
+	# patch to solve segfaults on ia64, from Debian, originally from David
+	# Mosberger
+	epatch ${DISTDIR}/mozilla-firefox-1.0.3-ia64.patch.bz2
+
+	# patch to fix math operations on alpha, makes maps.google.com work!
+	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
+
+	####################################
+	#
+	# general compilation and run-time fixes
+	#
+	####################################
+
+	# GCC4 compile fix, bug #87800
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
+	# patch out ft caching code since the API changed between releases of
+	# freetype; this enables freetype-2.1.8+ compat.
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
+	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
+
+	# Patch for newer versions of cairo #80301
+	if has_version '>=x11-libs/cairo-0.3.0'; then
+		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
+	fi
+
+	####################################
+	#
+	# behavioral fixes
+	#
+	####################################
+
+	# patch to fix separate character on euro keyboards, bug 68995
+	epatch ${FILESDIR}/mozilla-firefox-1.0-kp_separator.patch
+
+	# some patches from Debian to set default preferences:
+	# - inherit LANG from env
+	# - shut off SSLv2 and 40-bit ciphers by default
+	# - disable application auto-updating
+	epatch ${FILESDIR}/mozilla-firefox-1.0.3-prefs.patch
+
+	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
+	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
+
+	# patch to fix crash in GtkPromptService::Prompt
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=265599
+	epatch ${FILESDIR}/gtk-prompt-service.patch
+
+	# patch to make prompts window modal instead of application modal
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=224454
+	epatch ${FILESDIR}/embedprompter-modal.patch
+
+	# patch to fix typeahead find for browsers which embed Firefox
+	# http://bugzilla.gnome.org/show_bug.cgi?id=157435
+	epatch ${DISTDIR}/embed-typeaheadfind.patch
+
+	# patch to make the interface requestor give out its nsIDOMWindow
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=277587
+	epatch ${FILESDIR}/securebrowserui-iirq.patch
+
+	# patch to add border to tooltips
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=238052
+	epatch ${FILESDIR}/gtk-tooltips.patch
+
+	#rpath patch
+	epatch ${FILESDIR}/mozilla-rpath-1.patch
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	grep -Flr "#RPATH_FIXER" --include=*.mk . | xargs sed -i -e \
+		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|'
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml --enable-extensions=typeaheadfind
+
+	# Other ff-specific settings
+	mozconfig_use_enable mozdevelop jsd
+	mozconfig_use_enable mozdevelop xpctools
+	mozconfig_use_extension mozdevelop venkman
+	mozconfig_use_enable gnome gnomevfs
+	mozconfig_use_extension gnome gnomevfs
+	mozconfig_use_enable mozsvg svg
+	mozconfig_use_enable mozsvg svg-renderer-cairo
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	#mozconfig_annotate '' --with-user-appdir=.firefox
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, which breaks us
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  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.
+	grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
+	's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+	####################################
+	#
+	#  Build Mozilla NSS
+	#
+	####################################
+
+	# Build the NSS/SSL support
+	if use ssl; then
+		einfo "Building Mozilla-Firefox NSS..."
+
+		# Fix #include problem
+		cd ${S}/security/coreconf || die "cd coreconf failed"
+		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
+			>>headers.mk
+		emake -j1 || die "make security headers failed"
+
+		cd ${S}/security/nss || die "cd nss failed"
+		emake -j1 moz_import || die "make moz_import failed"
+		emake -j1 || die "make nss failed"
+	fi
+
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+	# Create directory structure to support portage-installed extensions.
+	# See update_chrome() in mozilla-launcher
+	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+	# Create /usr/bin/firefox
+	install_mozilla_launcher_stub firefox ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/firefox-icon.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillafirefox.desktop
+
+	# Fix icons to look the same everywhere
+	insinto ${MOZILLA_FIVE_HOME}/icons
+	doins ${S}/build/package/rpm/SOURCES/mozicon16.xpm
+	doins ${S}/build/package/rpm/SOURCES/mozicon50.xpm
+
+	####################################
+	#
+	# Install files necessary for applications to build against firefox
+	#
+	####################################
+
+	einfo "Installing includes and idl files..."
+	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
+	cd ${S}/dist
+	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
+	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
+
+	# Install the NSS/SSL libs, headers and tools
+	if use ssl; then
+		einfo "Installing Mozilla-Firefox NSS..."
+		# Install the headers ('make install' do not work for headers ...)
+		insinto ${MOZILLA_FIVE_HOME}/include/nss
+		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
+		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
+		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
+		# These come with zlib ...
+		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
+
+		cd ${S}/security/nss
+
+		mkdir -p ${WORKDIR}/nss/{bin,lib}
+		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+		make install || die "make failed"
+		# Gets installed as symbolic links ...
+		# cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
+
+		# Need to unset these incase we want to rebuild, else the build
+		# gets newked.
+		unset SOURCE_LIB_DIR
+		unset SOURCE_BIN_DIR
+	fi
+
+	# Dirty hack to get some applications using this header running
+	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
+		/usr/$(get_libdir)/${MOZILLA_FIVE_HOME##*/}/include/nsIURI.h
+
+	# Compatibility symlink so that applications can still build against firefox
+	# even though it has moved.  To remove this symlink, grep -r MozillaFirefox
+	# /usr/portage and fix those ebuilds
+	dosym ${MOZILLA_FIVE_HOME##*/} ${MOZILLA_FIVE_HOME%/*}/MozillaFirefox
+
+	# Fix firefox-config and install it
+	sed -i -e "s|/usr/lib/firefox-${PV}|${MOZILLA_FIVE_HOME}|g
+		s|/usr/include/firefox-${PV}|${MOZILLA_FIVE_HOME}/include|g" \
+		${S}/build/unix/firefox-config
+	exeinto ${MOZILLA_FIVE_HOME}
+	doexe ${S}/build/unix/firefox-config
+
+	# Fix pkgconfig files and install them
+	sed -i -e "s|-L/usr/lib/firefox-${PV}|-L\$\{libdir\}|" \
+				${S}/build/unix/firefox-nspr.pc
+	insinto /usr/$(get_libdir)/pkgconfig
+	for x in ${S}/build/unix/*.pc; do
+		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
+			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
+			s|\(^Libs: -L.*\)\($\)|\1 -Wl,-R\$\{libdir\}\2|" ${x}
+		doins ${x}
+	done
+
+	# Install docs
+	dodoc LEGAL LICENSE
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \
+		/usr/libexec/mozilla-launcher -register
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=firefox \
+		/usr/libexec/mozilla-launcher -register
+
+	update_mozilla_launcher_symlinks
+}