[patch] 01_firefox-1.0.6-r1-fedora--minor_fixes.patch

01_firefox-1.0.6-r1-fedora--minor_fixes.patch (text/plain), 2.71 KB, created by TGL on 2005-07-22 09:18:36 UTC

--- mozilla-firefox-1.0.6-r1.ebuild.orig	2005-07-22 18:02:24.000000000 +0200
+++ mozilla-firefox-1.0.6-r1.ebuild	2005-07-22 17:51:27.000000000 +0200
@@ -1,9 +1,12 @@
 # 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-r1.ebuild,v 1.4 2005/07/22 00:01:59 agriffis Exp $
+# $Header: $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib fdo-mime
+
+FEDORA_VERSION="1.0.4-5"
+FEDORA_FILES="${WORKDIR}/fedora-files"
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
@@ -12,7 +15,9 @@
 	mirror://gentoo/mozilla-firefox-1.0.3-ia64.patch.bz2
 	mirror://gentoo/mozilla-jslibmath-alpha.patch
 	mirror://gentoo/mozilla-firefox-1.0.6-nsplugins.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.6-nsplugins.patch"
+	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.6-nsplugins.patch
+	mirror://gentoo/firefox-fedora-files-${FEDORA_VERSION}.tar.bz2
+	http://tdegreni.free.fr/gentoo/firefox/firefox-fedora-files-${FEDORA_VERSION}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
@@ -107,6 +112,16 @@
 
 	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
 	epatch ${DISTDIR}/mozilla-firefox-1.0.6-nsplugins.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() {
@@ -234,6 +249,9 @@
 
 	# Install docs
 	dodoc LEGAL LICENSE
+
+	# Manpage from the Fedora package:
+	doman ${FEDORA_FILES}/firefox.1
 }
 
 pkg_postinst() {
@@ -247,6 +265,9 @@
 	# 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() {
@@ -257,4 +278,8 @@
 		/usr/libexec/mozilla-launcher -register
 
 	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
 }