patches for compiling against epiphany

(Portage version: 2.0.51.22-r2)

8 files changed, 569 insertions, 6 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index a4b662cb22a9..687462fc35ab 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,15 @@
 # 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.57 2005/07/23 16:07:23 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.58 2005/07/24 06:20:07 anarchy Exp $
+
+*mozilla-firefox-1.0.6-r3 (24 Jul 2005)
+
+  24 Jul 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +files/embedprompter-modal.patch, +files/gtk-prompt-service.patch, 
+  +files/gtk-tooltips.patch, +files/securebrowserui-iirq.patch, 
+  +mozilla-firefox-1.0.6-r3.ebuild:
+  updated to contain patches need to compile epiphany against. Reference
+  bug#86872
 
   23 Jul 2005; Guy Martin <gmsoft@gentoo.org>
   mozilla-firefox-1.0.6-r2.ebuild:
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 9e71c88da347..45988c72cefd 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,16 +1,22 @@
-MD5 b61cf69929bfb920c05deb478d38c942 ChangeLog 27071
+MD5 35e19621e0071291f855b15d217d7aa5 ChangeLog 27451
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 7bb0189d2dc2b0b7015314255ec51318 mozilla-firefox-1.0.5-r1.ebuild 8796
 MD5 9301706e1ba870836aaddcefa86e502a mozilla-firefox-1.0.6-r2.ebuild 8338
+MD5 fd7c22c3307035ad36b15c031716b6e1 mozilla-firefox-1.0.6-r3.ebuild 9161
 MD5 1652483bf7e1d08241cd5e0436bea2ae files/10MozillaFirefox 32
-MD5 8b34a3a356586c0dfc62afb61479b65b files/digest-mozilla-firefox-1.0.5-r1 302
-MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382
-MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818
 MD5 48baf2f328e6478812c24e59037ff99c files/firefox-0.9-init.tar.bz2 3322
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
 MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
+MD5 0aa74349ef4f69637967343f43540733 files/mozilla-firefox-1.0.3-prefs.patch 3406
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-firefox-1.0.4-gcc4.patch 1818
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
 MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+MD5 8b34a3a356586c0dfc62afb61479b65b files/digest-mozilla-firefox-1.0.5-r1 302
+MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r2 382
+MD5 8e7d6f3220336cd4467d20bbe402e09a files/embedprompter-modal.patch 1548
+MD5 3970f49b3f72cec38e126a2a140b524f files/gtk-prompt-service.patch 5520
+MD5 eafec999c965792bf81df6bcbbe6c5ea files/gtk-tooltips.patch 2308
+MD5 03df358b463796309e2ce8b87b180085 files/securebrowserui-iirq.patch 1101
+MD5 e71e3d11bf8e3a03f965cf894593c28c files/digest-mozilla-firefox-1.0.6-r3 382
 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-r3 b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r3
