[gentoo-commits] gentoo commit in src/patchsets/xulrunner/1.9.2: 001-xul_gentoo_install_dirs.patch 112-bz466923_att350251_password_prompt_branding_fallback.patch 118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch 135-xulrunner-1.9.1.1-nptypes.h.patch 203-mozilla-about-firefox-version.patch 205-mozilla-ps-pdf-simplify-operators.patch 300-xulrunner-fix-jemalloc-vs-aslr.patch 400-libdl.patch 401-libsydney_oss.patch 402-oggzfbsd.patch 500-nsFrame-public.patch 700-sparc-build.patch

[Jory Pratt (anarchy)]

anarchy     10/01/29 15:37:29

  Added:                001-xul_gentoo_install_dirs.patch
                        112-bz466923_att350251_password_prompt_branding_fallback.patch
                        118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch
                        135-xulrunner-1.9.1.1-nptypes.h.patch
                        203-mozilla-about-firefox-version.patch
                        205-mozilla-ps-pdf-simplify-operators.patch
                        300-xulrunner-fix-jemalloc-vs-aslr.patch
                        400-libdl.patch 401-libsydney_oss.patch
                        402-oggzfbsd.patch 500-nsFrame-public.patch
                        700-sparc-build.patch
  Log:
  xulrunner-1.9.2 patchset

Revision  Changes    Path
1.1                  src/patchsets/xulrunner/1.9.2/001-xul_gentoo_install_dirs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/001-xul_gentoo_install_dirs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/001-xul_gentoo_install_dirs.patch?rev=1.1&content-type=text/plain

Index: 001-xul_gentoo_install_dirs.patch
===================================================================
diff -Naur mozilla-1.9.1.orig/config/autoconf.mk.in mozilla-1.9.1/config/autoconf.mk.in
--- mozilla-1.9.1.orig/config/autoconf.mk.in	2009-03-06 03:01:44.000000000 +0530
+++ mozilla-1.9.1/config/autoconf.mk.in	2009-04-26 18:59:19.992997721 +0530
@@ -57,14 +57,14 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir	= @includedir@/$(MOZ_APP_NAME)-@PV@
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-@PV@
 
-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir	= $(libdir)/$(MOZ_APP_NAME)-@PV@
+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-@PV@
 
 DIST		= $(DEPTH)/dist
 LIBXUL_SDK      = @LIBXUL_SDK@



1.1                  src/patchsets/xulrunner/1.9.2/112-bz466923_att350251_password_prompt_branding_fallback.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/112-bz466923_att350251_password_prompt_branding_fallback.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/112-bz466923_att350251_password_prompt_branding_fallback.patch?rev=1.1&content-type=text/plain

Index: 112-bz466923_att350251_password_prompt_branding_fallback.patch
===================================================================
---
 toolkit/components/passwordmgr/src/nsLoginManagerPrompter.js |   21 ++++++++---
 1 file changed, 16 insertions(+), 5 deletions(-)

Index: mozilla/toolkit/components/passwordmgr/src/nsLoginManagerPrompter.js
===================================================================
--- mozilla.orig/toolkit/components/passwordmgr/src/nsLoginManagerPrompter.js
+++ mozilla/toolkit/components/passwordmgr/src/nsLoginManagerPrompter.js
@@ -649,18 +649,24 @@
               this._getLocalizedString("notifyBarRememberButtonText");
         var rememberButtonAccessKey =
               this._getLocalizedString("notifyBarRememberButtonAccessKey");
         var notNowButtonText =
               this._getLocalizedString("notifyBarNotNowButtonText");
         var notNowButtonAccessKey =
               this._getLocalizedString("notifyBarNotNowButtonAccessKey");
 
