[patch] 01_firefox-1.0.5-fedora--minor_fixes.patch

01_firefox-1.0.5-fedora--minor_fixes.patch (text/plain), 3.43 KB, created by TGL on 2005-07-14 18:06:24 UTC

--- mozilla-firefox-1.0.5.ebuild.orig	2005-07-15 01:53:36.000000000 +0200
+++ mozilla-firefox-1.0.5.ebuild	2005-07-15 02:26:17.000000000 +0200
@@ -1,9 +1,11 @@
 # 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.5.ebuild,v 1.5 2005/07/14 09:40:09 killerfox Exp $
+# $Header: $
 
-inherit makeedit flag-o-matic nsplugins eutils mozconfig mozilla-launcher multilib
+inherit makeedit flag-o-matic nsplugins eutils mozconfig mozilla-launcher multilib fdo-mime
 
+FEDORA_VERSION="1.0.4-5"
+FEDORA_FILES="${WORKDIR}/fedora-files"
 S=${WORKDIR}/mozilla
 
 DESCRIPTION="The Mozilla Firefox Web Browser"
@@ -15,11 +17,13 @@
 	mirror://gentoo/mozilla-jslibmath-alpha.patch
 	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.3-ia64.patch.bz2
 	http://dev.gentoo.org/~agriffis/dist/mozilla-jslibmath-alpha.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2"
+	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0-4ft2.patch.bz2
+	mirror://gentoo/firefox-fedora-files-${FEDORA_VERSION}.tar.bz2
+	http://tdegreni.free.fr/gentoo/firefox/firefox-fedora-files-${FEDORA_VERSION}.tar.bz2"
 
 LICENSE="MPL-1.1 NPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc sparc ~x86"
+KEYWORDS="~x86"
 IUSE="gnome java mozdevelop mozsvg"
 
 # xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
@@ -41,7 +44,10 @@
 export MOZ_PHOENIX=1
 
 src_unpack() {
-	unpack firefox-${MY_PV}-source.tar.bz2 || die "unpack failed"
+	unpack \
+		firefox-${MY_PV}-source.tar.bz2 \
+		firefox-fedora-files-${FEDORA_VERSION}.tar.bz2 \
+		|| die "unpack failed"
 	cd ${S} || die "cd failed"
 
 	# alpha stubs patch from lfs project.
@@ -79,6 +85,16 @@
 
 	# GCC4 compile fix, bug #87800
 	epatch ${FILESDIR}/mozilla-firefox-1.0.4-gcc4.patch
+
+	### Patches from the Fedora package
+	### http://cvs.fedora.redhat.com/viewcvs/rpms/firefox/
+	### Many thanks to Christopher Aillon <[e-mail]>
+	# Disable the default application checks
+	epatch ${FEDORA_FILES}/firefox-PR1-default-applications.patch
+	# Add upstream fix to reduce round trips to xserver during remote control
+	epatch ${FEDORA_FILES}/firefox-1.0-remote-intern-atoms.patch
+	# Add upstream fix to call g_set_application_name
+	epatch ${FEDORA_FILES}/firefox-1.0-g-application-name.patch
 }
 
 src_compile() {
@@ -100,6 +116,7 @@
 	mozconfig_use_extension mozdevelop venkman
 	mozconfig_use_enable gnome gnomevfs
 	mozconfig_use_extension gnome gnomevfs
+	mozconfig_use_enable pango pango
 	mozconfig_use_enable mozsvg svg
 	mozconfig_use_enable mozsvg svg-renderer-cairo
 	mozconfig_annotate '' --with-default-mozilla-five-home=/usr/$(get_libdir)/MozillaFirefox
@@ -211,6 +228,9 @@
 	# this.
 	einfo "Extracting firefox-${PV} initialization files"
 	tar xjpf ${FILESDIR}/firefox-0.9-init.tar.bz2 -C ${D}/usr/$(get_libdir)/MozillaFirefox
+
+	# Manpage from the Fedora package:
+	doman ${FEDORA_FILES}/firefox.1
 }
 
 pkg_preinst() {
@@ -254,8 +274,15 @@
 	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
 	# thunderbird-bin ebuilds.
 	update_mozilla_launcher_symlinks
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
 	update_mozilla_launcher_symlinks
+
+	# Update mimedb if .desktop file removed (real uninstall)
+	[ -f ${ROOT}/usr/share/applications/mozilla-firefox.desktop ] \
+		|| fdo-mime_desktop_database_update
 }