new file mode 100644
index 000000000000..f70f2d592ba5
--- /dev/null
+++ b/www-client/mozilla-firefox/files/digest-mozilla-firefox-1.0.6-r3
@@ -0,0 +1,5 @@
+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 9dfe0379cb62cc623c7f5752fb4dd849 mozilla-firefox-1.0.6-nsplugins.patch 1167
diff --git a/www-client/mozilla-firefox/files/embedprompter-modal.patch b/www-client/mozilla-firefox/files/embedprompter-modal.patch
new file mode 100644
index 000000000000..eb7208c98b45
--- /dev/null
+++ b/www-client/mozilla-firefox/files/embedprompter-modal.patch
@@ -0,0 +1,35 @@
+Index: embedding/browser/gtk/src/EmbedPrompter.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp,v
+retrieving revision 1.14
+diff -p -u -u -p -U10 -r1.14 EmbedPrompter.cpp
+--- embedding/browser/gtk/src/EmbedPrompter.cpp	15 Jan 2005 19:25:25 -0000	1.14
++++ embedding/browser/gtk/src/EmbedPrompter.cpp	24 Jan 2005 22:27:31 -0000
+@@ -97,20 +97,27 @@ EmbedPrompter::~EmbedPrompter(void)
+         delete[] mItemList;
+ }
+ 
+ nsresult
+ EmbedPrompter::Create(PromptType aType, GtkWindow* aParentWindow)
+ {
+     mWindow = gtk_dialog_new_with_buttons(mTitle.get(), aParentWindow,
+                                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                                           NULL);
+ 
++    /* only add the dialog to the window group if the parent already has a window group,
++     * so as not to break app's expectations about modal dialogs.
++     */
++    if (aParentWindow && GTK_WINDOW(aParentWindow)->group) {
++        gtk_window_group_add_window (GTK_WINDOW(aParentWindow)->group, GTK_WINDOW (mWindow));
++    }
++
+     // gtk will resize this for us as necessary
+     gtk_window_set_default_size(GTK_WINDOW(mWindow), 100, 50);
+ 
+     // this HBox will contain the icon, and a vbox which contains the
+     // dialog text and other widgets.
+     GtkWidget* dialogHBox = gtk_hbox_new(FALSE, 12);
+ 
+ 
+     // Set up dialog properties according to the GNOME HIG
+     // (http://developer.gnome.org/projects/gup/hig/1.0/windows.html#alert-windows)
diff --git a/www-client/mozilla-firefox/files/gtk-prompt-service.patch b/www-client/mozilla-firefox/files/gtk-prompt-service.patch
new file mode 100644
index 000000000000..a5829b7121d2
--- /dev/null
+++ b/www-client/mozilla-firefox/files/gtk-prompt-service.patch
@@ -0,0 +1,138 @@
+? p
+Index: embedding/browser/gtk/src/GtkPromptService.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/GtkPromptService.cpp,v
+retrieving revision 1.6
+diff -p -u -U10 -r1.6 GtkPromptService.cpp
+--- embedding/browser/gtk/src/GtkPromptService.cpp	29 Sep 2003 06:03:48 -0000	1.6
++++ embedding/browser/gtk/src/GtkPromptService.cpp	26 Oct 2004 14:02:19 -0000
+@@ -68,20 +68,22 @@ GtkPromptService::Alert(nsIDOMWindow* aP
+     prompter.Run();
+     return NS_OK;
+ }
+ 
+ NS_IMETHODIMP
+ GtkPromptService::AlertCheck(nsIDOMWindow* aParent,
+                              const PRUnichar* aDialogTitle,
+                              const PRUnichar* aDialogText,
+                              const PRUnichar* aCheckMsg, PRBool* aCheckValue)
+ {
++    NS_ENSURE_ARG_POINTER(aCheckValue);
++
+     EmbedPrompter prompter;
+     prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Alert").get());
+     prompter.SetMessageText(aDialogText);
+     prompter.SetCheckMessage(aCheckMsg);
+     prompter.SetCheckValue(*aCheckValue);
+     prompter.Create(EmbedPrompter::TYPE_ALERT_CHECK,
+                     GetGtkWindowForDOMWindow(aParent));
+     prompter.Run();
+     prompter.GetCheckValue(aCheckValue);
+     return NS_OK;
+@@ -102,20 +104,22 @@ GtkPromptService::Confirm(nsIDOMWindow* 
+     return NS_OK;
+ }
+ 
+ NS_IMETHODIMP
+ GtkPromptService::ConfirmCheck(nsIDOMWindow* aParent,
+                                const PRUnichar* aDialogTitle,
+                                const PRUnichar* aDialogText,
+                                const PRUnichar* aCheckMsg,
+                                PRBool* aCheckValue, PRBool* aConfirm)
+ {
++    NS_ENSURE_ARG_POINTER(aCheckValue);
++
+     EmbedPrompter prompter;
+     prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Confirm").get());
+     prompter.SetMessageText(aDialogText);
+     prompter.SetCheckMessage(aCheckMsg);
+     prompter.SetCheckValue(*aCheckValue);
+     prompter.Create(EmbedPrompter::TYPE_CONFIRM_CHECK,
+                     GetGtkWindowForDOMWindow(aParent));
+     prompter.Run();
+     prompter.GetCheckValue(aCheckValue);
+     prompter.GetConfirmValue(aConfirm);
+@@ -164,24 +168,25 @@ GtkPromptService::ConfirmEx(nsIDOMWindow
+ NS_IMETHODIMP
+ GtkPromptService::Prompt(nsIDOMWindow* aParent, const PRUnichar* aDialogTitle,
+                          const PRUnichar* aDialogText, PRUnichar** aValue,
+                          const PRUnichar* aCheckMsg, PRBool* aCheckValue,
+                          PRBool* aConfirm)
+ {
+     EmbedPrompter prompter;
+     prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get());
+     prompter.SetMessageText(aDialogText);
+     prompter.SetTextValue(*aValue);
+-    if (aCheckMsg) {
++    if (aCheckMsg)
+         prompter.SetCheckMessage(aCheckMsg);
++    if (aCheckValue)
+         prompter.SetCheckValue(*aCheckValue);
+-    }
++
+     prompter.Create(EmbedPrompter::TYPE_PROMPT,
+                     GetGtkWindowForDOMWindow(aParent));
+     prompter.Run();
+     if (aCheckValue)
+         prompter.GetCheckValue(aCheckValue);
+     prompter.GetConfirmValue(aConfirm);
+     if (aConfirm) {
+         if (*aValue)
+             nsMemory::Free(*aValue);
+         prompter.GetTextValue(aValue);
+@@ -197,24 +202,25 @@ GtkPromptService::PromptUsernameAndPassw
+                                             PRUnichar** aPassword,
+                                             const PRUnichar* aCheckMsg,
+                                             PRBool* aCheckValue,
+                                             PRBool* aConfirm)
+ {
+     EmbedPrompter prompter;
+     prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get());
+     prompter.SetMessageText(aDialogText);
+     prompter.SetUser(*aUsername);
+     prompter.SetPassword(*aPassword);
+-    if (aCheckMsg) {
++    if (aCheckMsg)
+         prompter.SetCheckMessage(aCheckMsg);
++    if (aCheckValue)
+         prompter.SetCheckValue(*aCheckValue);
+-    }
++
+     prompter.Create(EmbedPrompter::TYPE_PROMPT_USER_PASS,
+                     GetGtkWindowForDOMWindow(aParent));
+     prompter.Run();
+     if (aCheckValue)
+         prompter.GetCheckValue(aCheckValue);
+     prompter.GetConfirmValue(aConfirm);
+     if (*aConfirm) {
+         if (*aUsername)
+             nsMemory::Free(*aUsername);
+         prompter.GetUser(aUsername);
+@@ -231,24 +237,25 @@ GtkPromptService::PromptPassword(nsIDOMW
+                                  const PRUnichar* aDialogTitle,
+                                  const PRUnichar* aDialogText,
+                                  PRUnichar** aPassword,
+                                  const PRUnichar* aCheckMsg,
+                                  PRBool* aCheckValue, PRBool* aConfirm)
+ {
+     EmbedPrompter prompter;
+     prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get());
+     prompter.SetMessageText(aDialogText);
+     prompter.SetPassword(*aPassword);
+-    if (aCheckMsg) {
++    if (aCheckMsg)
+         prompter.SetCheckMessage(aCheckMsg);
++    if (aCheckValue)
+         prompter.SetCheckValue(*aCheckValue);
+-    }
++
+     prompter.Create(EmbedPrompter::TYPE_PROMPT_PASS,
+                     GetGtkWindowForDOMWindow(aParent));
+     prompter.Run();
+     if (aCheckValue)
+         prompter.GetCheckValue(aCheckValue);
+     prompter.GetConfirmValue(aConfirm);
+     if (*aConfirm) {
+         if (*aPassword)
+             nsMemory::Free(*aPassword);
+         prompter.GetPassword(aPassword);
diff --git a/www-client/mozilla-firefox/files/gtk-tooltips.patch b/www-client/mozilla-firefox/files/gtk-tooltips.patch
new file mode 100644
index 000000000000..9d40fdca62b3
--- /dev/null
+++ b/www-client/mozilla-firefox/files/gtk-tooltips.patch
@@ -0,0 +1,58 @@
+Index: embedding/browser/gtk/src/EmbedWindow.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp,v
+retrieving revision 1.30
+diff -p -u -u -p -r1.30 EmbedWindow.cpp
+--- embedding/browser/gtk/src/EmbedWindow.cpp	28 Jul 2004 20:54:50 -0000	1.30
++++ embedding/browser/gtk/src/EmbedWindow.cpp	26 Oct 2004 13:12:27 -0000
+@@ -383,6 +383,19 @@ EmbedWindow::SetVisibility(PRBool aVisib
+ 
+ // nsITooltipListener
+ 
++static gint
++tooltips_paint_window(GtkWidget *window)
++{
++  // draw tooltip style border around the text
++  gtk_paint_flat_box(window->style, window->window,
++                     GTK_STATE_NORMAL, GTK_SHADOW_OUT,
++                     NULL, window, "tooltip",
++                     0, 0,
++                     window->allocation.width, window->allocation.height);
++
++  return FALSE;
++}
++                                     
+ NS_IMETHODIMP
+ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords,
+ 			   const PRUnichar *aTipText)
+@@ -433,12 +446,15 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoo
+   // realize the widget
+   gtk_widget_realize(sTipWindow);
+ 
++  gtk_signal_connect(GTK_OBJECT(sTipWindow), "expose_event",
++                     GTK_SIGNAL_FUNC(tooltips_paint_window), NULL);
++
+   // set up the label for the tooltip
+   GtkWidget *label = gtk_label_new(tipString);
+   // wrap automatically
+   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+   gtk_container_add(GTK_CONTAINER(sTipWindow), label);
+-  gtk_container_set_border_width(GTK_CONTAINER(sTipWindow), 3);
++  gtk_container_set_border_width(GTK_CONTAINER(sTipWindow), 4);
+   // set the coords for the widget
+   gtk_widget_set_uposition(sTipWindow, aXCoords + root_x,
+ 			   aYCoords + root_y);
+@@ -446,13 +462,6 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoo
+   // and show it.
+   gtk_widget_show_all(sTipWindow);
+ 
+-  // draw tooltip style border around the text
+-  gtk_paint_flat_box(sTipWindow->style, sTipWindow->window,
+-           GTK_STATE_NORMAL, GTK_SHADOW_OUT, 
+-           NULL, GTK_WIDGET(sTipWindow), "tooltip",
+-           0, 0,
+-           sTipWindow->allocation.width, sTipWindow->allocation.height);
+-
+ #ifdef MOZ_WIDGET_GTK
+   gtk_widget_popup(sTipWindow, aXCoords + root_x, aYCoords + root_y);
+ #endif /* MOZ_WIDGET_GTK */
diff --git a/www-client/mozilla-firefox/files/securebrowserui-iirq.patch b/www-client/mozilla-firefox/files/securebrowserui-iirq.patch
new file mode 100644
index 000000000000..9eecd60b6b5b
--- /dev/null
+++ b/www-client/mozilla-firefox/files/securebrowserui-iirq.patch
@@ -0,0 +1,32 @@
+Index: security/manager/boot/src/nsSecureBrowserUIImpl.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp,v
+retrieving revision 1.34.2.2
+diff -p -u -u -p -U10 -r1.34.2.2 nsSecureBrowserUIImpl.cpp
+--- security/manager/boot/src/nsSecureBrowserUIImpl.cpp	8 Oct 2004 22:59:03 -0000	1.34.2.2
++++ security/manager/boot/src/nsSecureBrowserUIImpl.cpp	8 Jan 2005 22:30:09 -0000
+@@ -1278,20 +1278,24 @@ NS_IMETHODIMP nsUIContext::GetInterface(
+   nsresult rv;
+ 
+   if (uuid.Equals(NS_GET_IID(nsIPrompt))) {
+     nsCOMPtr<nsIDOMWindowInternal> internal = do_QueryInterface(mWindow, &rv);
+     if (NS_FAILED(rv)) return rv;
+ 
+     nsIPrompt *prompt;
+ 
+     rv = internal->GetPrompter(&prompt);
+     *result = prompt;
++  } else if (uuid.Equals(NS_GET_IID(nsIDOMWindow))) {
++    *result = mWindow;
++    NS_ADDREF ((nsISupports*) *result);
++    rv = NS_OK;
+   } else {
+     rv = NS_ERROR_NO_INTERFACE;
+   }
+ 
+   return rv;
+ }
+ 
+ nsresult nsSecureBrowserUIImpl::
+ GetNSSDialogs(nsISecurityWarningDialogs **result)
+ {
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r3.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r3.ebuild
new file mode 100644
index 000000000000..f0f854655896
--- /dev/null
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.0.6-r3.ebuild
@@ -0,0 +1,280 @@
+# 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-r3.ebuild,v 1.1 2005/07/24 06:20:07 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
+	mirror://gentoo/mozilla-firefox-1.0.6-nsplugins.patch
+	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.6-nsplugins.patch"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="gnome java mozdevelop mozsvg mozcalendar"
+
+# 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}/mozilla-firefox-1.0.4-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-firefox-1.0.6-nsplugins.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
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	####################################
+	#
+	# 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 mozcalendar calendar
+	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
+	#
+	####################################
+
+	LD="$(tc-getLD)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+	econf || die
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL --no-preserve=links ${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
+
+	# Dirty hack to get some applications using this header running
+	dosym ${MOZILLA_FIVE_HOME}/include/necko/nsIURI.h \
+		/usr/lib/${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
+	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|" ${x}
+		doins ${x}
+	done
+
+	# Install env.d snippet, which isn't necessary for running firefox, but
+	# might be necessary for programs linked against firefox
+	insinto /etc/env.d
+	doins ${FILESDIR}/10MozillaFirefox
+	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10MozillaFirefox
+
+	# 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
+}