pkg-config patch for makefile

Package-Manager: portage-2.0.53_rc7

5 files changed, 82 insertions, 28 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 5a2e6f69befa..7bd368e5bec3 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.104 2005/11/16 22:53:28 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.105 2005/11/17 21:17:59 anarchy Exp $
+
+*mozilla-firefox-1.5_rc2-r3 (17 Nov 2005)
+
+  17 Nov 2005; <anarchy@gentoo.org> +files/firefox-pkgconfig.patch,
+  -mozilla-firefox-1.5_rc2-r2.ebuild, +mozilla-firefox-1.5_rc2-r3.ebuild:
+  patch for pkgconfig files, now accecpting bug reports
 
 *mozilla-firefox-1.5_rc2-r2 (16 Nov 2005)
 
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 9a0e202748e5..46a074868880 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,4 +1,4 @@
-MD5 79a092d4c214dd78d32b5f2632d3b652 ChangeLog 35783
+MD5 dde2396592f1929e418111a1982e8042 ChangeLog 36025
 MD5 7847d262e628dcac303586fe02f2e8c4 files/1.5/firefox-cairo-canvas.patch 446
 MD5 91661761f2f232b08b74f5adc4f1eff0 files/1.5/firefox-nopangoxft.patch 839
 MD5 362f9e0b0f25b964f7120b68fb629ee0 files/1.5/firefox-visibility.patch 689
@@ -8,9 +8,10 @@ MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/1.5/mozilla-hppa.patch 7863
 MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32
 MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r2 231
 MD5 1d1a1fe09e04d58a8d9faa9f14ffd0c6 files/digest-mozilla-firefox-1.0.7-r3 231
-MD5 da6afa804e1889df3e817af39a298708 files/digest-mozilla-firefox-1.5_rc2-r2 216
+MD5 da6afa804e1889df3e817af39a298708 files/digest-mozilla-firefox-1.5_rc2-r3 216
 MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548
 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
+MD5 24adc1e2452f01103d41e4d8e970781f files/firefox-pkgconfig.patch 1575
 MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538
 MD5 9afab9469fd1d8af3d674a07ab0a0128 files/gentoo-default-prefs.js 281
 MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520
@@ -39,4 +40,4 @@ MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 7ec6e77c0014718ffae4a55c76acd1db mozilla-firefox-1.0.7-r2.ebuild 8564
 MD5 b686423c9050edfcfd7ff72ea4081f09 mozilla-firefox-1.0.7-r3.ebuild 9734