-        var brandShortName =
-              this._brandBundle.GetStringFromName("brandShortName");
+        var brandShortName =  "toolkit@×××××××.org";
+        try {
+                brandShortName =
+                      this._brandBundle.GetStringFromName("brandShortName");
+        } catch (e) {
+                this.log ("no brandShortName available for prompting - most likely incomplete embedding.");
+        }
+
         var displayHost = this._getShortDisplayHost(aLogin.hostname);
         var notificationText;
         if (aLogin.username) {
             var displayUser = this._sanitizeUsername(aLogin.username);
             notificationText  = this._getLocalizedString(
                                         "saveLoginText",
                                         [brandShortName, displayUser, displayHost]);
         } else {
@@ -737,20 +743,25 @@
      *
      */
     _showSaveLoginDialog : function (aLogin) {
         const buttonFlags = Ci.nsIPrompt.BUTTON_POS_1_DEFAULT +
             (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_0) +
             (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_1) +
             (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_2);
 
-        var brandShortName =
-                this._brandBundle.GetStringFromName("brandShortName");
-        var displayHost = this._getShortDisplayHost(aLogin.hostname);
+        var brandShortName =  "toolkit@×××××××.org";
+        try {
+                brandShortName =
+                      this._brandBundle.GetStringFromName("brandShortName");
+        } catch (e) {
+                this.log ("no brandShortName available for prompting - most likely incomplete embedding.");
+        }
 
+        var displayHost = this._getShortDisplayHost(aLogin.hostname);
         var dialogText;
         if (aLogin.username) {
             var displayUser = this._sanitizeUsername(aLogin.username);
             dialogText = this._getLocalizedString(
                                  "saveLoginText",
                                  [brandShortName, displayUser, displayHost]);
         } else {
             dialogText = this._getLocalizedString(



1.1                  src/patchsets/xulrunner/1.9.2/118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch?rev=1.1&content-type=text/plain

Index: 118-bz467766_att351173-dont-reset-user-prefs-on-upgrade.patch
===================================================================

This bug is due to the fact, applications are restarted before extension
defaults are loaded.

To reproduce, choose any preference and set the values like:
system default:
  pref("prefkey",systemvalue);
extension default:
  pref("prefkey", extensiondefault);
user pref:
  user_pref("prefkey", systemvalue);

Next, trigger application behaviour similar to upgrade by removing compreg.dat
from profile and start the application.

Result:
User sees extensiondefault after upgrade, because the user_pref has been
eliminated ... which is definitly not what the user expects because he explicitly
had *systemvalue* set before the upgrade.

Evaluation:
The bug happens because restart is performed *before* extension defaults have been
loaded and the prefapi.cpp always eliminate user preference if the user preference
is equal to the actual default (which happens to be extensiondefault normally  - so
no reset, but is systemvalue during restart).

Fix:
1. savePrefs should not try to be smart ... this patch removes the heuristic that guesses
whether a setting can be eliminated or not; it should be sufficient to only eliminate
prefs in hashPrefs.

2. This patch prevents hashPrefs from eliminating the user pref in case we are in
*startup* ... unfortunately no such state info exists, which lets us guess that
we are in startup for the previously not dealt case: !set_default && 
!pref_ValueChanged(pref->defaultPref, value, type) && !PREF_HAS_USER_VALUE(pref).

If is the case we explicitly remember that this setting is a user-pref ...
even though it might be temporarily equal to the default pref.

---
 modules/libpref/src/prefapi.cpp |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Index: mozilla/modules/libpref/src/prefapi.cpp
===================================================================
--- mozilla.orig/modules/libpref/src/prefapi.cpp
+++ mozilla/modules/libpref/src/prefapi.cpp
@@ -324,23 +324,20 @@
     if (!pref)
         return PL_DHASH_NEXT;
 
     nsCAutoString prefValue;
 
     // where we're getting our pref from
     PrefValue* sourcePref;
 
-    if (PREF_HAS_USER_VALUE(pref) &&
-        pref_ValueChanged(pref->defaultPref,
-                          pref->userPref,
-                          (PrefType) PREF_TYPE(pref)))
-        sourcePref = &pref->userPref;
-    else if (PREF_IS_LOCKED(pref))
+    if (PREF_IS_LOCKED(pref))
         sourcePref = &pref->defaultPref;
+    else if (PREF_HAS_USER_VALUE(pref))
+        sourcePref = &pref->userPref;
     else
         // do not save default prefs that haven't changed
         return PL_DHASH_NEXT;
 
     // strings are in quotes!
     if (pref->flags & PREF_STRING) {
         prefValue = '\"';
         str_escape(sourcePref->stringVal, prefValue);
@@ -742,16 +739,27 @@
            Otherwise, set the user value only if it has changed */
         if ( !pref_ValueChanged(pref->defaultPref, value, type) )
         {
             if (PREF_HAS_USER_VALUE(pref))
             {
                 pref->flags &= ~PREF_USERSET;
                 if (!PREF_IS_LOCKED(pref))
                     valueChanged = PR_TRUE;
+            } else {
+                // this is tricky: we have !set_default ...
+                // thus we are setting a user pref; however the user
+                // pref set is same as *current default*; this normally
+                // means to un-set ... however since we have
+                // !PREF_HAS_USER_VALUE(pref) this can only be during
+                // startup
+                pref_SetValue(&pref->userPref, value, type);
+                pref->flags |= PREF_USERSET;
+                if (!PREF_IS_LOCKED(pref))
+                    valueChanged = PR_TRUE;
             }
         }
         else if ( !PREF_HAS_USER_VALUE(pref) ||
                    pref_ValueChanged(pref->userPref, value, type) )
         {
             pref_SetValue(&pref->userPref, value, type);
             pref->flags |= PREF_USERSET;
             if (!PREF_IS_LOCKED(pref))



1.1                  src/patchsets/xulrunner/1.9.2/135-xulrunner-1.9.1.1-nptypes.h.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/135-xulrunner-1.9.1.1-nptypes.h.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/135-xulrunner-1.9.1.1-nptypes.h.patch?rev=1.1&content-type=text/plain

Index: 135-xulrunner-1.9.1.1-nptypes.h.patch
===================================================================
--- modules/plugin/base/public/nptypes.h.orig	2009-07-27 09:29:43.345576888 +0430
+++ modules/plugin/base/public/nptypes.h	2009-07-27 09:31:09.416973317 +0430
@@ -36,6 +36,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifndef nptypes_h_
+#define nptypes_h_
+
 /*
  * Header file for ensuring that C99 types ([u]int32_t and bool) and
  * true/false macros are available.
@@ -111,3 +114,5 @@
     #endif
   #endif
 #endif
+
+#endif /* nptypes_h_ */




1.1                  src/patchsets/xulrunner/1.9.2/203-mozilla-about-firefox-version.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/203-mozilla-about-firefox-version.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/203-mozilla-about-firefox-version.patch?rev=1.1&content-type=text/plain

Index: 203-mozilla-about-firefox-version.patch
===================================================================
diff -up mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version mozilla-1.9.1/toolkit/content/Makefile.in
--- mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version	2009-06-29 18:15:23.000000000 +0200
+++ mozilla-1.9.1/toolkit/content/Makefile.in	2009-07-07 13:43:54.000000000 +0200
@@ -46,7 +46,7 @@ CHROME_DEPS = buildconfig.html
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += \
-  -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+  -DMOZ_APP_VERSION=$(FIREFOX_VERSION) \
   -Dtarget="$(target)" \
   -Dac_configure_args="$(ac_configure_args)" \
   -DCC="$(CC)" \



1.1                  src/patchsets/xulrunner/1.9.2/205-mozilla-ps-pdf-simplify-operators.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/205-mozilla-ps-pdf-simplify-operators.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/205-mozilla-ps-pdf-simplify-operators.patch?rev=1.1&content-type=text/plain

Index: 205-mozilla-ps-pdf-simplify-operators.patch
===================================================================
https://bugzilla.mozilla.org/show_bug.cgi?id=435313

Index: mozilla/gfx/thebes/public/gfxPDFSurface.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v
retrieving revision 1.13
diff -d -u -p -r1.13 gfxPDFSurface.h
--- mozilla/gfx/thebes/public/gfxPDFSurface.h	19 Mar 2008 20:51:42 -0000	1.13
+++ mozilla/gfx/thebes/public/gfxPDFSurface.h	23 May 2008 00:50:31 -0000
@@ -63,7 +63,11 @@ public:
     // this is in points!
     const gfxSize& GetSize() const { return mSize; }
 
-    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
+    virtual PRInt32 GetDefaultContextFlags() const
+    {
+        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
+               gfxContext::FLAG_DISABLE_SNAPPING;
+    }
 
 private:
     nsCOMPtr<nsIOutputStream> mStream;
Index: mozilla/gfx/thebes/public/gfxPSSurface.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v
retrieving revision 1.13
diff -d -u -p -r1.13 gfxPSSurface.h
--- mozilla/gfx/thebes/public/gfxPSSurface.h	19 Mar 2008 20:51:42 -0000	1.13
+++ mozilla/gfx/thebes/public/gfxPSSurface.h	23 May 2008 00:50:31 -0000
@@ -63,7 +63,11 @@ public:
     // this is in points!
     const gfxSize& GetSize() const { return mSize; }
 
-    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
+    virtual PRInt32 GetDefaultContextFlags() const
+    {
+        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
+               gfxContext::FLAG_DISABLE_SNAPPING;
+    }
 
 private:
     nsCOMPtr<nsIOutputStream> mStream;



1.1                  src/patchsets/xulrunner/1.9.2/300-xulrunner-fix-jemalloc-vs-aslr.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/300-xulrunner-fix-jemalloc-vs-aslr.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/300-xulrunner-fix-jemalloc-vs-aslr.patch?rev=1.1&content-type=text/plain

Index: 300-xulrunner-fix-jemalloc-vs-aslr.patch
===================================================================
diff -urpx 'cscope*' -x '.*.swp' mozilla-1.9.1-orig/memory/jemalloc/jemalloc.c mozilla-1.9.1/memory/jemalloc/jemalloc.c
--- mozilla-1.9.1-orig/memory/jemalloc/jemalloc.c	2009-07-30 17:30:25.000000000 +0200
+++ mozilla-1.9.1/memory/jemalloc/jemalloc.c	2009-08-10 14:28:59.000000000 +0200
@@ -392,7 +392,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib
 static const bool __isthreaded = true;
 #endif
 
-#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
+#if defined(MOZ_MEMORY_SOLARIS) || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
 #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
 #endif
 
@@ -2305,20 +2305,31 @@ pages_map_align(size_t size, int pfd, si
 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
 	 * of existing mappings, and we only want to create new mappings.
 	 */
-#ifdef MALLOC_PAGEFILE
-	if (pfd != -1) {
-		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-		    MAP_NOSYNC | MAP_ALIGN, pfd, 0);
-	} else
-#endif
-	       {
-		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-		    MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
-	}
+	ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
+		    MAP_NOSYNC| MAP_ANON, -1, 0);
 	assert(ret != NULL);
 
 	if (ret == MAP_FAILED)
 		ret = NULL;
+	else {
+		uintptr_t aligned_ret;
+		size_t extra_size;
+
+		aligned_ret = (uintptr_t)ret + alignment - 1;
+		aligned_ret &= ~(alignment - 1);
+		extra_size = aligned_ret - (uintptr_t)ret;
+		munmap(ret, extra_size);
+		munmap(ret + extra_size + size, alignment - extra_size);
+		ret = (void *)aligned_ret;
+#ifdef MALLOC_PAGEFILE
+		if (pfd != -1) {
+			ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
+			    MAP_NOSYNC | MAP_FIXED, pfd, 0);
+		}
+		if (ret == MAP_FAILED)
+			ret = NULL;
+#endif
+	}
 	return (ret);
 }
 #endif




1.1                  src/patchsets/xulrunner/1.9.2/400-libdl.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/400-libdl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/400-libdl.patch?rev=1.1&content-type=text/plain

Index: 400-libdl.patch
===================================================================
Check for dlopen in the libc too.
Some systems (eg FreeBSD) provide it there.

--- mozilla-1.9.2/configure.in.old	2010-01-11 00:15:26 +0100
+++ mozilla-1.9.2/configure.in	2010-01-11 00:27:10 +0100
@@ -3129,10 +3129,15 @@
     ;;
 *)
     AC_CHECK_LIB(m, atan)
-    AC_CHECK_LIB(dl, dlopen,
-    AC_CHECK_HEADER(dlfcn.h, 
-        LIBS="-ldl $LIBS"
-        AC_DEFINE(HAVE_LIBDL)))
+    ac_cv_my_have_libdl=no
+    AC_CHECK_FUNC(dlopen,
+        ac_cv_my_have_libdl=yes,
+        AC_CHECK_LIB(dl, dlopen,
+            ac_cv_my_have_libdl=yes
+            LIBS="-ldl $LIBS"))
+    if test "${ac_cv_my_have_libdl}" = "yes"; then
+    	AC_CHECK_HEADER(dlfcn.h, AC_DEFINE(HAVE_LIBDL))
+    fi
     ;;
 esac
 



1.1                  src/patchsets/xulrunner/1.9.2/401-libsydney_oss.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/401-libsydney_oss.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/401-libsydney_oss.patch?rev=1.1&content-type=text/plain

Index: 401-libsydney_oss.patch
===================================================================
--- mozilla-1.9.2/media/libsydneyaudio/src/Makefile.in.orig	2009-08-11 16:28:21.000000000 +0200
+++ mozilla-1.9.2/media/libsydneyaudio/src/Makefile.in	2009-08-11 16:29:08.000000000 +0200
@@ -45,6 +45,12 @@
 LIBRARY_NAME	= sydneyaudio
 FORCE_STATIC_LIB= 1
 
+ifeq ($(OS_ARCH),FreeBSD)
+CSRCS		= \
+		sydney_audio_oss.c \
+		$(NULL)
+endif
+
 ifeq ($(OS_ARCH),Linux)
 CSRCS		= \
 		sydney_audio_alsa.c \



1.1                  src/patchsets/xulrunner/1.9.2/402-oggzfbsd.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/402-oggzfbsd.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/402-oggzfbsd.patch?rev=1.1&content-type=text/plain

Index: 402-oggzfbsd.patch
===================================================================
--- mozilla-1.9.2/media/liboggz/include/oggz/oggz_off_t_generated.h.old	2010-01-11 01:52:46 +0100
+++ mozilla-1.9.2/media/liboggz/include/oggz/oggz_off_t_generated.h	2010-01-11 01:53:03 +0100
@@ -59,7 +59,7 @@
 
 #include <sys/types.h>
 
-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__FreeBSD__)
 typedef off_t oggz_off_t;
 #else
 typedef loff_t oggz_off_t;



1.1                  src/patchsets/xulrunner/1.9.2/500-nsFrame-public.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/500-nsFrame-public.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/500-nsFrame-public.patch?rev=1.1&content-type=text/plain

Index: 500-nsFrame-public.patch
===================================================================
diff -up xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h.old xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h
--- xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h.old	2009-11-11 15:34:51.000000000 +0100
+++ xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h	2009-11-11 15:33:09.000000000 +0100
@@ -157,7 +157,7 @@ private:
   // Left undefined; nsFrame objects are never allocated from the heap.
   void* operator new(size_t sz) CPP_THROW_NEW;
 
-protected:
+public:
   // Overridden to prevent the global delete from being called, since
   // the memory came out of an arena instead of the heap.
   //



1.1                  src/patchsets/xulrunner/1.9.2/700-sparc-build.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/700-sparc-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.2/700-sparc-build.patch?rev=1.1&content-type=text/plain

Index: 700-sparc-build.patch
===================================================================
diff -ur mozilla-1.9.2.orig/js/src/nanojit/CodeAlloc.cpp mozilla-1.9.2/js/src/nanojit/CodeAlloc.cpp
--- mozilla-1.9.2.orig/js/src/nanojit/CodeAlloc.cpp	2010-01-26 19:38:51.000000000 +0000
+++ mozilla-1.9.2/js/src/nanojit/CodeAlloc.cpp	2010-01-26 19:41:53.000000000 +0000
@@ -247,8 +247,20 @@
 #endif
 
 #ifdef AVMPLUS_SPARC
+#ifdef __linux__  // bugzilla 502369
+void sync_instruction_memory(caddr_t v, u_int len)
+{
+    caddr_t end = v + len;
+    caddr_t p = v;
+    while (p < end) {
+        asm("flush %0" : : "r" (p));
+        p += 32;
+    }
+}
+#else
 extern  "C" void sync_instruction_memory(caddr_t v, u_int len);
 #endif
+#endif
 
 #if defined NANOJIT_IA32 || defined NANOJIT_X64
     // intel chips have dcache/icache interlock