Add some patches and apply 'old' ones

3 files changed, 176 insertions, 1 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index d874acc..69f353d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,3 +1,4 @@
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX firefox.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
-EBUILD firefox-9999.ebuild 6626 RMD160 02eb92cf17ef603202f5bb56153de0697902704a SHA1 302605921b82538a3445a164862d746b0e0e3388 SHA256 964965f1673c573d332a422e749bc2f3eefce41f7aea41aa0ea52cc0dcf7dbc6
+AUX gentoo-specific.patch 5781 RMD160 72aaefae8fbc30bc98a4c03304514113d54a5eb4 SHA1 ff33db22b84a694c7505ce185f6d42ecaae7f8ce SHA256 fec933c8c4dd0bb56418a9b13e8c8e4d3a0ee7dd5f99c1ddd3fa3d0d67eb1053
+EBUILD firefox-9999.ebuild 6888 RMD160 95fbe99120f8b97dfa49380516c399a85e7702b4 SHA1 b8b023445ccbd5707551a63e52ee0fe7bba7a1e1 SHA256 6a01a2f78aeeff922ed3bf6beb58b6df28cae0a4622bcd329875c4181e248626
diff --git a/www-client/firefox/files/gentoo-specific.patch b/www-client/firefox/files/gentoo-specific.patch
new file mode 100644
index 0000000..4ef99fe
--- /dev/null
+++ b/www-client/firefox/files/gentoo-specific.patch
@@ -0,0 +1,165 @@
+diff --git a/extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java b/extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
+--- a/extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
++++ b/extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
+@@ -465,18 +465,18 @@ IXPCOMError {
+       grePath = getPathFromConfigFile(env, aVersions, aProperties);
+       if (grePath != null) {
+         return grePath;
+       }
+     }
+ 
+     final String greUserConfFile = ".gre.config";
+     final String greUserConfDir = ".gre.d";
+-    final String greConfPath = "/etc/gre.conf";
+-    final String greConfDir = "/etc/gre.d";
++    final String greConfPath = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.conf";
++    final String greConfDir = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
+ 
+     env = System.getProperty("user.home");
+     if (env != null) {
+       // Look in ~/.gre.config
+       grePath = getPathFromConfigFile(env + File.separator + greUserConfFile,
+                                       aVersions, aProperties);
+       if (grePath != null) {
+         return grePath;
+diff --git a/layout/base/nsPresArena.cpp b/layout/base/nsPresArena.cpp
+--- a/layout/base/nsPresArena.cpp
++++ b/layout/base/nsPresArena.cpp
+@@ -68,16 +68,20 @@
+ #define PL_ARENA_CONST_ALIGN_MASK ((PRUword(1) << ALIGN_SHIFT) - 1)
+ #include "plarena.h"
+ 
+ #ifdef _WIN32
+ # include <windows.h>
+ #else
+ # include <unistd.h>
+ # include <sys/mman.h>
++# ifdef SOLARIS
++/* madvise is not declared for C++ */
++extern "C" int madvise(void *addr, size_t len, int behav);
++# endif
+ # ifndef MAP_ANON
+ #  ifdef MAP_ANONYMOUS
+ #   define MAP_ANON MAP_ANONYMOUS
+ #  else
+ #   error "Don't know how to get anonymous memory"
+ #  endif
+ # endif
+ #endif
+diff --git a/xpcom/build/nsXPCOMPrivate.h b/xpcom/build/nsXPCOMPrivate.h
+--- a/xpcom/build/nsXPCOMPrivate.h
++++ b/xpcom/build/nsXPCOMPrivate.h
+@@ -274,18 +274,18 @@ void LogTerm();
+ #define GRE_FRAMEWORK_NAME "XUL.framework"
+ #define XUL_DLL            "XUL"
+ #else
+ #define XPCOM_SEARCH_KEY  "LD_LIBRARY_PATH"
+ #define XUL_DLL   "libxul"MOZ_DLL_SUFFIX
+ #endif
+ 
+ #define GRE_CONF_NAME ".gre.config"
+-#define GRE_CONF_PATH "/etc/gre.conf"
+-#define GRE_CONF_DIR  "/etc/gre.d"
++#define GRE_CONF_PATH "@GENTOO_PORTAGE_EPREFIX@/etc/gre.conf"
++#define GRE_CONF_DIR  "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d"
+ #define GRE_USER_CONF_DIR ".gre.d"
+ #endif
+ 
+ #if defined(XP_WIN) || defined(XP_OS2)
+   #define XPCOM_FILE_PATH_SEPARATOR       "\\"
+   #define XPCOM_ENV_PATH_SEPARATOR        ";"
+ #elif defined(XP_UNIX) || defined(XP_BEOS)
+   #define XPCOM_FILE_PATH_SEPARATOR       "/"
+diff --git a/xulrunner/app/nsRegisterGREUnix.cpp b/xulrunner/app/nsRegisterGREUnix.cpp
+--- a/xulrunner/app/nsRegisterGREUnix.cpp
++++ b/xulrunner/app/nsRegisterGREUnix.cpp
+@@ -107,17 +107,17 @@ RegisterXULRunner(PRBool aRegisterGlobal
+                   const GREProperty *aProperties, PRUint32 aPropertiesLen,
+                   const char *aGREMilestone)
+ {
+   // Register ourself in /etc/gre.d or ~/.gre.d/ and record what key we created
+   // for future unregistration.
+ 
+   nsresult rv;
+ 
+-  char root[MAXPATHLEN] = "/etc/gre.d";
++  char root[MAXPATHLEN] = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
+ 
+   if (!aRegisterGlobally) {
+     char *home = PR_GetEnv("HOME");
+     if (!home || !*home)
+       return PR_FALSE;
+ 
+     PR_snprintf(root, MAXPATHLEN, "%s/.gre.d", home);
+   }
+@@ -199,17 +199,17 @@ RegisterXULRunner(PRBool aRegisterGlobal
+ }
+ 
+ void
+ UnregisterXULRunner(PRBool aRegisterGlobally, nsIFile* aLocation,
+                     const char *aGREMilestone)
+ {
+   nsresult rv;
+ 
+-  char root[MAXPATHLEN] = "/etc/gre.d";
++  char root[MAXPATHLEN] = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
+ 
+   if (!aRegisterGlobally) {
+     char *home = PR_GetEnv("HOME");
+     if (!home || !*home)
+       return;
+ 
+     PR_snprintf(root, MAXPATHLEN, "%s/.gre.d", home);
+   }
+diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
+--- a/xulrunner/installer/Makefile.in
++++ b/xulrunner/installer/Makefile.in
+@@ -68,17 +68,17 @@ INSTALL_SDK = 1
+ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
+ 
+ $(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
+ 	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
+ 	  $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
+ 
+ ifndef SKIP_GRE_REGISTRATION
+ # to register xulrunner per-user, override this with $HOME/.gre.d
+-regdir = /etc/gre.d
++regdir = @sysconfdir@/gre.d
+ 
+ install:: $(MOZILLA_VERSION).system.conf
+ 	$(NSINSTALL) -D $(DESTDIR)$(regdir)
+ 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(regdir)
+ endif
+ 
+ # Add pkg-config files to the install:: target
+ 
+--- browser/components/preferences/advanced.js	2009-11-24 22:12:34.000000000 -0600
++++ browser/components/preferences/advanced.js-new	2009-12-02 10:26:18.378458863 -0600
+@@ -408,7 +408,7 @@
+     var enabledPref = document.getElementById("app.update.enabled");
+     var enableAppUpdate = document.getElementById("enableAppUpdate");
+ 
+-    enableAppUpdate.disabled = !aus.canCheckForUpdates || enabledPref.locked;
++    enableAppUpdate.disabled = true;
+   },
+ 
+   /**
+@@ -423,8 +423,7 @@
+     var updateModeLabel = document.getElementById("updateModeLabel");
+     var updateMode = document.getElementById("updateMode");
+     
+-    var disable = enabledPref.locked || !enabledPref.value ||
+-                  autoPref.locked;
++    var disable = true;
+     updateModeLabel.disabled = updateMode.disabled = disable;
+   },
+ 
+@@ -440,8 +439,7 @@
+     
+     var warnIncompatible = document.getElementById("warnIncompatible");
+     
+-    var disable = enabledPref.locked || !enabledPref.value || autoPref.locked ||
+-                  !autoPref.value || modePref.locked;
++    var disable = true;
+     warnIncompatible.disabled = disable;
+   },
diff --git a/www-client/firefox/firefox-9999.ebuild b/www-client/firefox/firefox-9999.ebuild
index a9be895..d2456ad 100644
--- a/www-client/firefox/firefox-9999.ebuild
+++ b/www-client/firefox/firefox-9999.ebuild
@@ -63,6 +63,15 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Gentoo specific stuff
+	epatch "${FILESDIR}"/gentoo-specific.patch
+	
+	eprefixify \
+		extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
+		xpcom/build/nsXPCOMPrivate.h \
+		xulrunner/installer/Makefile.in \
+		xulrunner/app/nsRegisterGREUnix.cpp
+	
 	# Gentoo install dirs
 	sed -i \
 		-e 's:$(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION):$(includedir)/idl:' \