-MD5 0136d8f1da2e7a5a6e011511cfd038ab mozilla-firefox-1.5_rc2-r2.ebuild 9278
+MD5 cf52f5c7bfd10d8e364fc535ae1b8dc2 mozilla-firefox-1.5_rc2-r3.ebuild 9239
diff --git a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5_rc2-r2 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5_rc2-r3
index efc6478569ca..efc6478569ca 100644
--- a/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5_rc2-r2
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.5_rc2-r3
diff --git a/www-client/mozilla-firefox/files/firefox-pkgconfig.patch b/www-client/mozilla-firefox/files/firefox-pkgconfig.patch
new file mode 100644
index 000000000000..7cf06f30298f
--- /dev/null
+++ b/www-client/mozilla-firefox/files/firefox-pkgconfig.patch
@@ -0,0 +1,44 @@
+--- config/autoconf.mk.in.orig	2005-08-17 17:17:17.000000000 +0000
++++ config/autoconf.mk.in	2005-11-17 14:36:44.000000000 +0000
+@@ -54,13 +54,14 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ libdir		= @libdir@
++mozappdir	= $(libdir)/mozilla-$(MOZ_APP_NAME)
++includedir	= $(mozappdir)/include
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= $(mozappdir)/idl
++
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir	= $(mredir)/lib
+ 
+--- build/unix/Makefile.in.orig	2005-07-07 18:24:39.000000000 +0000
++++ build/unix/Makefile.in	2005-11-17 15:47:45.000000000 +0000
+@@ -55,8 +55,7 @@
+ NSPR_NAME=nspr
+ NSPR_VERSION=$(shell $(NSPR_CONFIG) --version)
+ else
+-FULL_NSPR_CFLAGS=-I$(includedir)/nspr
+-FULL_NSPR_LIBS=$(subst -L$(libdir),-L$(mozappdir),$(shell $(DEPTH)/nsprpub/config/nspr-config --libs))
++FULL_NSPR_LIBS=$(subst -L$(libdir),,$(shell $(DEPTH)/nsprpub/config/nspr-config --libs))
+ NSPR_NAME=$(MOZ_APP_NAME)-nspr
+ NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
+ endif
+--- build/unix/mozilla-nspr.pc.in.orig	2005-11-17 15:39:39.000000000 +0000
++++ build/unix/mozilla-nspr.pc.in	2005-11-17 15:43:50.000000000 +0000
+@@ -6,7 +6,7 @@
+ Name: NSPR
+ Description: The Netscape Portable Runtime
+ Version: %NSPR_VERSION%
+-Libs: %FULL_NSPR_LIBS%
+-Cflags: %FULL_NSPR_CFLAGS%
++Libs: -L${libdir} %FULL_NSPR_LIBS%
++Cflags: -I${includedir}/nspr
+ 
+ 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r2.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild
index 93dd537ed2cb..235edc338a2f 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r2.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.5_rc2-r2.ebuild,v 1.1 2005/11/16 22:53:28 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5_rc2-r3.ebuild,v 1.1 2005/11/17 21:17:59 anarchy Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -78,8 +78,11 @@ src_unpack() {
 
 	# patch from fedora to remove the pangoxft things
 	epatch ${FILESDIR}/1.5/firefox-nopangoxft.patch
-	#cairo-canvas patch
-	epatch ${FILESDIR}/1.5/firefox-cairo-canvas.patch
+	# cairo-canvas patch, only needed to build against system cairo
+	# epatch ${FILESDIR}/1.5/firefox-cairo-canvas.patch
+
+	# fix pkgconfig files properly
+	epatch ${FILESDIR}/firefox-pkgconfig.patch
 
 	####################################
 	#
@@ -99,12 +102,12 @@ src_unpack() {
 	sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
 	eend $? || die "sed failed"
 
-	echo
-	ewarn "This firefox-1.5rc1 ebuild is provided for your convenience,"
-	ewarn "the use of this ebuild is not supported by gentoo developers. "
-	ewarn "Please file bugs related to firefox-1.5 with upstream developers."
-	ewarn "Bugs should be filed @ https://bugzilla.mozilla.org."
-	ewarn "Thank you Anarchy"
+	echo  ""
+	ewarn "Even tho this is 1.5rc2-r3 I am gonna take bug reports"
+	ewarn "If you can attach a patch for any problems you may encounter"
+	ewarn "I will push bugs upstream if I feel it is need, do not take"
+	ewarn "offense or think I am blowing your bug report off"
+	ewarn "Thank you! Anarchy."
 }
 
 src_compile() {
@@ -195,13 +198,13 @@ src_install() {
 	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
+	doicon ${FILESDIR}/icon/firefox-icon.png
+	domenu ${FILESDIR}/icon/mozillafirefox.desktop
 
-	# 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}/dist/branding/mozicon16.xpm
+	doins ${S}/dist/branding/mozicon50.xpm
 
 	####################################
 	#
@@ -229,9 +232,6 @@ src_install() {
 	doexe ${S}/build/unix/firefox-config
 
 	# Fix pkgconfig files and install them
-	sed -i -e "s|-L/usr/lib/firefox-${MY_PV}|-L\$\{libdir\}|
-			s|-I/usr/include/firefox-${MY_PV}|-I\$\{includedir\}|" \
-				${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}|
@@ -264,12 +264,15 @@ pkg_postinst() {
 	# thunderbird-bin ebuilds.
 	update_mozilla_launcher_symlinks
 
-	echo
-	ewarn "This firefox-1.5rc1 ebuild is provided for your convenience,"
-	ewarn "the use of this ebuild is not supported by gentoo developers. "
-	ewarn "Please file bugs related to firefox-1.5 with upstream developers."
-	ewarn "Bugs should be filed @ https://bugzilla.mozilla.org."
-	ewarn "Thank you. anarchy@gentoo.org for more info"
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+
+	echo  ""
+	ewarn "Even tho this is 1.5rc2-r3 I am gonna take bug reports"
+	ewarn "If you can, attach a patch for any problems you may encounter"
+	ewarn "I will push bugs upstream if I feel it is need, do not take"
+	ewarn "offense or think I am blowing your bug report off"
+	ewarn "Thank you! Anarchy."
 }
 
 pkg_postrm() {