[gentoo-commits] gentoo commit in src/patchsets/xulrunner/1.8.1.10: 001_firefox-arm.patch 002_firefox-libdeps.patch 003_firefox-bus-error.patch 004_mozilla-hppa.patch 005_mozilla-firefox-1.5-ia64.patch 006_mips-asm.patch 007_mozilla-firefox-1.5-asneeded.patch 008_xulrunner-gentoo-pkgconfig-1.patch 010_visibility-gcc-4.2.patch 011-canvas_fix-bug405584.patch 032_firefox-2.0_ppc64-1.patch 033_firefox-2.0_ppc_powerpc.patch 050_respect-host-variable.patch 055_firefox-2.0_gfbsd-pthreads.patch 060_embed-typeaheadfind-1.patch 063_firefox-rpath-3.patch 064_firefox-nsplugins-v2.patch 110_components_no_exec.patch 110_icons.patch 110_no_chrome_list.patch 115_jni.patch 115_pyxpcom_deadcode.patch 120_about:plugins.patch 125_gnome_helpers_with_params.patch 125_xpidl.patch 125_xrender_bug_workaround.patch 130_embedding_tests.patch 130_killAll.patch 131_system_bz2.patch 135_gtkmozembed_change_toplevel.patch 135_pango_null_char.patch 135_zip_cache.patch 160_config_install.patch 160_j! s_binary.patch 160 _pyxpcom.patch 160_xpcomstub.patch 161_javaxpcom.patch 165_mouse_buttons.patch 165_native_uconv.patch 180_libxpcom_hack.patch 180_no_examples.patch 180_no_sys_profile.patch 181_sonames.patch 182_locale.patch 182_prefs.patch 185_installer.patch 185_no_register.patch 185_sidebar.patch 185_useragent.patch 185_xpcomglue.patch 300_firefox-1.5-makeopts.patch 401_firefox-1.5-theme-change.patch 402_firefox-2.0-pango-cursor.patch 501_firefox-2.0-gtk-cursors.patch 502_xulrunner-2.0-window-blur.patch 600_python_dynamic.patch 610_xpcom_sample.patch 801_fbsd-1.patch 802_fbsd-2.patch 803_fbsd-3.patch

[Raul Porcel (armin76)]

armin76     07/11/29 18:13:35

  Added:                001_firefox-arm.patch 002_firefox-libdeps.patch
                        003_firefox-bus-error.patch 004_mozilla-hppa.patch
                        005_mozilla-firefox-1.5-ia64.patch
                        006_mips-asm.patch
                        007_mozilla-firefox-1.5-asneeded.patch
                        008_xulrunner-gentoo-pkgconfig-1.patch
                        010_visibility-gcc-4.2.patch
                        011-canvas_fix-bug405584.patch
                        032_firefox-2.0_ppc64-1.patch
                        033_firefox-2.0_ppc_powerpc.patch
                        050_respect-host-variable.patch
                        055_firefox-2.0_gfbsd-pthreads.patch
                        060_embed-typeaheadfind-1.patch
                        063_firefox-rpath-3.patch
                        064_firefox-nsplugins-v2.patch
                        110_components_no_exec.patch 110_icons.patch
                        110_no_chrome_list.patch 115_jni.patch
                        115_pyxpcom_deadcode.patch 120_about:plugins.patch
                        125_gnome_helpers_with_params.patch 125_xpidl.patch
                        125_xrender_bug_workaround.patch
                        130_embedding_tests.patch 130_killAll.patch
                        131_system_bz2.patch
                        135_gtkmozembed_change_toplevel.patch
                        135_pango_null_char.patch 135_zip_cache.patch
                        160_config_install.patch 160_js_binary.patch
                        160_pyxpcom.patch 160_xpcomstub.patch
                        161_javaxpcom.patch 165_mouse_buttons.patch
                        165_native_uconv.patch 180_libxpcom_hack.patch
                        180_no_examples.patch 180_no_sys_profile.patch
                        181_sonames.patch 182_locale.patch 182_prefs.patch
                        185_installer.patch 185_no_register.patch
                        185_sidebar.patch 185_useragent.patch
                        185_xpcomglue.patch 300_firefox-1.5-makeopts.patch
                        401_firefox-1.5-theme-change.patch
                        402_firefox-2.0-pango-cursor.patch
                        501_firefox-2.0-gtk-cursors.patch
                        502_xulrunner-2.0-window-blur.patch
                        600_python_dynamic.patch 610_xpcom_sample.patch
                        801_fbsd-1.patch 802_fbsd-2.patch 803_fbsd-3.patch
  Log:
  ADddd patches for 2.0.0.10

Revision  Changes    Path
1.1                  src/patchsets/xulrunner/1.8.1.10/001_firefox-arm.patch

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

Index: 001_firefox-arm.patch
===================================================================
# Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=336183

--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	2006-05-17 02:02:51.000000000 -0400
+++ mozilla-16052006/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	2006-05-17 01:17:16.000000000 -0400
@@ -39,18 +39,31 @@
 /* Implement shared vtbl methods. */
 
 #include "xptcprivate.h"
 
 #if !defined(LINUX) || !defined(__arm__)
 #error "This code is for Linux ARM only. Please check if it works for you, too.\nDepends strongly on gcc behaviour."
 #endif
 
+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+/* This tells gcc3.4+ not to optimize away symbols.
+ * @see http://gcc.gnu.org/gcc-3.4/changes.html
+ */
+#define DONT_DROP_OR_WARN __attribute__((used))
+#else
+/* This tells older gccs not to warn about unused vairables.
+ * @see http://docs.freebsd.org/info/gcc/gcc.info.Variable_Attributes.html
+ */
+#define DONT_DROP_OR_WARN __attribute__((unused))
+#endif
+
 /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch") 
+DONT_DROP_OR_WARN;
 
 static nsresult
 PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
 {
 #define PARAM_BUFFER_COUNT     16
 
     nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
     nsXPTCMiniVariant* dispatchParams = NULL;



1.1                  src/patchsets/xulrunner/1.8.1.10/002_firefox-libdeps.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/002_firefox-libdeps.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/002_firefox-libdeps.patch?rev=1.1&content-type=text/plain

Index: 002_firefox-libdeps.patch
===================================================================
# Linking issue with pango
#
#  https://bugzilla.mozilla.org/show_bug.cgi?id=344821

--- mozilla/layout/build/Makefile.in.orig	2006-07-16 00:24:51.000000000 +1000
+++ mozilla/layout/build/Makefile.in	2006-07-16 00:35:51.000000000 +1000
@@ -213,6 +213,12 @@
 		$(NULL)
 endif
 
+ifdef MOZ_ENABLE_CANVAS
+ifdef MOZ_ENABLE_XFT
+EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS)
+endif
+endif
+
 ifdef NS_TRACE_MALLOC
 EXTRA_DSO_LIBS	+= tracemalloc
 endif



1.1                  src/patchsets/xulrunner/1.8.1.10/003_firefox-bus-error.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/003_firefox-bus-error.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/003_firefox-bus-error.patch?rev=1.1&content-type=text/plain

Index: 003_firefox-bus-error.patch
===================================================================
diff -aur a/gfx/src/gtk/nsFontMetricsPango.cpp b/gfx/src/gtk/nsFontMetricsPango.cpp
--- a/gfx/src/gtk/nsFontMetricsPango.cpp	2006-02-23 13:01:42.000000000 -0800
+++ b/gfx/src/gtk/nsFontMetricsPango.cpp	2006-05-20 20:27:50.000000000 -0700
@@ -535,8 +535,13 @@
 
     PangoLayout *layout = pango_layout_new(mPangoContext);
 
-    gchar *text = g_utf16_to_utf8(aString, aLength,
+    // Just copy the aString to ensure the alignment,
+    // it is not used anywhere else.
+    PRUnichar* dummy = new PRUnichar[aLength];
+    memcpy(dummy, aString, aLength*sizeof(PRUnichar));
+    gchar *text = g_utf16_to_utf8(dummy, aLength,
                                   NULL, NULL, NULL);
+    delete [] dummy;
 
     if (!text) {
 #ifdef DEBUG
diff -aur a/intl/lwbrk/src/nsJISx4501LineBreaker.cpp b/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
--- a/intl/lwbrk/src/nsJISx4501LineBreaker.cpp	2004-04-18 07:21:07.000000000 -0700
+++ b/intl/lwbrk/src/nsJISx4501LineBreaker.cpp	2006-05-20 20:27:51.000000000 -0700
@@ -487,13 +487,13 @@
   PRUint32 cur;
   for (cur = aPos; cur < aLen; ++cur)
   {
-    if (IS_SPACE(aText[cur]))
+    if (IS_SPACE(GetUnichar(&aText[cur])))
     {
       *oNext = cur;
       *oNeedMoreText = PR_FALSE;
       return NS_OK;
     }
-    if (IS_CJK_CHAR(aText[cur]))
+    if (IS_CJK_CHAR(GetUnichar(&aText[cur])))
       goto ROUTE_CJK_NEXT;
   }
   *oNext = aLen;
@@ -503,13 +503,13 @@
 ROUTE_CJK_NEXT:
   PRInt8 c1, c2;
   cur = aPos;
-  if(NEED_CONTEXTUAL_ANALYSIS(aText[cur]))
+  if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur])))
   {
-    c1 = this->ContextualAnalysis((cur>0)?aText[cur-1]:0,
-                                  aText[cur],
-                                  (cur<(aLen-1)) ?aText[cur+1]:0);
+    c1 = this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0,
+                                  GetUnichar(&aText[cur]),
+                                  (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0);
   } else  {
-    c1 = this->GetClass(aText[cur]);
+    c1 = this->GetClass(GetUnichar(&aText[cur]));
   }
   
   if(CLASS_THAI == c1) 
@@ -521,13 +521,13 @@
 
   for(cur++; cur <aLen; cur++)
   {
-     if(NEED_CONTEXTUAL_ANALYSIS(aText[cur]))
+     if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur])))
      {
-       c2= this->ContextualAnalysis((cur>0)?aText[cur-1]:0,
-                                  aText[cur],
-                                  (cur<(aLen-1)) ?aText[cur+1]:0);
+       c2= this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0,
+                                  GetUnichar(&aText[cur]),
+                                  (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0);
      } else {
-       c2 = this->GetClass(aText[cur]);
+       c2 = this->GetClass(GetUnichar(&aText[cur]));
      }
 
      if(GetPair(c1, c2)) {
diff -aur a/intl/unicharutil/util/nsUnicharUtils.cpp b/intl/unicharutil/util/nsUnicharUtils.cpp
--- a/intl/unicharutil/util/nsUnicharUtils.cpp	2005-04-21 15:30:21.000000000 -0700
+++ b/intl/unicharutil/util/nsUnicharUtils.cpp	2006-05-20 20:27:50.000000000 -0700
@@ -340,3 +340,28 @@
     return result;
 }
 
+PRUnichar
+GetUnichar(const void *ptr)
+{
+    PRUnichar result;
+#if defined(__sparc__) || defined(__alpha__)
+    *((char *) &result) = *((char *) ptr);
+    *((char *) &result + 1) = *((char *) ptr + 1);
+#else
+    result = *((PRUnichar *) ptr);
+#endif
+    return result;
+}
+
+void
+SetUnichar(void *ptr, PRUnichar aChar)
+{
+#if defined(__sparc__) || defined(__alpha__)
+    *((char *) ptr) = *((char *) &aChar);
+    *((char *) ptr + 1) = *((char *) &aChar + 1);
+#else
+    *((PRUnichar *) ptr) = aChar;
+#endif
+}
+
+
diff -aur a/intl/unicharutil/util/nsUnicharUtils.h b/intl/unicharutil/util/nsUnicharUtils.h
--- a/intl/unicharutil/util/nsUnicharUtils.h	2005-02-24 07:50:57.000000000 -0800
+++ b/intl/unicharutil/util/nsUnicharUtils.h	2006-05-20 20:27:50.000000000 -0700
@@ -81,6 +81,8 @@
 
 PRUnichar ToUpperCase(PRUnichar);
 PRUnichar ToLowerCase(PRUnichar);
+PRUnichar GetUnichar(const void *);
+void SetUnichar(void *, PRUnichar);
 
 inline PRBool IsUpperCase(PRUnichar c) {
     return ToLowerCase(c) != c;
diff -aur a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
--- a/layout/generic/nsTextFrame.cpp	2006-02-13 18:05:07.000000000 -0800
+++ b/layout/generic/nsTextFrame.cpp	2006-05-20 20:27:50.000000000 -0700
@@ -5101,8 +5101,8 @@
   
   while (aNumChars-- > 0) {
     // XXX: If you crash here then you may see the issue described
-    // in http://bugzilla.mozilla.org/show_bug.cgi?id=36146#c44
-    *cp2-- = PRUnichar(*cp1--);
+    // in http://bugzilla.mozilla.org/show_bug.cgi?id=161826
+    SetUnichar(cp2--, PRUnichar(*cp1--));
   }
 }
  
@@ -6199,9 +6199,9 @@
 {
   PRUnichar* end = aBuffer + aWordLen;
   for (; aBuffer < end; aBuffer++) {
-    PRUnichar ch = *aBuffer;
+    PRUnichar ch = GetUnichar(aBuffer);
     if (ch == ' ') {
-      *aBuffer = CH_NBSP;
+      SetUnichar(aBuffer, CH_NBSP);
     }
   }
 }



1.1                  src/patchsets/xulrunner/1.8.1.10/004_mozilla-hppa.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/004_mozilla-hppa.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/004_mozilla-hppa.patch?rev=1.1&content-type=text/plain

Index: 004_mozilla-hppa.patch
===================================================================
# Original patch just cleaned up, Author on original patch was Randolph Chung  (tausq@××××××.org)
# Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=287150

Index: xpcom/reflect/xptcall/src/md/unix/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in,v
retrieving revision 1.92
diff -u -B -u -8 -p -r1.92 Makefile.in
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in	14 Dec 2006 19:13:43 -0000	1.92
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	3 Jan 2007 18:20:44 -0000
@@ -185,16 +185,29 @@ CPPSRCS		:= xptcinvoke_ipf32.cpp xptcstu
 ASFILES		:= xptcstubs_asm_ipf32.s xptcinvoke_asm_ipf32.s
 endif
 
 # #18875  Building the CPP's (CXX) optimized causes a crash
 CXXFLAGS 	:=  $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS))
 endif
 endif
 
+#
+# Linux/HPPA/gcc
+#
+ifeq ($(OS_ARCH),Linux)
+ifneq (,$(filter hppa2.0 hppa1.1,$(OS_TEST)))
+#ifeq ($(CC),gcc)  # Do not check for gcc since there is only this compiler on linux for hppa
+CPPSRCS		:= xptcinvoke_pa32.cpp xptcstubs_pa32.cpp
+ASFILES		:= xptcstubs_asm_parisc_linux.s xptcinvoke_asm_parisc_linux.s
+#endif
+endif
+endif
+
+
 ######################################################################
 # M68k
 ######################################################################
 #
 # NetBSD/m68k
 #
 ifeq ($(OS_ARCH),NetBSD)
 ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s
===================================================================
RCS file: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s
diff -N xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s	3 Jan 2007 18:20:44 -0000
@@ -0,0 +1,102 @@
+
+	.LEVEL 1.1
+	.text
+	.align 4
+
+framesz:
+	.equ 128
+
+.globl XPTC_InvokeByIndex
+	.type XPTC_InvokeByIndex, @function
+
+
+XPTC_InvokeByIndex:
+  	.PROC
+	.CALLINFO FRAME=72, CALLER,SAVE_RP, SAVE_SP, ENTRY_GR=3
+	.ENTRY
+
+ ; frame marker takes 48 bytes,
+ ; register spill area takes 8 bytes,
+ ; local stack area takes 72 bytes result in 128 bytes total
+
+        STW          %rp,-20(%sp)
+        STW,MA       %r3,128(%sp)
+
+        LDO     -framesz(%r30),%r28
+        STW     %r28,-4(%r30)       ; save previous sp
+        STW     %r19,-32(%r30)
+
+        STW     %r26,-36-framesz(%r30)  ; save argument registers in
+        STW     %r25,-40-framesz(%r30)  ; in PREVIOUS frame
+        STW     %r24,-44-framesz(%r30)  ;
+        STW     %r23,-48-framesz(%r30)  ;
+
+	.CALL   ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26;out=28
+        BL    invoke_count_bytes,%r31
+        COPY    %r31,%r2
+
+        CMPIB,>=        0,%r28, .+76
+        COPY    %r30,%r3            ; copy stack ptr to saved stack ptr
+        ADD     %r30,%r28,%r30      ; extend stack frame
+        LDW     -4(%r3),%r28        ; move frame
+        STW     %r28,-4(%r30)
+        LDW     -8(%r3),%r28
+        STW     %r28,-8(%r30)
+        LDW     -12(%r3),%r28
+        STW     %r28,-12(%r30)
+        LDW     -16(%r3),%r28
+        STW     %r28,-16(%r30)
+        LDW     -20(%r3),%r28
+        STW     %r28,-20(%r30)
+        LDW     -24(%r3),%r28
+        STW     %r28,-24(%r30)
+        LDW     -28(%r3),%r28
+        STW     %r28,-28(%r30)
+        LDW     -32(%r3),%r28
+        STW     %r28,-32(%r30)
+
+        LDO     -40(%r30),%r26         ; load copy address
+        LDW     -44-framesz(%r3),%r25  ; load rest of 2 arguments
+        LDW     -48-framesz(%r3),%r24  ;
+
+        LDW     -32(%r30),%r19 ; shared lib call destroys r19; reload
+        .CALL   ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26
+        BL    invoke_copy_to_stack,%r31
+        COPY    %r31,%r2
+
+        LDO     -48(%r30),%r20
+        EXTRW,U,= %r28,31,1,%r22
+        FLDD    0(%r20),%fr7  ; load double arg 1
+        EXTRW,U,= %r28,30,1,%r22
+        FLDW    8(%r20),%fr5L ; load float arg 1
+        EXTRW,U,= %r28,29,1,%r22
+        FLDW    4(%r20),%fr6L ; load float arg 2
+        EXTRW,U,= %r28,28,1,%r22
+        FLDW    0(%r20),%fr7L ; load float arg 3
+
+        LDW     -36-framesz(%r3),%r26  ; load ptr to 'that'
+        LDW     -40(%r30),%r25  ; load the rest of dispatch argument registers
+        LDW     -44(%r30),%r24
+        LDW     -48(%r30),%r23
+
+        LDW     -36-framesz(%r3),%r20  ; load vtable addr
+        LDW     -40-framesz(%r3),%r28  ; load index
+        LDW     0(%r20),%r20    ; follow vtable
+        SH2ADDL %r28,%r20,%r28  ; add 4*index to vtable entry
+        LDW     0(%r28),%r22    ; load vtable entry
+
+        .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=22-26;out=28;
+        BL    $$dyncall,%r31
+        COPY    %r31,%r2
+
+        LDW     -32(%r30),%r19
+        COPY    %r3,%r30              ; restore saved stack ptr
+
+        LDW          -148(%sp),%rp
+        LDWM       -128(%sp),%r3
+	BV,N             (%rp)
+	NOP
+   .EXIT
+  .PROCEND  ;in=23,24,25,26;
+  .SIZE XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
+
Index: xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s
===================================================================
RCS file: xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s
diff -N xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s	3 Jan 2007 18:20:44 -0000
@@ -0,0 +1,66 @@
+        .LEVEL  1.1
+	.TEXT
+	.ALIGN 4
+
+curframesz:
+	.EQU 128
+
+
+; SharedStub has stack size of 128 bytes
+
+lastframesz:
+	.EQU 64
+
+; the StubN C++ function has a small stack size of 64 bytes
+
+
+.globl SharedStub
+	.type SharedStub, @function
+
+SharedStub:
+        .PROC
+        .CALLINFO CALLER,FRAME=80,SAVE_RP
+
+  .ENTRY
+        STW     %rp,-20(%sp)
+        LDO     128(%sp),%sp
+
+        STW     %r19,-32(%r30)
+        STW     %r26,-36-curframesz(%r30) ; save arg0 in previous frame
+
+        LDO     -80(%r30),%r28
+        FSTD,MA %fr5,8(%r28)   ; save darg0
+        FSTD,MA %fr7,8(%r28)   ; save darg1
+        FSTW,MA %fr4L,4(%r28)  ; save farg0
+        FSTW,MA %fr5L,4(%r28)  ; save farg1
+        FSTW,MA %fr6L,4(%r28)  ; save farg2
+        FSTW,MA %fr7L,4(%r28)  ; save farg3
+
+        ; Former value of register 26 is already properly saved by StubN,
+        ; but register 25-23 are not because of the arguments mismatch
+        STW     %r25,-40-curframesz-lastframesz(%r30) ; save r25
+        STW     %r24,-44-curframesz-lastframesz(%r30) ; save r24
+        STW     %r23,-48-curframesz-lastframesz(%r30) ; save r23
+        COPY    %r26,%r25                             ; method index is arg1
+        LDW     -36-curframesz-lastframesz(%r30),%r26 ; self is arg0
+        LDO     -40-curframesz-lastframesz(%r30),%r24 ; normal args is arg2
+        LDO     -80(%r30),%r23                        ; floating args is arg3
+
+        .CALL   ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=23-26;out=28;
+        BL     PrepareAndDispatch, %r31
+        COPY    %r31,%r2
+
+        LDW     -32(%r30),%r19
+
+        LDW     -148(%sp),%rp
+        LDO     -128(%sp),%sp
+
+
+	BV,N     (%rp)
+	NOP
+	NOP
+
+	.EXIT
+        .PROCEND        ;in=26;out=28;
+
+	.SIZE SharedStub, .-SharedStub



1.1                  src/patchsets/xulrunner/1.8.1.10/005_mozilla-firefox-1.5-ia64.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/005_mozilla-firefox-1.5-ia64.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/005_mozilla-firefox-1.5-ia64.patch?rev=1.1&content-type=text/plain

Index: 005_mozilla-firefox-1.5-ia64.patch
===================================================================
# Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=289394

--- mozilla.orig/extensions/transformiix/source/base/Double.cpp
+++ mozilla/extensions/transformiix/source/base/Double.cpp
@@ -75,14 +75,7 @@
 #define CPU_IS_ARM
 #endif
 
-#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
-/**
- * This version of the macros is safe for the alias optimizations
- * that gcc does, but uses gcc-specific extensions.
- */
-
 typedef union txdpun {
-    PRFloat64 d;
     struct {
 #if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
         PRUint32 lo, hi;
@@ -90,8 +83,14 @@
         PRUint32 hi, lo;
 #endif
     } s;
+    PRFloat64 d;
 } txdpun;
 
+#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
+/**
+ * This version of the macros is safe for the alias optimizations
+ * that gcc does, but uses gcc-specific extensions.
+ */
 #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
 #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
 
@@ -117,20 +116,20 @@
 
 //-- Initialize Double related constants
 #ifdef IS_BIG_ENDIAN
-const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-                                0xffffffff};
-const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
+const txdpun nanMask =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
+                           0xffffffff};
+const txdpun infMask =    {TX_DOUBLE_HI32_EXPMASK, 0};
+const txdpun negInfMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
 #else
-const PRUint32 nanMask[2] =    {0xffffffff,
-                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
-const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
+const txdpun nanMask = {0xffffffff,
+                        TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
+const txdpun infMask =    {0, TX_DOUBLE_HI32_EXPMASK};
+const txdpun negInfMask = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
 #endif
 
-const double Double::NaN = *((double*)nanMask);
-const double Double::POSITIVE_INFINITY = *((double*)infMask);
-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
+const double Double::NaN = nanMask.d;
+const double Double::POSITIVE_INFINITY = infMask.d;
+const double Double::NEGATIVE_INFINITY = negInfMask.d;
 
 /*
  * Determines whether the given double represents positive or negative
--- mozilla.orig/js/src/fdlibm/fdlibm.h



1.1                  src/patchsets/xulrunner/1.8.1.10/006_mips-asm.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/006_mips-asm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/006_mips-asm.patch?rev=1.1&content-type=text/plain

Index: 006_mips-asm.patch
===================================================================
Upstream Bug: http://bugzilla.mozilla.org/show_bug.cgi?id=258429

This patch is required to fix build issues with Mozilla on MIPS architectures.
The out-of-the-box code is coded to build on a PlayStation 2 game console, which
is a highly specialised MIPS machine based around the Toshiba TX5900.  This CPU
is very non-standard, causing problems with generic MIPS machines like Silicon
Graphics workstations.

The following patch fixes the assembly language routines for generic MIPS
machines.  In the case where it is being compiled for a PlayStation 2, the older
PS2-specific implementation is used instead.  (Some work needs to be done to
accurately detect the PS2, however.

diff -urN mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
--- mozilla.old/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2006-11-28 15:29:22 +1000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2007-01-17 15:36:43 +1000
@@ -224,16 +224,28 @@
 endif
 endif
 
+#
+# Linux/MIPS
+# 
 ifeq ($(OS_ARCH),Linux)
-ifneq (,$(findstring mips, $(OS_TEST)))
-CPPSRCS		:= xptcinvoke_mips.cpp xptcstubs_mips.cpp
-ASFILES		:= xptcinvoke_asm_mips.s xptcstubs_asm_mips.s
-#xptcstubs_mips.cpp
-# xptcstubs_asm_mips.s
+
+# PlayStation2 Linux
+ifneq (,$(findstring mipsEE, $(OS_TEST)))
+CPPSRCS		:= xptcinvoke_ps2mips.cpp xptcstubs_ps2mips.cpp
+ASFILES		:= xptcinvoke_asm_ps2mips.s xptcstubs_asm_ps2mips.s
 ifdef GNU_CC
 ASFLAGS		+= $(INCLUDES) -x assembler-with-cpp -D__GNUC__
 endif
+else 
+
+endif
+# Generic 32-bit Linux
+ifneq (,$(findstring mips, $(OS_TEST)))
+CPPSRCS		:= xptcinvoke_mips.cpp xptcstubs_mips.cpp
+ASFILES		:= xptcinvoke_asm_mips.s xptcstubs_asm_mips.s
+AS		:= $(CC) $(CFLAGS) $(INCLUDES) -c -x assembler-with-cpp
 endif
+
 endif
 
 ######################################################################
@@ -378,14 +390,24 @@
 INCLUDES	+= -I$(srcdir)/../..
 
 ifeq ($(OS_ARCH),Linux)
+
+# PlayStation 2 Linux
+ifneq (,$(findstring mipsEE, $(OS_TEST)))
+xptcstubs_asm_ps2mips.o: xptcstubs_asm_ps2mips.s.m4 $(PUBLIC)/xptcstubsdef.inc
+	m4 $(INCLUDES) $< > ./xptcstubs_asm_ps2mips.s && \
+	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_ps2mips.s
+	$(RM) -f ./xptcstubs_asm_ps2mips.s
+else
+
+# Generic Linux
 ifneq (,$(findstring mips, $(OS_TEST)))
-xptcstubs_asm_mips.o: xptcstubs_asm_mips.s.m4 $(PUBLIC)/xptcstubsdef.inc
-	m4 $(INCLUDES) $< > ./xptcstubs_asm_mips.s && \
-	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_mips.s
-	$(RM) -f ./xptcstubs_asm_mips.s
+xptcstubs_asm_mips.o: xptcstubs_asm_mips.s $(PUBLIC)/xptcstubsdef.inc
+	$(AS) -o $@ $<
 endif
 endif
 
+endif
+
 ifeq ($(OS_ARCH),Darwin)
 xptcstubs_asm_ppc_darwin.o: xptcstubs_asm_ppc_darwin.s.m4 $(PUBLIC)/xptcstubsdef.inc Makefile
 	gm4 $(INCLUDES) $< > ./xptcstubs_asm_ppc_darwin.s && \
diff -urN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
--- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s	2001-10-11 17:19:01 +1000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s	2007-01-17 15:33:47 +1000
@@ -21,6 +21,7 @@
  * Contributor(s):
  *   Brendan Eich     <brendan@×××××××.org>
  *   Stuart Parmenter <pavlov@××××××××.com>
+ *   Thiemo Seufer    <seufer@×××××××××××××××××××××.de>
  */
 
 /* This code is for MIPS using the O32 ABI. */
@@ -28,139 +29,123 @@
 #include <sys/regdef.h>
 #include <sys/asm.h>
 
-.text
-.globl  invoke_count_words
-.globl	invoke_copy_to_stack 
-
-# We need a variable number of words allocated from the stack for copies of
-# the params, and this space must come between the high frame (where ra, gp,
-# and s0 are saved) and the low frame (where a0-a3 are saved by the callee
-# functions we invoke). 
-
-LOCALSZ=4		# s0, s1, ra, gp
-NARGSAVE=4		# a0, a1, a2, a3
-HIFRAMESZ=(LOCALSZ*SZREG)
-LOFRAMESZ=(NARGSAVE*SZREG)
-FRAMESZ=(HIFRAMESZ+LOFRAMESZ+ALSZ)&ALMASK
-
-# XXX these 2*SZREG, etc. are very magic -- we *know* that ALSZ&ALMASK cause
-# FRAMESZ to be 0 mod 8, in this case to be 16 and not 12.
-RAOFF=FRAMESZ - (2*SZREG)
-GPOFF=FRAMESZ - (3*SZREG)
-S0OFF=FRAMESZ - (4*SZREG)
-S1OFF=FRAMESZ - (5*SZREG)
-
-# These are not magic -- they are just our argsave slots in the caller frame.
-A0OFF=FRAMESZ
-A1OFF=FRAMESZ + (1*SZREG)
-A2OFF=FRAMESZ + (2*SZREG)
-A3OFF=FRAMESZ + (3*SZREG)
-
-	#	
-	# _XPTC_InvokeByIndex(that, methodIndex, paramCount, params)
-	#                      a0       a1          a2         a3
-
-NESTED(_XPTC_InvokeByIndex, FRAMESZ, ra)
-
-	.set	noreorder
-	.cpload	t9
-	.set	reorder
-
+# NARGSAVE is the argument space in the callers frame, including extra
+# 'shadowed' space for the argument registers. The minimum of 4
+# argument slots is sometimes predefined in the header files.
+#ifndef NARGSAVE
+#define NARGSAVE 4
+#endif
+
+#define LOCALSZ 3	/* gp, fp, ra */
+#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK)
+
+#define RAOFF (FRAMESZ - (1*SZREG))
+#define FPOFF (FRAMESZ - (2*SZREG))
+#define GPOFF (FRAMESZ - (3*SZREG))
+
+#define A0OFF (FRAMESZ + (0*SZREG))
+#define A1OFF (FRAMESZ + (1*SZREG))
+#define A2OFF (FRAMESZ + (2*SZREG))
+#define A3OFF (FRAMESZ + (3*SZREG))
+
+	.text
+
+#	
+# _XPTC_InvokeByIndex(that, methodIndex, paramCount, params)
+#                      a0       a1          a2         a3
+
+	.globl	_XPTC_InvokeByIndex
+	.align	2
+	.type	_XPTC_InvokeByIndex,@function
+	.ent	_XPTC_InvokeByIndex,0
+	.frame	fp, FRAMESZ, ra
+_XPTC_InvokeByIndex:
+	SETUP_GP
 	subu	sp, FRAMESZ
 
-	# specify the save register mask -- XXX do we want the a0-a3 here, given
-	# our "split" frame where the args are saved below a dynamicly allocated
-	# region under the high frame?
-	#
-	# 10010000000000010000000011110000
-	.mask 0x900100F0, -((NARGSAVE+LOCALSZ)*SZREG)
-
-	# thou shalt not use .cprestore if yer frame has variable size...
-	# .cprestore GPOFF
-
-	REG_S	ra, RAOFF(sp)
-
-	# this happens automatically with .cprestore, but we cannot use that op...
-	REG_S	gp, GPOFF(sp)
-	REG_S	s0, S0OFF(sp)
-	REG_S	s1, S1OFF(sp)
-
-	REG_S	a0, A0OFF(sp)
-	REG_S	a1, A1OFF(sp)
-	REG_S	a2, A2OFF(sp)
-	REG_S	a3, A3OFF(sp)
+	# specify the save register mask for gp, fp, ra, a3 - a0
+	.mask 0xD00000F0, RAOFF-FRAMESZ
 
-	# invoke_count_words(paramCount, params)
-	move	a0, a2
-	move	a1, a3
+	sw	ra, RAOFF(sp)
+	sw	fp, FPOFF(sp)
 
-	jal	invoke_count_words
-	lw	gp, GPOFF(sp)
+	# we can't use .cprestore in a variable stack frame
+	sw	gp, GPOFF(sp)
 
-	# save the old sp so we can pop the param area and any "low frame"
-	# needed as an argsave area below the param block for callees that
-	# we invoke.
-	move	s0, sp
-
-	REG_L	a1, A2OFF(sp)	# a1 = paramCount
-	REG_L	a2, A3OFF(sp)	# a2 = params
-
-	# we define a word as 4 bytes, period end of story!
-	sll	v0, 2		# 4 bytes * result of invoke_copy_words
-	subu	v0, LOFRAMESZ	# but we take back the argsave area built into
-				# our stack frame -- SWEET!
-	subu	sp, sp, v0	# make room
-	move	a0, sp		# a0 = param stack address
-	move	s1, a0		# save it for later -- it should be safe here
-
-	# the old sp is still saved in s0, but we now need another argsave
-	# area ("low frame") for the invoke_copy_to_stack call.
-	subu	sp, sp, LOFRAMESZ
+	sw	a0, A0OFF(sp)
+	sw	a1, A1OFF(sp)
+	sw	a2, A2OFF(sp)
+	sw	a3, A3OFF(sp)
+
+	# save bottom of fixed frame
+	move	fp, sp
+
+	# extern "C" uint32
+	# invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s);
+	la	t9, invoke_count_words
+	move	a0, a2
+	move	a1, a3
+	jalr	t9
+	lw  	gp, GPOFF(fp)
 
-	# copy the param into the stack areas
+	# allocate variable stack, with a size of:
+	# wordsize (of 4 bytes) * result (already aligned to dword)
+	# but a minimum of 16 byte
+	sll	v0, 2
+	slt	t0, v0, 16
+	beqz	t0, 1f
+	li	v0, 16
+1:	subu	sp, v0
+
+	# let a0 point to the bottom of the variable stack, allocate
+	# another fixed stack for:
+	# extern "C" void
 	# invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount,
-	#                      nsXPTCVariant* s)
-	jal     invoke_copy_to_stack
-	lw  	gp, GPOFF(s0)
-
-	move	sp, s0		# get orig sp back, popping params and argsave
-
-	REG_L	a0, A0OFF(sp)	# a0 = set "that" to be "this"
-	REG_L	a1, A1OFF(sp)	# a1 = methodIndex
-
-	# t1 = methodIndex * 4
-	# (use shift instead of mult)
-	sll	t1, a1, 2
-
-	# calculate the function we need to jump to,
-	# which must then be saved in t9
+	#		       nsXPTCVariant* s);
+	la	t9, invoke_copy_to_stack
+	move	a0, sp
+	lw	a1, A2OFF(fp)
+	lw	a2, A3OFF(fp)
+	subu	sp, 16
+	jalr	t9
+	lw  	gp, GPOFF(fp)
+
+	# back to the variable stack frame
+	addu	sp, 16
+
+	# calculate the function we need to jump to, which must then be
+	# stored in t9
+	lw	a0, A0OFF(fp)	# a0 = set "that" to be "this"
+	lw	t0, A1OFF(fp)	# a1 = methodIndex
 	lw	t9, 0(a0)
-	addu	t9, t9, t1
-	lw	t9, 8(t9)
-
-	# a1..a3 and f13..f14 should now be set to what
-	# invoke_copy_to_stack told us. skip a0 and f12
-	# because that is the "this" pointer
-
-	REG_L	a1, 1*SZREG(s1)
-	REG_L	a2, 2*SZREG(s1)
-	REG_L	a3, 3*SZREG(s1)
-
-	l.d	$f13, 8(s1)
-	l.d	$f14, 16(s1)
-
-	# Create the stack pointer for the function, which must have 4 words
-	# of space for callee-saved args.  invoke_count_words allocated space
-        # for a0 starting at s1, so we just move s1 into sp.
-	move	sp, s1
+	# t0 = methodIndex << PTRLOG
+	sll	t0, t0, PTRLOG
+	addu	t9, t0
+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
+	lw	t9, (t9)
+#else /* not G++ V3 ABI */
+	lw	t9, 2*PTRSIZE(t9)
+#endif /* G++ V3 ABI */
+
+	# Set a1-a3 to what invoke_copy_to_stack told us. a0 is already
+	# the "this" pointer. We don't have to care about floating
+	# point arguments, the non-FP "this" pointer as first argument
+	# means they'll never be used.
+	lw	a1, 1*SZREG(sp)
+	lw	a2, 2*SZREG(sp)
+	lw	a3, 3*SZREG(sp)
+
+	jalr	t9
+	# Micro-optimization: There's no gp usage below this point, so
+	# we don't reload.
+	# lw	gp, GPOFF(fp)
 
-	jalr	ra, t9
-	lw	gp, GPOFF(s0)
+	# leave variable stack frame
+	move	sp, fp
 
-	move	sp, s0
+	lw	ra, RAOFF(sp)
+	lw	fp, FPOFF(sp)
 
-	REG_L	ra, RAOFF(sp)
-	REG_L	s0, S0OFF(sp)
-	addu	sp, FRAMESZ
+	addiu	sp, FRAMESZ
 	j	ra
-.end _XPTC_InvokeByIndex
+END(_XPTC_InvokeByIndex)
diff -urN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ps2mips.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ps2mips.s
--- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ps2mips.s	1970-01-01 10:00:00 +1000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ps2mips.s	2007-01-17 15:18:27 +1000
@@ -0,0 +1,166 @@
+/* -*- Mode: asm; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Brendan Eich     <brendan@×××××××.org>
+ *   Stuart Parmenter <pavlov@××××××××.com>
+ */
+
+/* This code is for MIPS using the O32 ABI. */
+
+#include <sys/regdef.h>
+#include <sys/asm.h>
+
+.text
+.globl  invoke_count_words
+.globl	invoke_copy_to_stack 
+
+# We need a variable number of words allocated from the stack for copies of
+# the params, and this space must come between the high frame (where ra, gp,
+# and s0 are saved) and the low frame (where a0-a3 are saved by the callee
+# functions we invoke). 
+
+LOCALSZ=4		# s0, s1, ra, gp
+NARGSAVE=4		# a0, a1, a2, a3
+HIFRAMESZ=(LOCALSZ*SZREG)
+LOFRAMESZ=(NARGSAVE*SZREG)
+FRAMESZ=(HIFRAMESZ+LOFRAMESZ+ALSZ)&ALMASK
+
+# XXX these 2*SZREG, etc. are very magic -- we *know* that ALSZ&ALMASK cause
+# FRAMESZ to be 0 mod 8, in this case to be 16 and not 12.
+RAOFF=FRAMESZ - (2*SZREG)
+GPOFF=FRAMESZ - (3*SZREG)
+S0OFF=FRAMESZ - (4*SZREG)
+S1OFF=FRAMESZ - (5*SZREG)
+
+# These are not magic -- they are just our argsave slots in the caller frame.
+A0OFF=FRAMESZ
+A1OFF=FRAMESZ + (1*SZREG)
+A2OFF=FRAMESZ + (2*SZREG)
+A3OFF=FRAMESZ + (3*SZREG)
+
+	#	
+	# _XPTC_InvokeByIndex(that, methodIndex, paramCount, params)
+	#                      a0       a1          a2         a3
+
+NESTED(_XPTC_InvokeByIndex, FRAMESZ, ra)
+
+	.set	noreorder
+	.cpload	t9
+	.set	reorder
+
+	subu	sp, FRAMESZ
+
+	# specify the save register mask -- XXX do we want the a0-a3 here, given
+	# our "split" frame where the args are saved below a dynamicly allocated
+	# region under the high frame?
+	#
+	# 10010000000000010000000011110000
+	.mask 0x900100F0, -((NARGSAVE+LOCALSZ)*SZREG)
+
+	# thou shalt not use .cprestore if yer frame has variable size...
+	# .cprestore GPOFF
+
+	REG_S	ra, RAOFF(sp)
+
+	# this happens automatically with .cprestore, but we cannot use that op...
+	REG_S	gp, GPOFF(sp)
+	REG_S	s0, S0OFF(sp)
+	REG_S	s1, S1OFF(sp)
+
+	REG_S	a0, A0OFF(sp)
+	REG_S	a1, A1OFF(sp)
+	REG_S	a2, A2OFF(sp)
+	REG_S	a3, A3OFF(sp)
+
+	# invoke_count_words(paramCount, params)
+	move	a0, a2
+	move	a1, a3
+
+	jal	invoke_count_words
+	lw	gp, GPOFF(sp)
+
+	# save the old sp so we can pop the param area and any "low frame"
+	# needed as an argsave area below the param block for callees that
+	# we invoke.
+	move	s0, sp
+
+	REG_L	a1, A2OFF(sp)	# a1 = paramCount
+	REG_L	a2, A3OFF(sp)	# a2 = params
+
+	# we define a word as 4 bytes, period end of story!
+	sll	v0, 2		# 4 bytes * result of invoke_copy_words
+	subu	v0, LOFRAMESZ	# but we take back the argsave area built into
+				# our stack frame -- SWEET!
+	subu	sp, sp, v0	# make room
+	move	a0, sp		# a0 = param stack address
+	move	s1, a0		# save it for later -- it should be safe here
+
+	# the old sp is still saved in s0, but we now need another argsave
+	# area ("low frame") for the invoke_copy_to_stack call.
+	subu	sp, sp, LOFRAMESZ
+
+	# copy the param into the stack areas
+	# invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount,
+	#                      nsXPTCVariant* s)
+	jal     invoke_copy_to_stack
+	lw  	gp, GPOFF(s0)
+
+	move	sp, s0		# get orig sp back, popping params and argsave
+
+	REG_L	a0, A0OFF(sp)	# a0 = set "that" to be "this"
+	REG_L	a1, A1OFF(sp)	# a1 = methodIndex
+
+	# t1 = methodIndex * 4
+	# (use shift instead of mult)
+	sll	t1, a1, 2
+
+	# calculate the function we need to jump to,
+	# which must then be saved in t9
+	lw	t9, 0(a0)
+	addu	t9, t9, t1
+	lw	t9, 8(t9)
+
+	# a1..a3 and f13..f14 should now be set to what
+	# invoke_copy_to_stack told us. skip a0 and f12
+	# because that is the "this" pointer
+
+	REG_L	a1, 1*SZREG(s1)
+	REG_L	a2, 2*SZREG(s1)
+	REG_L	a3, 3*SZREG(s1)
+
+	l.d	$f13, 8(s1)
+	l.d	$f14, 16(s1)
+
+	# Create the stack pointer for the function, which must have 4 words
+	# of space for callee-saved args.  invoke_count_words allocated space
+        # for a0 starting at s1, so we just move s1 into sp.
+	move	sp, s1
+
+	jalr	ra, t9
+	lw	gp, GPOFF(s0)
+
+	move	sp, s0
+
+	REG_L	ra, RAOFF(sp)
+	REG_L	s0, S0OFF(sp)
+	addu	sp, FRAMESZ
+	j	ra
+.end _XPTC_InvokeByIndex
diff -urN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
--- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp	2004-04-19 00:18:18 +1000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp	2007-01-17 15:33:47 +1000
@@ -24,6 +24,7 @@
  * Contributor(s):
  *   Stuart Parmenter <pavlov@××××××××.com>
  *   Brendan Eich     <brendan@×××××××.org>
+ *   Thiemo Seufer    <seufer@×××××××××××××××××××××.de>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -52,10 +53,8 @@
     // Count a word for a0 even though it's never stored or loaded
     // We do this only for alignment of register pairs.
     PRUint32 result = 1;
-    for (PRUint32 i = 0; i < paramCount; i++, s++)
+    for (PRUint32 i = 0; i < paramCount; i++, result++, s++)
     {
-        result++;
-
         if (s->IsPtrData())
             continue;
 
@@ -68,6 +67,9 @@
 		result++;
 	    result++;
 	    break;
+
+        default:
+            break;
         }
     }
     return (result + 1) & ~(PRUint32)1;
@@ -88,8 +90,6 @@
             continue;
         }
 
-        *((void**)d) = s->val.p;
-
         switch(s->type)
         {
         case nsXPTType::T_I64    :
@@ -104,6 +104,9 @@
             if ((PRWord)d & 4) d++;
             *((double*)   d) = s->val.d;      d++;
             break;
+        default:
+            *((void**)d) = s->val.p;
+            break;
         }
     }
 }
@@ -118,5 +121,4 @@
                    PRUint32 paramCount, nsXPTCVariant* params)
 {
     return _XPTC_InvokeByIndex(that, methodIndex, paramCount, params);
-}    
-
+}
diff -urN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ps2mips.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ps2mips.cpp
--- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ps2mips.cpp	1970-01-01 10:00:00 +1000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ps2mips.cpp	2007-01-17 15:17:59 +1000
@@ -0,0 +1,122 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * Version: MPL 1.1
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@××××××××.com>
+ *   Brendan Eich     <brendan@×××××××.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* This code is for MIPS using the O32 ABI. */
+
+/* Platform specific code to invoke XPCOM methods on native objects */
+
+#include "xptcprivate.h"
+
+
+extern "C" uint32
+invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
+{
+    // Count a word for a0 even though it's never stored or loaded
+    // We do this only for alignment of register pairs.
+    PRUint32 result = 1;
+    for (PRUint32 i = 0; i < paramCount; i++, s++)
+    {
+        result++;
+
+        if (s->IsPtrData())
+            continue;
+
+        switch(s->type)
+        {
+        case nsXPTType::T_I64    :
+        case nsXPTType::T_U64    :
+        case nsXPTType::T_DOUBLE :
+	    if (result & 1)
+		result++;
+	    result++;
+	    break;
+        }
+    }
+    return (result + 1) & ~(PRUint32)1;
+}
+
+extern "C" void
+invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount,
+                     nsXPTCVariant* s)
+{
+    // Skip the unused a0 slot, which we keep only for register pair alignment.
+    d++;
+
+    for (PRUint32 i = 0; i < paramCount; i++, d++, s++)
+    {
+        if (s->IsPtrData())
+        {
+            *((void**)d) = s->ptr;
+            continue;
+        }
+
+        *((void**)d) = s->val.p;
+
+        switch(s->type)
+        {
+        case nsXPTType::T_I64    :
+            if ((PRWord)d & 4) d++;
+            *((PRInt64*) d)  = s->val.i64;    d++;
+            break;
+        case nsXPTType::T_U64    :
+            if ((PRWord)d & 4) d++;
+            *((PRUint64*) d) = s->val.u64;    d++;
+            break;
+        case nsXPTType::T_DOUBLE :
+            if ((PRWord)d & 4) d++;
+            *((double*)   d) = s->val.d;      d++;
+            break;
+        }
+    }
+}
+
+extern "C" nsresult _XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                                        PRUint32 paramCount,
+                                        nsXPTCVariant* params);
+
+extern "C"
+XPTC_PUBLIC_API(nsresult)
+XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                   PRUint32 paramCount, nsXPTCVariant* params)
+{
+    return _XPTC_InvokeByIndex(that, methodIndex, paramCount, params);
+}    
+
diff -urN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
--- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s	1970-01-01 10:00:00 +1000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s	2007-01-17 15:33:47 +1000
@@ -0,0 +1,142 @@
+/* -*- Mode: asm; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@××××××××.com>
+ *   Chris Waterson   <waterson@××××××××.com>
+ *   Thiemo Seufer    <seufer@×××××××××××××××××××××.de>
+ */
+
+/* This code is for MIPS using the O32 ABI. */
+
+#include <sys/regdef.h>
+#include <sys/asm.h>
+
+# NARGSAVE is the argument space in the callers frame, including extra
+# 'shadowed' space for the argument registers. The minimum of 4
+# argument slots is sometimes predefined in the header files.
+#ifndef NARGSAVE
+#define NARGSAVE 4
+#endif
+
+#define LOCALSZ 2	/* gp, ra */
+#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK)
+
+#define RAOFF (FRAMESZ - (1*SZREG))
+#define GPOFF (FRAMESZ - (2*SZREG))
+
+#define A0OFF (FRAMESZ + (0*SZREG))
+#define A1OFF (FRAMESZ + (1*SZREG))
+#define A2OFF (FRAMESZ + (2*SZREG))
+#define A3OFF (FRAMESZ + (3*SZREG))
+
+	.text
+
+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
+#define STUB_ENTRY(x)						\
+	.if x < 10;						\
+	.globl	_ZN14nsXPTCStubBase5Stub ##x ##Ev;		\
+	.type	_ZN14nsXPTCStubBase5Stub ##x ##Ev,@function;	\
+	.aent	_ZN14nsXPTCStubBase5Stub ##x ##Ev,0;		\
+_ZN14nsXPTCStubBase5Stub ##x ##Ev:;				\
+	SETUP_GP;						\
+	li	t0,x;						\
+	b	sharedstub;					\
+	.elseif x < 100;					\
+	.globl	_ZN14nsXPTCStubBase6Stub ##x ##Ev;		\
+	.type	_ZN14nsXPTCStubBase6Stub ##x ##Ev,@function;	\
+	.aent	_ZN14nsXPTCStubBase6Stub ##x ##Ev,0;		\
+_ZN14nsXPTCStubBase6Stub ##x ##Ev:;				\
+	SETUP_GP;						\
+	li	t0,x;						\
+	b	sharedstub;					\
+	.elseif x < 1000;					\
+	.globl	_ZN14nsXPTCStubBase7Stub ##x ##Ev;		\
+	.type	_ZN14nsXPTCStubBase7Stub ##x ##Ev,@function;	\
+	.aent	_ZN14nsXPTCStubBase7Stub ##x ##Ev,0;		\
+_ZN14nsXPTCStubBase7Stub ##x ##Ev:;				\
+	SETUP_GP;						\
+	li	t0,x;						\
+	b	sharedstub;					\
+	.else;							\
+	.err;							\
+	.endif
+#else /* not G++ V3 ABI */
+#define STUB_ENTRY(x)						\
+	.globl	Stub ##x ##__14nsXPTCStubBase;			\
+	.type	Stub ##x ##__14nsXPTCStubBase,@function;	\
+	.aent	Stub ##x ##__14nsXPTCStubBase,0;		\
+Stub ##x ##__14nsXPTCStubBase:;					\
+	SETUP_GP;						\
+	li	t0,x;						\
+	b	sharedstub
+#endif /* G++ V3 ABI */
+
+# SENTINEL_ENTRY is handled in the cpp file.
+#define SENTINEL_ENTRY(x)
+
+#
+# open a dummy frame for the function entries
+#
+	.align	2
+	.type	dummy,@function
+	.ent	dummy, 0
+	.frame	sp, FRAMESZ, ra 
+dummy:
+	SETUP_GP
+
+#include "xptcstubsdef.inc"
+
+sharedstub:
+	subu	sp, FRAMESZ
+
+	# specify the save register mask for gp, ra, a0-a3
+	.mask 0x900000F0, RAOFF-FRAMESZ
+
+	sw	ra, RAOFF(sp)
+	SAVE_GP(GPOFF)
+
+	# Micro-optimization: a0 is already loaded, and its slot gets
+	# ignored by PrepareAndDispatch, so no need to save it here.
+	# sw	a0, A0OFF(sp)
+	sw	a1, A1OFF(sp)
+	sw	a2, A2OFF(sp)
+	sw	a3, A3OFF(sp)
+
+	la	t9, PrepareAndDispatch
+
+	# t0 is methodIndex
+	move	a1, t0
+	# have a2 point to the begin of the argument space on stack
+	addiu	a2, sp, FRAMESZ
+
+	# PrepareAndDispatch(that, methodIndex, args)
+	jalr	t9
+
+	# Micro-optimization: Using jalr explicitly has the side-effect
+	# of not triggering .cprestore. This is ok because we have no
+	# gp reference below this point. It also allows better
+	# instruction sscheduling.
+	# lw	gp, GPOFF(fp)
+ 
+ 	lw	ra, RAOFF(sp)
+	addiu	sp, FRAMESZ
+	j	ra
+	END(dummy)
diff -urN mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ps2mips.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ps2mips.cpp
--- mozilla.old/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ps2mips.cpp	1970-01-01 10:00:00 +1000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ps2mips.cpp	2007-01-17 15:18:43 +1000
@@ -0,0 +1,131 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * Version: MPL 1.1
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@××××××××.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "xptcprivate.h"
+
+/*
+ * This is for MIPS O32 ABI
+ * Args contains a0-3 and then the stack.
+ * Because a0 is 'this', we want to skip it
+ */
+extern "C" nsresult
+PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex, PRUint32* args)
+{
+    args++; // always skip over a0
+
+#define PARAM_BUFFER_COUNT		16
+
+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+    nsXPTCMiniVariant* dispatchParams = NULL;
+    nsIInterfaceInfo* iface_info = NULL;
+    const nsXPTMethodInfo* info;
+    PRUint8 paramCount;
+    PRUint8 i;
+    nsresult result = NS_ERROR_FAILURE;
+
+    NS_ASSERTION(self,"no self");
+
+    self->GetInterfaceInfo(&iface_info);
+    NS_ASSERTION(iface_info,"no interface info");
+
+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
+    NS_ASSERTION(info,"no interface info");
+
+    paramCount = info->GetParamCount();
+
+    // setup variant array pointer
+    if(paramCount > PARAM_BUFFER_COUNT)
+        dispatchParams = new nsXPTCMiniVariant[paramCount];
+    else
+        dispatchParams = paramBuffer;
+    NS_ASSERTION(dispatchParams,"no place for params");
+
+    PRUint32* ap = args;
+    for(i = 0; i < paramCount; i++, ap++)
+    {
+        const nsXPTParamInfo& param = info->GetParam(i);
+        const nsXPTType& type = param.GetType();
+        nsXPTCMiniVariant* dp = &dispatchParams[i];
+
+        if(param.IsOut() || !type.IsArithmetic())
+        {
+            dp->val.p = (void*) *ap;
+            continue;
+        }
+
+        dp->val.p = (void*) *ap;
+
+        switch(type)
+        {
+        case nsXPTType::T_I64   :
+            if ((PRWord)ap & 4) ap++;
+            dp->val.i64 = *((PRInt64*) ap); ap++;
+            break;
+        case nsXPTType::T_U64   :
+            if ((PRWord)ap & 4) ap++;
+            dp->val.u64 = *((PRInt64*) ap); ap++;
+            break;
+        case nsXPTType::T_DOUBLE:
+            if ((PRWord)ap & 4) ap++;
+            dp->val.d   = *((double*) ap);  ap++;
+            break;
+        }
+    }
+
+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
+
+    NS_RELEASE(iface_info);
+
+    if(dispatchParams != paramBuffer)
+        delete [] dispatchParams;
+
+    return result;
+}
+
+#define STUB_ENTRY(n) // done in the .s file
+
+#define SENTINEL_ENTRY(n) \
+nsresult nsXPTCStubBase::Sentinel##n() \
+{ \
+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
+    return NS_ERROR_NOT_IMPLEMENTED; \
+}
+
+#include "xptcstubsdef.inc"



1.1                  src/patchsets/xulrunner/1.8.1.10/007_mozilla-firefox-1.5-asneeded.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/007_mozilla-firefox-1.5-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/007_mozilla-firefox-1.5-asneeded.patch?rev=1.1&content-type=text/plain

Index: 007_mozilla-firefox-1.5-asneeded.patch
===================================================================
# Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=311236

--- mozilla/embedding/browser/gtk/tests/Makefile.in.orig	2005-02-04 00:01:41.000000000 +0100
+++ mozilla/embedding/browser/gtk/tests/Makefile.in	2006-04-28 05:21:10.000000000 +0200
@@ -75,6 +75,8 @@
 endif
 endif
 
+OS_LDFLAGS += -Wl,-rpath-link,'$(DEPTH)/dist/bin'
+
 ifdef MOZ_ENABLE_GTK
 LIBS		+= \
 		-lgtkembedmoz \



1.1                  src/patchsets/xulrunner/1.8.1.10/008_xulrunner-gentoo-pkgconfig-1.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/008_xulrunner-gentoo-pkgconfig-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/008_xulrunner-gentoo-pkgconfig-1.patch?rev=1.1&content-type=text/plain

Index: 008_xulrunner-gentoo-pkgconfig-1.patch
===================================================================
--- mozilla/config/autoconf.mk.in	2005-08-17 19:17:17.000000000 +0200
+++ mozilla/config/autoconf.mk.in	2005-11-17 14:23:11.000000000 +0100
@@ -54,13 +54,13 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir	= $(mozappdir)/include
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir		= $(mozappdir)/idl
 
-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+mozappdir	= $(libdir)/$(MOZ_APP_NAME)
 mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
 mrelibdir	= $(mredir)/lib
 
--- mozilla/build/unix/Makefile.in	2005-07-07 20:24:39.000000000 +0200
+++ mozilla/build/unix/Makefile.in	2005-11-17 21:41:47.000000000 +0100
@@ -61,6 +61,19 @@
 NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
 endif
 
+# Hack to make sure that mozilla-nss.pc has the proper nss dependencies
+ifdef MOZ_NATIVE_NSS
+FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags)
+FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs)
+NSS_NAME=nss
+NSS_VERSION=$(shell $(NSS_CONFIG) --version)
+else
+FULL_NSS_CFLAGS=-I$(includedir)/nss
+FULL_NSS_LIBS=-L$(mozappdir)/nss -lnss3 -lsmime3 -lssl3 -lsoftokn3
+NSS_NAME=$(MOZ_APP_NAME)-nss
+NSS_VERSION=$(MOZ_APP_VERSION)
+endif
+
 ifdef MOZ_ENABLE_GTK
 SUPERWIN_LIBS=-lgtksuperwin
 endif
@@ -82,7 +82,8 @@
 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
 	-e "s|%DEFS%|$(_DEFS)|" \
 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
-	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@
+	-e 's|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|' \
+	-e 's|\(echo -L.*\)\($$\)|\1 -Wl,-R$(mozappdir)\2|' > $@
 
 $(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 	cat $< | sed \
@@ -99,7 +112,12 @@
 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
 	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
 	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
-	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
+	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \
+	-e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \
+	-e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \
+	-e "s|%NSS_NAME%|$(NSS_NAME)|" \
+	-e "s|%NSS_VERSION%|$(NSS_VERSION)|" \
+	-e "s|\(^Libs: -L.*\)|\1 -Wl,-R\$$\{libdir}|" > $@
 
 libs:: $(MOZ_APP_NAME)-config
 	chmod 755 $<
--- mozilla/build/unix/mozilla-js.pc.in.orig	2005-07-05 23:21:52.000000000 +0000
+++ mozilla/build/unix/mozilla-js.pc.in	2006-01-15 10:03:00.000000000 +0000
@@ -6,6 +6,6 @@
 Name: JavaScript
 Description: The Mozilla JavaScript Library
 Version: %MOZILLA_VERSION%
-Requires: %NSPR_NAME% >= %NSPR_VERSION%
+Requires: %MOZ_APP_NAME%-%NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${libdir} -lmozjs
 Cflags: -I${includedir}/js -DXP_UNIX
--- mozilla/build/unix/mozilla-nspr.pc.in.orig	2005-07-05 23:21:52.000000000 +0000
+++ mozilla/build/unix/mozilla-nspr.pc.in	2006-01-15 10:01:16.000000000 +0000
@@ -1,12 +1,5 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
 Name: NSPR
 Description: The Netscape Portable Runtime
 Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
-
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
 
--- mozilla/build/unix/mozilla-xpcom.pc.in.orig	2005-07-05 23:21:52.000000000 +0000
+++ mozilla/build/unix/mozilla-xpcom.pc.in	2006-01-15 10:02:34.000000000 +0000
@@ -7,6 +7,6 @@
 Name: XPCOM
 Description: The Mozilla Cross Platform Component Library
 Version: %MOZILLA_VERSION%
-Requires: %NSPR_NAME% >= %NSPR_VERSION%
+Requires: %MOZ_APP_NAME%-%NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${libdir} -lxpcom
 Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
--- mozilla/build/unix/mozilla-nss.pc.in.orig	2005-07-05 23:21:52.000000000 +0000
+++ mozilla/build/unix/mozilla-nss.pc.in	2006-01-15 10:26:13.000000000 +0000
@@ -1,11 +1,4 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
 Name: NSS
 Description: Mozilla Network Security Services
-Version: %MOZILLA_VERSION%
-Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
-Cflags: -I${includedir}/nss
+Version: %NSS_VERSION%
+Requires: %NSS_NAME% >= %NSS_VERSION%



1.1                  src/patchsets/xulrunner/1.8.1.10/010_visibility-gcc-4.2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/010_visibility-gcc-4.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/010_visibility-gcc-4.2.patch?rev=1.1&content-type=text/plain

Index: 010_visibility-gcc-4.2.patch
===================================================================
--- configure.in.orig	2007-10-12 20:39:27.000000000 +0200
+++ configure.in	2007-10-12 20:40:49.000000000 +0200
@@ -2657,8 +2657,7 @@
                        ])
         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
                 "$ac_cv_have_visibility_class_bug" = "no"; then
-          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-          WRAP_SYSTEM_INCLUDES=1
+          VISIBILITY_FLAGS='-fvisibility=hidden'
         else
           VISIBILITY_FLAGS='-fvisibility=hidden'
         fi # have visibility pragma bug



1.1                  src/patchsets/xulrunner/1.8.1.10/011-canvas_fix-bug405584.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/011-canvas_fix-bug405584.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/011-canvas_fix-bug405584.patch?rev=1.1&content-type=text/plain

Index: 011-canvas_fix-bug405584.patch
===================================================================
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=405584

Index: content/canvas/src/nsCanvasRenderingContext2D.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp,v
retrieving revision 1.102
diff -u -8 -p -r1.102 nsCanvasRenderingContext2D.cpp
--- content/canvas/src/nsCanvasRenderingContext2D.cpp	10 Oct 2007 20:31:45 -0000	1.102
+++ content/canvas/src/nsCanvasRenderingContext2D.cpp	11 Oct 2007 23:31:32 -0000
@@ -2140,17 +2140,17 @@ nsCanvasRenderingContext2D::CairoSurface
                                      getter_AddRefs(imgRequest));
         NS_ENSURE_SUCCESS(rv, rv);
         if (!imgRequest)
             // XXX ERRMSG we need to report an error to developers here! (bug 329026)
             return NS_ERROR_NOT_AVAILABLE;
 
         PRUint32 status;
         imgRequest->GetImageStatus(&status);
-        if (status != imgIRequest::STATUS_LOAD_COMPLETE)
+        if ((status & imgIRequest::STATUS_LOAD_COMPLETE) == 0)
             return NS_ERROR_NOT_AVAILABLE;
 
         nsCOMPtr<nsIURI> uri;
         rv = imageLoader->GetCurrentURI(uriOut);
         NS_ENSURE_SUCCESS(rv, rv);
 
         *forceWriteOnlyOut = PR_FALSE;
 



1.1                  src/patchsets/xulrunner/1.8.1.10/032_firefox-2.0_ppc64-1.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/032_firefox-2.0_ppc64-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/032_firefox-2.0_ppc64-1.patch?rev=1.1&content-type=text/plain

Index: 032_firefox-2.0_ppc64-1.patch
===================================================================
# Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=361415

unchanged:
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2006-11-21 17:09:28.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2006-11-20 10:13:38.000000000 +0000
@@ -267,6 +267,11 @@
 ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
 AS		:= $(CC) -c -x assembler-with-cpp
 endif
+ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
+CPPSRCS		:= xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ASFILES		:= xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+AS		:= $(CC) -c -x assembler-with-cpp
+endif
 
 #
 # NetBSD/PPC
diff -u mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s	2006-11-21 14:01:45.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s	2006-11-22 10:43:26.000000000 +0000
@@ -0,0 +1,154 @@
+// -*- Mode: Asm -*-
+//
+// The contents of this file are subject to the Netscape Public
+// License Version 1.1 (the "License"); you may not use this file
+// except in compliance with the License. You may obtain a copy of
+// the License at http://www.mozilla.org/NPL/
+//
+// Software distributed under the License is distributed on an "AS
+// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+// implied. See the License for the specific language governing
+// rights and limitations under the License.
+//
+// The Original Code is mozilla.org code.
+//
+// The Initial Developer of the Original Code is Netscape
+// Communications Corporation.  Portions created by Netscape are
+// Copyright (C) 1999 Netscape Communications Corporation. All
+// Rights Reserved.
+//
+// Contributor(s):
+//   dwmw2@×××××××××.org (David Woodhouse)
+//   Franz.Sirl-kernel@××××××××××.com (Franz Sirl)
+//   beard@××××××××.com (Patrick Beard)
+//   waterson@××××××××.com (Chris Waterson)
+//
+
+.set r0,0; .set r1,1; .set r2,2; .set r3,3; .set r4,4
+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
+.set r30,30; .set r31,31
+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+.set f30,30; .set f31,31
+
+
+//
+// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+//                    PRUint32 paramCount, nsXPTCVariant* params)
+//
+
+	.section ".toc","aw"
+	.section ".text"
+	.align 2
+	.globl XPTC_InvokeByIndex
+	.section ".opd","aw"
+	.align 3
+XPTC_InvokeByIndex:
+	.quad   .XPTC_InvokeByIndex,.TOC.@tocbase
+	.previous
+	.type  XPTC_InvokeByIndex,@function
+.XPTC_InvokeByIndex:
+	mflr	0
+	std	0,16(r1)
+	
+	std	r29,-24(r1)
+	std	r30,-16(r1)
+	std	r31,-8(r1)
+
+	mr	r29,r3			// Save 'that' in r29
+	mr	r30,r4			// Save 'methodIndex' in r30
+	mr	r31,r1			// Save old frame
+
+	// Allocate stack frame with space for params. Since at least the
+	// first 7 parameters (not including 'that') will be in registers,
+	// we don't actually need stack space for those. We must ensure
+	// that the stack remains 16-byte aligned.
+	//
+	//  | ..128-byte stack frame.. |     | 7 GP | 13 FP | 3 NV |
+	//  |               |(params)........| regs | regs  | regs |
+	// (r1)...........(+112)....(+128)
+	//                               (-23*8).(-16*8).(-3*8)..(r31)
+
+	// +stack frame, -unused stack params, +regs storage, +1 for alignment
+	addi	r7,r5,((112/8)-7+7+13+3+1)
+	rldicr	r7,r7,3,59		// multiply by 8 and mask with ~15
+	neg	r7,r7
+	stdux	r1,r1,r7
+
+	
+	// Call invoke_copy_to_stack(PRUint64* gpregs, double* fpregs,
+	//			     PRUint32 paramCount, nsXPTCVariant* s, 
+	//			     PRUint64* d))
+	
+	// r5, r6 are passed through intact (paramCount, params)
+	// r7 (d) has to be r1+112 -- where parameters are passed on the stack.
+	// r3, r4 are above that, easier to address from r31 than from r1
+
+	subi	r3,r31,(23*8)		// r3 --> GPRS
+	subi	r4,r31,(16*8)		// r4 --> FPRS
+	addi	r7,r1,112		// r7 --> params
+	bl	invoke_copy_to_stack
+	nop
+
+	// Set up to invoke function
+	
+	ld	r9,0(r29)		// vtable (r29 is 'that')
+	mr	r3,r29		// self is first arg, obviously
+
+	sldi	r30,r30,3	// Find function descriptor 
+	add	r9,r9,r30
+	ld	r9,0(r9)
+	
+	ld	r0,0(r9)	// Actual address from fd.
+	std	r2,40(r1)	// Save r2 (TOC pointer)
+
+	mtctr	0
+	ld	r11,16(r9)	// Environment pointer from fd.
+	ld	r2,8(r9)	// TOC pointer from fd.
+
+	// Load FP and GP registers as required
+	ld	r4, -(23*8)(r31) 
+	ld	r5, -(22*8)(r31) 
+	ld	r6, -(21*8)(r31) 
+	ld	r7, -(20*8)(r31) 
+	ld	r8, -(19*8)(r31) 
+	ld	r9, -(18*8)(r31) 
+	ld	r10, -(17*8)(r31) 
+
+	lfd	f1, -(16*8)(r31)
+	lfd	f2, -(15*8)(r31)
+	lfd	f3, -(14*8)(r31)
+	lfd	f4, -(13*8)(r31)
+	lfd	f5, -(12*8)(r31)
+	lfd	f6, -(11*8)(r31)
+	lfd	f7, -(10*8)(r31)
+	lfd	f8, -(9*8)(r31)
+	lfd	f9, -(8*8)(r31)
+	lfd	f10, -(7*8)(r31)
+	lfd	f11, -(6*8)(r31)
+	lfd	f12, -(5*8)(r31)
+	lfd	f13, -(4*8)(r31)
+
+	bctrl			// Do it
+
+	ld	r2,40(r1)	// Load our own TOC pointer
+	ld	r1,0(r1)	// Revert stack frame
+	ld	0,16(r1)	// Reload lr
+	ld	29,-24(r1)	// Restore NVGPRS
+	ld	30,-16(r1)
+	ld	31,-8(r1)
+	mtlr	0
+	blr
+
+	.size   XPTC_InvokeByIndex,.-.XPTC_InvokeByIndex
+
+	/* Magic indicating no need for an executable stack */
+	.section .note.GNU-stack, "", @progbits ; .previous
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp	1970-01-01 01:00:00.000000000 +0100
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp	2006-11-21 17:00:06.000000000 +0000
@@ -0,0 +1,127 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   dwmw2@×××××××××.org (David Woodhouse)
+ *   Franz.Sirl-kernel@××××××××××.com (Franz Sirl)
+ *   beard@××××××××.com (Patrick Beard)
+ *   waterson@××××××××.com (Chris Waterson)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Platform specific code to invoke XPCOM methods on native objects
+
+// The purpose of XPTC_InvokeByIndex() is to map a platform
+// independent call to the platform ABI. To do that,
+// XPTC_InvokeByIndex() has to determine the method to call via vtable
+// access. The parameters for the method are read from the
+// nsXPTCVariant* and prepared for the native ABI.
+
+#include <stdio.h>
+#include "xptcprivate.h"
+
+// 8 integral parameters are passed in registers, not including 'that'
+#define GPR_COUNT     7
+
+// 8 floating point parameters are passed in registers, floats are
+// promoted to doubles when passed in registers
+#define FPR_COUNT     13
+
+extern "C" PRUint32
+invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
+{
+  return PRUint32(((paramCount * 2) + 3) & ~3);
+}
+
+extern "C" void
+invoke_copy_to_stack(PRUint64* gpregs,
+                     double* fpregs,
+                     PRUint32 paramCount,
+                     nsXPTCVariant* s, 
+                     PRUint64* d)
+{
+    PRUint64 tempu64;
+
+    for(uint32 i = 0; i < paramCount; i++, s++) {
+        if(s->IsPtrData())
+            tempu64 = (PRUint64) s->ptr;
+        else {
+            switch(s->type) {
+            case nsXPTType::T_FLOAT:                                  break;
+            case nsXPTType::T_DOUBLE:                                 break;
+            case nsXPTType::T_I8:     tempu64 = s->val.i8;            break;
+            case nsXPTType::T_I16:    tempu64 = s->val.i16;           break;
+            case nsXPTType::T_I32:    tempu64 = s->val.i32;           break;
+            case nsXPTType::T_I64:    tempu64 = s->val.i64;           break;
+            case nsXPTType::T_U8:     tempu64 = s->val.u8;            break;
+            case nsXPTType::T_U16:    tempu64 = s->val.u16;           break;
+            case nsXPTType::T_U32:    tempu64 = s->val.u32;           break;
+            case nsXPTType::T_U64:    tempu64 = s->val.u64;           break;
+            case nsXPTType::T_BOOL:   tempu64 = s->val.b;             break;
+            case nsXPTType::T_CHAR:   tempu64 = s->val.c;             break;
+            case nsXPTType::T_WCHAR:  tempu64 = s->val.wc;            break;
+            default:                  tempu64 = (PRUint64) s->val.p;  break;
+            }
+        }
+
+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
+            if (i < FPR_COUNT)
+                fpregs[i]    = s->val.d;
+            else
+                *(double *)d = s->val.d;
+        }
+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
+            if (i < FPR_COUNT) {
+                fpregs[i]   = s->val.f; // if passed in registers, floats are promoted to doubles
+            } else {
+                float *p = (float *)d;
+                p++;
+                *p = s->val.f;
+            }
+        }
+        else {
+            if (i < GPR_COUNT)
+                gpregs[i] = tempu64;
+            else
+                *d          = tempu64;
+        }
+        if (i >= 7)
+            d++;
+    }
+}
+
+extern "C"
+XPTC_PUBLIC_API(nsresult)
+XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                   PRUint32 paramCount, nsXPTCVariant* params);
+
diff -u mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s	2006-11-21 16:38:52.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s	2006-11-22 10:51:14.000000000 +0000
@@ -0,0 +1,102 @@
+// -*- Mode: Asm -*-
+//
+// The contents of this file are subject to the Netscape Public
+// License Version 1.1 (the "License"); you may not use this file
+// except in compliance with the License. You may obtain a copy of
+// the License at http://www.mozilla.org/NPL/
+//
+// Software distributed under the License is distributed on an "AS
+// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+// implied. See the License for the specific language governing
+// rights and limitations under the License.
+//
+// The Original Code is mozilla.org code.
+//
+// The Initial Developer of the Original Code is Netscape
+// Communications Corporation.  Portions created by Netscape are
+// Copyright (C) 1999 Netscape Communications Corporation. All
+// Rights Reserved.
+//
+// Contributor(s):
+//   dwmw2@×××××××××.org (David Woodhouse)
+//   Franz.Sirl-kernel@××××××××××.com (Franz Sirl)
+//   beard@××××××××.com (Patrick Beard)
+//   waterson@××××××××.com (Chris Waterson)
+//
+
+.set r0,0; .set r1,1; .set RTOC,2; .set r3,3; .set r4,4
+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
+.set r30,30; .set r31,31
+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
+.set f30,30; .set f31,31
+
+	.section ".text"
+	.align 2
+	.globl SharedStub
+	.section	".opd","aw"
+	.align 3
+
+SharedStub:
+	.quad   .SharedStub,.TOC.@tocbase
+	.previous
+      	.type  SharedStub,@function
+
+.SharedStub:
+	mflr	r0
+
+	std	r4, -56(r1)			// Save all GPRS
+	std	r5, -48(r1)
+	std	r6, -40(r1)
+	std	r7, -32(r1)
+	std	r8, -24(r1)
+	std	r9, -16(r1)
+	std	r10, -8(r1)
+
+	stfd	f13, -64(r1)			// ... and FPRS
+	stfd	f12, -72(r1)
+	stfd	f11, -80(r1)
+	stfd	f10, -88(r1)
+	stfd	f9, -96(r1)
+	stfd	f8, -104(r1)
+	stfd	f7, -112(r1)
+	stfd	f6, -120(r1)
+	stfd	f5, -128(r1)
+	stfd	f4, -136(r1)
+	stfd	f3, -144(r1)
+	stfd	f2, -152(r1)
+	stfd	f1, -160(r1)
+
+	subi	r6,r1,56			// r6 --> gprData
+	subi	r7,r1,160			// r7 --> fprData
+	addi	r5,r1,112			// r5 --> extra stack args
+
+	std	r0, 16(r1)
+	
+	stdu	r1,-288(r1)
+					// r3 has the 'self' pointer already
+	
+	mr      r4,r11		// r4 is methodIndex selector, passed
+				// via r11 in the nsXPTCStubBase::StubXX() call
+	
+	bl	PrepareAndDispatch
+	nop
+
+	ld	1,0(r1)				// restore stack
+	ld	r0,16(r1)			// restore LR
+	mtlr	r0
+	blr
+
+	.size   SharedStub,.-.SharedStub
+
+
+/* Magic indicating no need for an executable stack */
+.section .note.GNU-stack, "", @progbits ; .previous
unchanged:
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp	1970-01-01 01:00:00.000000000 +0100
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp	2006-11-21 16:59:46.000000000 +0000
@@ -0,0 +1,247 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   dwmw2@×××××××××.org (David Woodhouse)
+ *   Franz.Sirl-kernel@××××××××××.com (Franz Sirl)
+ *   beard@××××××××.com (Patrick Beard)
+ *   waterson@××××××××.com (Chris Waterson)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// Implement shared vtbl methods.
+
+#include "xptcprivate.h"
+
+// The Linux/PPC ABI (aka PPC/SYSV ABI) passes the first 8 integral
+// parameters and the first 13 floating point parameters in registers
+// (r3-r10 and f1-f13), no stack space is allocated for these by the
+// caller.  The rest of the parameters are passed in the callers stack
+// area. The stack pointer has to retain 16-byte alignment, longlongs
+// and doubles are aligned on 8-byte boundaries.
+
+#define PARAM_BUFFER_COUNT     16
+#define GPR_COUNT               7
+#define FPR_COUNT               13
+
+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
+//
+// - 'args[]' contains the arguments passed on stack
+// - 'gprData[]' contains the arguments passed in integer registers
+// - 'fprData[]' contains the arguments passed in floating point registers
+// 
+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
+// and then the method gets called.
+#include <stdio.h>
+extern "C" nsresult
+PrepareAndDispatch(nsXPTCStubBase* self,
+                   PRUint64 methodIndex,
+                   PRUint64* args,
+                   PRUint64 *gprData,
+                   double *fprData)
+{
+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+    nsXPTCMiniVariant* dispatchParams = NULL;
+    nsIInterfaceInfo* iface_info = NULL;
+    const nsXPTMethodInfo* info;
+    PRUint32 paramCount;
+    PRUint32 i;
+    nsresult result = NS_ERROR_FAILURE;
+
+    NS_ASSERTION(self,"no self");
+
+    self->GetInterfaceInfo(&iface_info);
+    NS_ASSERTION(iface_info,"no interface info");
+    if (! iface_info)
+        return NS_ERROR_UNEXPECTED;
+
+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
+    NS_ASSERTION(info,"no method info");
+    if (! info)
+        return NS_ERROR_UNEXPECTED;
+
+    paramCount = info->GetParamCount();
+
+    // setup variant array pointer
+    if(paramCount > PARAM_BUFFER_COUNT)
+        dispatchParams = new nsXPTCMiniVariant[paramCount];
+    else
+        dispatchParams = paramBuffer;
+
+    NS_ASSERTION(dispatchParams,"no place for params");
+    if (! dispatchParams)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    PRUint64* ap = args;
+    PRUint64 tempu64;
+
+    for(i = 0; i < paramCount; i++) {
+        const nsXPTParamInfo& param = info->GetParam(i);
+        const nsXPTType& type = param.GetType();
+        nsXPTCMiniVariant* dp = &dispatchParams[i];
+	
+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
+            if (i < FPR_COUNT)
+                dp->val.d = fprData[i];
+            else
+                dp->val.d = *(double*) ap;
+        } else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
+            if (i < FPR_COUNT)
+                dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
+            else {
+                float *p = (float *)ap;
+                p++;
+                dp->val.f = *p;
+            }
+        } else { /* integer type or pointer */
+            if (i < GPR_COUNT)
+                tempu64 = gprData[i];
+            else
+                tempu64 = *ap;
+
+            if (param.IsOut() || !type.IsArithmetic())
+                dp->val.p = (void*) tempu64;
+            else if (type ==nsXPTType::T_I8)
+                dp->val.i8  = (PRInt8)   tempu64;
+            else if (type ==nsXPTType::T_I16)
+                dp->val.i16 = (PRInt16)  tempu64;
+            else if (type ==nsXPTType::T_I32)
+                dp->val.i32 = (PRInt32)  tempu64;
+            else if (type ==nsXPTType::T_I64)
+                dp->val.i64 = (PRInt64)  tempu64;
+            else if (type ==nsXPTType::T_U8)
+                dp->val.u8  = (PRUint8)  tempu64;
+            else if (type ==nsXPTType::T_U16)
+                dp->val.u16 = (PRUint16) tempu64;
+            else if (type ==nsXPTType::T_U32)
+                dp->val.u32 = (PRUint32) tempu64;
+            else if (type ==nsXPTType::T_U64)
+                dp->val.u64 = (PRUint64) tempu64;
+            else if (type ==nsXPTType::T_BOOL)
+                dp->val.b   = (PRBool)   tempu64;
+            else if (type ==nsXPTType::T_CHAR)
+                dp->val.c   = (char)     tempu64;
+            else if (type ==nsXPTType::T_WCHAR)
+                dp->val.wc  = (wchar_t)  tempu64;
+            else
+                NS_ASSERTION(0, "bad type");
+        }
+
+        if (i >= 7)
+            ap++;
+    }
+
+    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
+
+    NS_RELEASE(iface_info);
+
+    if (dispatchParams != paramBuffer)
+        delete [] dispatchParams;
+
+    return result;
+}
+
+// Load r11 with the constant 'n' and branch to SharedStub().
+//
+// XXX Yes, it's ugly that we're relying on gcc's name-mangling here;
+// however, it's quick, dirty, and'll break when the ABI changes on
+// us, which is what we want ;-).
+
+#if __GXX_ABI_VERSION < 100
+#error Prehistoric GCC not supported here
+#else
+// gcc-3 version
+//
+// As G++3 ABI contains the length of the functionname in the mangled
+// name, it is difficult to get a generic assembler mechanism like
+// in the G++ 2.95 case.
+// Create names would be like:
+// _ZN14nsXPTCStubBase5Stub1Ev
+// _ZN14nsXPTCStubBase6Stub12Ev
+// _ZN14nsXPTCStubBase7Stub123Ev
+// _ZN14nsXPTCStubBase8Stub1234Ev
+// etc.
+// Use assembler directives to get the names right...
+
+# define STUB_ENTRY(n)							\
+__asm__ (								\
+        ".section \".toc\",\"aw\" \n\t"                                 \
+        ".section \".text\" \n\t"                                       \
+	".align	2 \n\t"							\
+	".if	"#n" < 10 \n\t"						\
+	".globl	_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"			\
+        ".section \".opd\",\"aw\" \n\t"                                 \
+	".align	3 \n\t"							\
+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"					\
+        ".quad  ._ZN14nsXPTCStubBase5Stub"#n"Ev,.TOC.@tocbase \n\t"     \
+	".previous \n\t"						\
+	".type	_ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"		\
+"._ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"					\
+									\
+	".elseif "#n" < 100 \n\t"					\
+	".globl	_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"			\
+        ".section \".opd\",\"aw\" \n\t"                                 \
+	".align	3 \n\t"							\
+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"					\
+        ".quad  ._ZN14nsXPTCStubBase6Stub"#n"Ev,.TOC.@tocbase \n\t"     \
+	".previous \n\t"						\
+	".type	_ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"		\
+"._ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"					\
+									\
+	".elseif "#n" < 1000 \n\t"					\
+	".globl	_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"			\
+        ".section \".opd\",\"aw\" \n\t"                                 \
+	".align	3 \n\t"							\
+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"					\
+        ".quad  ._ZN14nsXPTCStubBase7Stub"#n"Ev,.TOC.@tocbase \n\t"     \
+	".previous \n\t"						\
+	".type	_ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"		\
+"._ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"					\
+									\
+	".else \n\t"							\
+	".err	\"stub number "#n" >= 1000 not yet supported\"\n"	\
+	".endif \n\t"							\
+									\
+	"li	11,"#n" \n\t"						\
+	"b	SharedStub \n"					\
+);
+#endif
+
+#define SENTINEL_ENTRY(n)                            \
+nsresult nsXPTCStubBase::Sentinel##n()               \
+{                                                    \
+  NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
+  return NS_ERROR_NOT_IMPLEMENTED;                   \
+}
+
+#include "xptcstubsdef.inc"



1.1                  src/patchsets/xulrunner/1.8.1.10/033_firefox-2.0_ppc_powerpc.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/033_firefox-2.0_ppc_powerpc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/033_firefox-2.0_ppc_powerpc.patch?rev=1.1&content-type=text/plain

Index: 033_firefox-2.0_ppc_powerpc.patch
===================================================================
--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2007-03-05 13:46:38.000000000 +0100
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2007-03-05 13:47:30.000000000 +0100
@@ -288,12 +288,12 @@
 #
 # Linux/PPC
 #
-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
+ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
 CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
 ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
 AS		:= $(CC) -c -x assembler-with-cpp
 endif
-ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc64)
+ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
 CPPSRCS		:= xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
 ASFILES		:= xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
 AS		:= $(CC) -c -x assembler-with-cpp



1.1                  src/patchsets/xulrunner/1.8.1.10/050_respect-host-variable.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/050_respect-host-variable.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/050_respect-host-variable.patch?rev=1.1&content-type=text/plain

Index: 050_respect-host-variable.patch
===================================================================
# https://bugs.gentoo.org/show_bug.cgi?id=168893

--- mozilla/configure.in.old	2007-03-02 23:28:27.000000000 +0200
+++ mozilla/configure.in	2007-03-02 23:29:23.000000000 +0200
@@ -825,7 +825,6 @@
     OS_TARGET="${target_os}"
     OS_ARCH=`echo $target_os | sed -e 's|/|_|g'`
     OS_RELEASE=
-    OS_TEST="${target_cpu}"
     case "${target_os}" in
         linux*)       OS_ARCH=Linux ;;
         solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
@@ -837,8 +836,10 @@
     OS_TARGET=`uname -s`
     OS_ARCH=`uname -s | sed -e 's|/|_|g'`
     OS_RELEASE=`uname -r`
-    OS_TEST=`uname -m`
 fi
+
+OS_TEST="${target_cpu}"
+
 _COMPILER_PREFIX=
 
 HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`



1.1                  src/patchsets/xulrunner/1.8.1.10/055_firefox-2.0_gfbsd-pthreads.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/055_firefox-2.0_gfbsd-pthreads.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/055_firefox-2.0_gfbsd-pthreads.patch?rev=1.1&content-type=text/plain

Index: 055_firefox-2.0_gfbsd-pthreads.patch
===================================================================
# https://bugs.gentoo.org/show_bug.cgi?id=169825

--- mozilla/config/rules.mk.orig	Thu Sep 14 14:07:03 2006
+++ mozilla/config/rules.mk	Wed Oct 18 11:00:09 2006
@@ -442,9 +442,7 @@
 endif
 
 ifeq ($(OS_ARCH),FreeBSD)
-ifdef IS_COMPONENT
-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-endif
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
 endif
 
 ifeq ($(OS_ARCH),NetBSD)
--- mozilla/configure.in.orig	2007-02-06 02:37:37 -0300
+++ mozilla/configure.in	2007-03-07 15:35:41 -0300
@@ -2667,7 +2667,7 @@
 *-hpux11.*)
 	;;
 *)
-	AC_CHECK_LIB(c_r, gethostbyname_r)
+	AC_SEARCH_LIBS([gethostbyname_r], [c_r])
 	;;
 esac
 AC_CHECK_LIB(m, atan)
--- mozilla/configure.in.orig   2007-02-06 02:37:37 -0300
+++ mozilla/configure.in	2007-03-07 13:59:53 -0300
@@ -2839,11 +2839,12 @@
 	    *-*-freebsd*)
 			AC_DEFINE(_REENTRANT)
 			AC_DEFINE(_THREAD_SAFE)
-			dnl -pthread links in -lc_r, so don't specify it explicitly.
-			if test "$ac_cv_have_dash_pthread" = "yes"; then
-				_PTHREAD_LDFLAGS="-pthread"
+			dnl use the environment PTHREAD_LIBS
+			if test -n "$PTHREAD_LIBS"; then
+				_PTHREAD_LDFLAGS="$PTHREAD_LIBS"
 			else
-				_PTHREAD_LDFLAGS="-lc_r"
+				_PTHREAD_LDFLAGS="-lpthread"
 			fi
+			LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}"
 			;;



1.1                  src/patchsets/xulrunner/1.8.1.10/060_embed-typeaheadfind-1.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/060_embed-typeaheadfind-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/060_embed-typeaheadfind-1.patch?rev=1.1&content-type=text/plain

Index: 060_embed-typeaheadfind-1.patch
===================================================================
# Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=273524

diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/Makefile.in mozilla/extensions/typeaheadfind/Makefile.in
--- mozilla.orig/extensions/typeaheadfind/Makefile.in	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/Makefile.in	2005-03-26 11:39:29.000000000 -0500
@@ -31,7 +31,7 @@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= typeaheadfind
+MODULE		= typeaheadfindsea
 DIRS		= public src resources
 
 include $(topsrcdir)/config/rules.mk
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/public/Makefile.in mozilla/extensions/typeaheadfind/public/Makefile.in
--- mozilla.orig/extensions/typeaheadfind/public/Makefile.in	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/public/Makefile.in	2005-03-26 11:39:29.000000000 -0500
@@ -31,11 +31,11 @@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE=typeaheadfind
-XPIDL_MODULE=typeaheadfind
+MODULE=typeaheadfindsea
+XPIDL_MODULE=typeaheadfindsea
 GRE_MODULE	= 1
 
-XPIDLSRCS= ./nsITypeAheadFind.idl \
+XPIDLSRCS= ./nsITypeAheadFindSea.idl \
   $(NULL)
 
 
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFind.idl mozilla/extensions/typeaheadfind/public/nsITypeAheadFind.idl
--- mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFind.idl	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/public/nsITypeAheadFind.idl	1969-12-31 19:00:00.000000000 -0500
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Original Author: Aaron Leventhal (aaronl@××××××××.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-#include "domstubs.idl"
-#include "nsISupportsPrimitives.idl"
-
-%{ C++
-  #include "nsIDOMEvent.h"
-
-  #define NS_TYPEAHEADFIND_CID \
-    {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4}}
-
-  #define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/typeaheadfind;1"
-%}
-
-interface nsIDOMEvent;
-
-[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
-interface nsITypeAheadFind : nsISupports
-{
-  /** Is type ahead find mode currently on? */
-  readonly attribute boolean isActive;
-
-  /** Manually start type ahead find mode */
-  void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly);
-
-  /** Manually cancel type ahead find mode */
-  void cancelFind();
-
-  /**
-    * Will find as you type start automatically if the user
-    * types with the focus on page content other than a textfield or select?
-    * If autostart is off, the startNewFind() method can be used to enact
-    * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText.
-    */
-  void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn);
-  boolean getAutoStart(in nsIDOMWindow aWindow);  
-
-  /**
-    * Find next recurrence if typeaheadfind was the last used find, 
-    * as opposed to regular find. Returns false in nsISupportsPRBool if we
-    * don't handle the request.
-    */
-  void findNext(in boolean aReverse, in nsISupportsInterfacePointer aCallerWindowSupports);
-
-  /*
-   * Go back and remove one character from find string
-   * Returns true if backspace used
-   */
-  boolean backOneChar();
-};
-
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl mozilla/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl
--- mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl	1969-12-31 19:00:00.000000000 -0500
+++ mozilla/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl	2005-03-26 11:39:29.000000000 -0500
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Original Author: Aaron Leventhal (aaronl@××××××××.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsISupports.idl"
+#include "domstubs.idl"
+#include "nsISupportsPrimitives.idl"
+
+%{ C++
+  #include "nsIDOMEvent.h"
+
+  #define NS_TYPEAHEADFINDSEA_CID \
+    {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4}}
+
+  #define NS_TYPEAHEADFINDSEA_CONTRACTID "@mozilla.org/typeaheadfindsea;1"
+%}
+
+interface nsIDOMEvent;
+
+[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)]
+interface nsITypeAheadFindSea : nsISupports
+{
+  /** Is type ahead find mode currently on? */
+  readonly attribute boolean isActive;
+
+  /** Manually start type ahead find mode */
+  void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly);
+
+  /** Manually cancel type ahead find mode */
+  void cancelFind();
+
+  /**
+    * Will find as you type start automatically if the user
+    * types with the focus on page content other than a textfield or select?
+    * If autostart is off, the startNewFind() method can be used to enact
+    * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText.
+    */
+  void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn);
+  boolean getAutoStart(in nsIDOMWindow aWindow);  
+
+  /**
+    * Find next recurrence if typeaheadfindsea was the last used find, 
+    * as opposed to regular find. Returns false in nsISupportsPRBool if we
+    * don't handle the request.
+    */
+  void findNext(in boolean aReverse, in nsISupportsInterfacePointer aCallerWindowSupports);
+
+  /*
+   * Go back and remove one character from find string
+   * Returns true if backspace used
+   */
+  boolean backOneChar();
+};
+
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js mozilla/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js
--- mozilla.orig/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js	2005-03-26 11:39:29.000000000 -0500
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-pref("accessibility.typeaheadfind", true);
-pref("accessibility.typeaheadfind.linksonly", true);
-pref("accessibility.typeaheadfind.startlinksonly", false);
-pref("accessibility.typeaheadfind.timeout", 5000);
+pref("accessibility.typeaheadfindsea", true);
+pref("accessibility.typeaheadfindsea.linksonly", true);
+pref("accessibility.typeaheadfindsea.startlinksonly", false);
+pref("accessibility.typeaheadfindsea.timeout", 5000);
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/resources/jar.mn mozilla/extensions/typeaheadfind/resources/jar.mn
--- mozilla.orig/extensions/typeaheadfind/resources/jar.mn	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/resources/jar.mn	2005-03-26 11:39:29.000000000 -0500
@@ -1,5 +1,5 @@
 en-US.jar:
-    locale/en-US/global/typeaheadfind.properties  (locale/en-US/typeaheadfind.properties)
+    locale/en-US/global/typeaheadfindsea.properties  (locale/en-US/typeaheadfindsea.properties)
 
 toolkit.jar:
     content/global/notfound.wav                   (content/notfound.wav)
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties
--- mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-openparen     = (
-closeparen    = )
-textfound     = Text found: "
-textnotfound  = Text not found: "
-linkfound     = Link found: "
-linknotfound  = Link not found: "
-closequote    = "
-stopfind      = Find stopped.
-starttextfind = Starting -- find text as you type
-startlinkfind = Starting -- find links as you type
-repeated      = repeated
-nextmatch     = - next match
-prevmatch     = - previous match
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties
--- mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties	1969-12-31 19:00:00.000000000 -0500
+++ mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties	2005-03-26 11:39:29.000000000 -0500
@@ -0,0 +1,13 @@
+openparen     = (
+closeparen    = )
+textfound     = Text found: "
+textnotfound  = Text not found: "
+linkfound     = Link found: "
+linknotfound  = Link not found: "
+closequote    = "
+stopfind      = Find stopped.
+starttextfind = Starting -- find text as you type
+startlinkfind = Starting -- find links as you type
+repeated      = repeated
+nextmatch     = - next match
+prevmatch     = - previous match
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/Makefile.in mozilla/extensions/typeaheadfind/src/Makefile.in
--- mozilla.orig/extensions/typeaheadfind/src/Makefile.in	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/src/Makefile.in	2005-03-26 11:39:29.000000000 -0500
@@ -31,15 +31,15 @@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = typeaheadfind
-LIBRARY_NAME = typeaheadfind
+MODULE = typeaheadfindsea
+LIBRARY_NAME = typeaheadfindsea
 ifneq ($(OS_ARCH),WINNT)
-SHORT_LIBNAME = typahead
+SHORT_LIBNAME = typaheadsea
 endif
 GRE_MODULE	= 1
 MOZILLA_INTERNAL_API = 1
 
-PACKAGE_FILE = typeaheadfind.pkg
+PACKAGE_FILE = typeaheadfindsea.pkg
 
 REQUIRES	= appcomps \
 		  embedcomponents \
@@ -66,7 +66,7 @@
 
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
-MODULE_NAME	= nsTypeAheadFind
+MODULE_NAME	= nsTypeAheadFindSea
 
 CPPSRCS =   \
   nsTypeAheadFind.cpp	   \
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.cpp mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
--- mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.cpp	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp	2005-03-26 11:39:29.000000000 -0500
@@ -114,8 +114,8 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-NS_INTERFACE_MAP_BEGIN(nsTypeAheadFind)
-  NS_INTERFACE_MAP_ENTRY(nsITypeAheadFind)
+NS_INTERFACE_MAP_BEGIN(nsTypeAheadFindSea)
+  NS_INTERFACE_MAP_ENTRY(nsITypeAheadFindSea)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
   NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
   NS_INTERFACE_MAP_ENTRY(nsIScrollPositionListener)
@@ -128,8 +128,8 @@
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMKeyListener)
 NS_INTERFACE_MAP_END
 
-NS_IMPL_ADDREF(nsTypeAheadFind)
-NS_IMPL_RELEASE(nsTypeAheadFind)
+NS_IMPL_ADDREF(nsTypeAheadFindSea)
+NS_IMPL_RELEASE(nsTypeAheadFindSea)
 
 static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
 static NS_DEFINE_CID(kStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
@@ -138,11 +138,11 @@
 
 #define NS_FIND_CONTRACTID "@mozilla.org/embedcomp/rangefind;1"
 
-nsTypeAheadFind* nsTypeAheadFind::sInstance = nsnull;
-PRInt32 nsTypeAheadFind::sAccelKey = -1;  // magic value of -1 when unitialized
+nsTypeAheadFindSea* nsTypeAheadFindSea::sInstance = nsnull;
+PRInt32 nsTypeAheadFindSea::sAccelKey = -1;  // magic value of -1 when unitialized
 
 
-nsTypeAheadFind::nsTypeAheadFind():
+nsTypeAheadFindSea::nsTypeAheadFindSea():
   mIsFindAllowedInWindow(PR_FALSE), mAutoStartPref(PR_FALSE),
   mLinksOnlyPref(PR_FALSE), mStartLinksOnlyPref(PR_FALSE),
   mLinksOnly(PR_FALSE), mIsTypeAheadOn(PR_FALSE), mCaretBrowsingOn(PR_FALSE),
@@ -161,25 +161,25 @@
   static PRInt32 gInstanceCount;
   ++gInstanceCount;
   NS_ASSERTION(gInstanceCount == 1,
-    "There should be only 1 instance of nsTypeAheadFind!");
+    "There should be only 1 instance of nsTypeAheadFindSea!");
 #endif
 }
 
 
-nsTypeAheadFind::~nsTypeAheadFind()
+nsTypeAheadFindSea::~nsTypeAheadFindSea()
 {
   RemoveDocListeners();
   mTimer = nsnull;
 
   nsCOMPtr<nsIPrefBranch2> prefInternal(do_GetService(NS_PREFSERVICE_CONTRACTID));
   if (prefInternal) {
-    prefInternal->RemoveObserver("accessibility.typeaheadfind", this);
+    prefInternal->RemoveObserver("accessibility.typeaheadfindsea", this);
     prefInternal->RemoveObserver("accessibility.browsewithcaret", this);
   }
 }
 
 nsresult
-nsTypeAheadFind::Init()
+nsTypeAheadFindSea::Init()
 {
   nsresult rv = NS_NewISupportsArray(getter_AddRefs(mManualFindWindows));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -196,7 +196,7 @@
   }
 
   // ----------- Listen to prefs ------------------
-  rv = prefInternal->AddObserver("accessibility.typeaheadfind", this, PR_FALSE);
+  rv = prefInternal->AddObserver("accessibility.typeaheadfindsea", this, PR_FALSE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   rv = prefInternal->AddObserver("accessibility.browsewithcaret", this, PR_FALSE);
@@ -217,11 +217,11 @@
   return rv;
 }
 
-nsTypeAheadFind *
-nsTypeAheadFind::GetInstance()
+nsTypeAheadFindSea *
+nsTypeAheadFindSea::GetInstance()
 {
   if (!sInstance) {
-    sInstance = new nsTypeAheadFind();
+    sInstance = new nsTypeAheadFindSea();
     if (!sInstance)
       return nsnull;
 
@@ -241,14 +241,14 @@
 
 
 void
-nsTypeAheadFind::ReleaseInstance()
+nsTypeAheadFindSea::ReleaseInstance()
 {
   NS_IF_RELEASE(sInstance);
 }
 
 
 void 
-nsTypeAheadFind::Shutdown()
+nsTypeAheadFindSea::Shutdown()
 {
   // Application shutdown 
   mTimer = nsnull;
@@ -264,14 +264,14 @@
 // ------- Pref Callbacks (2) ---------------
 
 nsresult
-nsTypeAheadFind::PrefsReset()
+nsTypeAheadFindSea::PrefsReset()
 {
   nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
   NS_ENSURE_TRUE(prefBranch, NS_ERROR_FAILURE);
 
   PRBool wasTypeAheadOn = mIsTypeAheadOn;
 
-  prefBranch->GetBoolPref("accessibility.typeaheadfind", &mIsTypeAheadOn);
+  prefBranch->GetBoolPref("accessibility.typeaheadfindsea", &mIsTypeAheadOn);
 
   if (mIsTypeAheadOn != wasTypeAheadOn) {
     if (!mIsTypeAheadOn) {
@@ -291,7 +291,7 @@
         do_GetService(kStringBundleServiceCID);
 
       if (stringBundleService)
-        stringBundleService->CreateBundle(TYPEAHEADFIND_BUNDLE_URL,
+        stringBundleService->CreateBundle(TYPEAHEADFINDSEA_BUNDLE_URL,
                                           getter_AddRefs(mStringBundle));
 
       // Observe find again commands. We'll handle them if we were the last find
@@ -306,34 +306,34 @@
   }
 
   PRBool oldAutoStartPref = mAutoStartPref;
-  prefBranch->GetBoolPref("accessibility.typeaheadfind.autostart",
+  prefBranch->GetBoolPref("accessibility.typeaheadfindsea.autostart",
                            &mAutoStartPref);
   if (mAutoStartPref != oldAutoStartPref) {
     ResetGlobalAutoStart(mAutoStartPref);
   }
  
-  prefBranch->GetBoolPref("accessibility.typeaheadfind.linksonly",
+  prefBranch->GetBoolPref("accessibility.typeaheadfindsea.linksonly",
                           &mLinksOnlyPref);
 
-  prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
+  prefBranch->GetBoolPref("accessibility.typeaheadfindsea.startlinksonly",
                           &mStartLinksOnlyPref);
 
   PRBool isSoundEnabled = PR_TRUE;
-  prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
+  prefBranch->GetBoolPref("accessibility.typeaheadfindsea.enablesound",
                            &isSoundEnabled);
   nsXPIDLCString soundStr;
   if (isSoundEnabled) {
-    prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
+    prefBranch->GetCharPref("accessibility.typeaheadfindsea.soundURL",
                              getter_Copies(soundStr));
   }
   mNotFoundSoundURL = soundStr;
 
   PRBool isTimeoutEnabled = PR_FALSE;
-  prefBranch->GetBoolPref("accessibility.typeaheadfind.enabletimeout",
+  prefBranch->GetBoolPref("accessibility.typeaheadfindsea.enabletimeout",
                           &isTimeoutEnabled);
   PRInt32 timeoutLength = 0;
   if (isTimeoutEnabled) {
-    prefBranch->GetIntPref("accessibility.typeaheadfind.timeout",
+    prefBranch->GetIntPref("accessibility.typeaheadfindsea.timeout",
                            &timeoutLength);
   }
   mTimeoutLength = timeoutLength;
@@ -349,7 +349,7 @@
 // ------- nsITimer Methods (1) ---------------
 
 NS_IMETHODIMP
-nsTypeAheadFind::Notify(nsITimer *timer)
+nsTypeAheadFindSea::Notify(nsITimer *timer)
 {
   CancelFind();
   return NS_OK;
@@ -358,7 +358,7 @@
 // ----------- nsIObserver Methods (1) -------------------
 
 NS_IMETHODIMP
-nsTypeAheadFind::Observe(nsISupports *aSubject, const char *aTopic,
+nsTypeAheadFindSea::Observe(nsISupports *aSubject, const char *aTopic,
                          const PRUnichar *aData)
 {
   PRBool isOpening;
@@ -476,7 +476,7 @@
 
 
 nsresult
-nsTypeAheadFind::UseInWindow(nsIDOMWindow *aDOMWin)
+nsTypeAheadFindSea::UseInWindow(nsIDOMWindow *aDOMWin)
 {
   NS_ENSURE_ARG_POINTER(aDOMWin);
 
@@ -529,7 +529,7 @@
 // ------- nsIDOMEventListener Methods (1) ---------------
 
 NS_IMETHODIMP
-nsTypeAheadFind::HandleEvent(nsIDOMEvent* aEvent)
+nsTypeAheadFindSea::HandleEvent(nsIDOMEvent* aEvent)
 {
   nsAutoString eventType;
   aEvent->GetType(eventType);
@@ -589,21 +589,21 @@
 // ------- nsIDOMKeyListener Methods (3) ---------------
 
 NS_IMETHODIMP
-nsTypeAheadFind::KeyDown(nsIDOMEvent* aEvent)
+nsTypeAheadFindSea::KeyDown(nsIDOMEvent* aEvent)
 {
   return NS_OK;
 }
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::KeyUp(nsIDOMEvent* aEvent)
+nsTypeAheadFindSea::KeyUp(nsIDOMEvent* aEvent)
 {
   return NS_OK;
 }
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::KeyPress(nsIDOMEvent* aEvent)
+nsTypeAheadFindSea::KeyPress(nsIDOMEvent* aEvent)
 {
   if (!mIsTypeAheadOn || mIsMenuBarActive || mIsMenuPopupActive) {
     return NS_OK;
@@ -733,7 +733,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::BackOneChar(PRBool *aIsBackspaceUsed)
+nsTypeAheadFindSea::BackOneChar(PRBool *aIsBackspaceUsed)
 {
   if (!mFocusedDocSelection) {
     *aIsBackspaceUsed = PR_FALSE;
@@ -863,7 +863,7 @@
 
 
 nsresult
-nsTypeAheadFind::HandleChar(PRUnichar aChar)
+nsTypeAheadFindSea::HandleChar(PRUnichar aChar)
 {
   // Add a printable char to mTypeAheadBuffer, then search for buffer contents
 
@@ -1039,7 +1039,7 @@
 
 
 void
-nsTypeAheadFind::SaveFind()
+nsTypeAheadFindSea::SaveFind()
 {
   // Store find string for find-next
   mFindNextBuffer = mTypeAheadBuffer;
@@ -1060,14 +1060,14 @@
     mFindService->SetSearchString(mFindNextBuffer);
   }
 
-  // --- If accessibility.typeaheadfind.timeout is set,
+  // --- If accessibility.typeaheadfindsea.timeout is set,
   //     cancel find after specified # milliseconds ---
   StartTimeout();
 }
 
 
 void
-nsTypeAheadFind::PlayNotFoundSound()
+nsTypeAheadFindSea::PlayNotFoundSound()
 {
   if (mNotFoundSoundURL.IsEmpty())    // no sound
     return;
@@ -1097,7 +1097,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::HandleText(nsIDOMEvent* aTextEvent)
+nsTypeAheadFindSea::HandleText(nsIDOMEvent* aTextEvent)
 {
   // This is called multiple times in the middle of an 
   // IME composition
@@ -1145,7 +1145,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::HandleStartComposition(nsIDOMEvent* aCompositionEvent)
+nsTypeAheadFindSea::HandleStartComposition(nsIDOMEvent* aCompositionEvent)
 {
   // This is called once at the start of an IME composition
 
@@ -1167,7 +1167,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::HandleEndComposition(nsIDOMEvent* aCompositionEvent)
+nsTypeAheadFindSea::HandleEndComposition(nsIDOMEvent* aCompositionEvent)
 {
   // This is called once at the end of an IME composition
 
@@ -1198,28 +1198,28 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::HandleQueryComposition(nsIDOMEvent* aCompositionEvent)
+nsTypeAheadFindSea::HandleQueryComposition(nsIDOMEvent* aCompositionEvent)
 {
   return NS_OK;
 }
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::HandleQueryReconversion(nsIDOMEvent* aCompositionEvent)
+nsTypeAheadFindSea::HandleQueryReconversion(nsIDOMEvent* aCompositionEvent)
 {
   return NS_OK;
 }
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::HandleQueryCaretRect(nsIDOMEvent* aCompositionEvent)
+nsTypeAheadFindSea::HandleQueryCaretRect(nsIDOMEvent* aCompositionEvent)
 {
   return NS_OK;
 }
 
 
 nsresult
-nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell,
+nsTypeAheadFindSea::FindItNow(nsIPresShell *aPresShell,
                            PRBool aIsRepeatingSameChar, PRBool aIsLinksOnly,
                            PRBool aIsFirstVisiblePreferred)
 {
@@ -1241,7 +1241,7 @@
 
   nsCOMPtr<nsISupports> startingContainer = presContext->GetContainer();
   nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(startingContainer));
-  NS_ASSERTION(treeItem, "Bug 175321 Crashes with Type Ahead Find [@ nsTypeAheadFind::FindItNow]");
+  NS_ASSERTION(treeItem, "Bug 175321 Crashes with Type Ahead Find [@ nsTypeAheadFindSea::FindItNow]");
   if (!treeItem) {
     return NS_ERROR_FAILURE;
   }
@@ -1465,7 +1465,7 @@
 
 
 nsresult
-nsTypeAheadFind::GetSearchContainers(nsISupports *aContainer,
+nsTypeAheadFindSea::GetSearchContainers(nsISupports *aContainer,
                                      PRBool aIsRepeatingSameChar,
                                      PRBool aIsFirstVisiblePreferred,
                                      PRBool aCanUseDocSelection,
@@ -1573,7 +1573,7 @@
 
 
 void
-nsTypeAheadFind::RangeStartsInsideLink(nsIDOMRange *aRange,
+nsTypeAheadFindSea::RangeStartsInsideLink(nsIDOMRange *aRange,
                                        nsIPresShell *aPresShell,
                                        PRBool *aIsInsideLink,
                                        PRBool *aIsStartingLink)
@@ -1680,7 +1680,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::ScrollPositionWillChange(nsIScrollableView *aView,
+nsTypeAheadFindSea::ScrollPositionWillChange(nsIScrollableView *aView,
                                           nscoord aX, nscoord aY)
 {
   return NS_OK;
@@ -1688,7 +1688,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::ScrollPositionDidChange(nsIScrollableView *aScrollableView,
+nsTypeAheadFindSea::ScrollPositionDidChange(nsIScrollableView *aScrollableView,
                                          nscoord aX, nscoord aY)
 {
   if (!mIsFindingText)
@@ -1699,7 +1699,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::NotifySelectionChanged(nsIDOMDocument *aDoc,
+nsTypeAheadFindSea::NotifySelectionChanged(nsIDOMDocument *aDoc,
                                         nsISelection *aSel, PRInt16 aReason)
 {
   if (!mIsFindingText) {
@@ -1716,10 +1716,10 @@
 }
 
 
-// ---------------- nsITypeAheadFind --------------------
+// ---------------- nsITypeAheadFindSea --------------------
 
 NS_IMETHODIMP
-nsTypeAheadFind::FindNext(PRBool aFindBackwards, nsISupportsInterfacePointer *aCallerWindowSupports)
+nsTypeAheadFindSea::FindNext(PRBool aFindBackwards, nsISupportsInterfacePointer *aCallerWindowSupports)
 {
   NS_ENSURE_TRUE(aCallerWindowSupports, NS_ERROR_FAILURE);
 
@@ -1731,7 +1731,7 @@
     return NS_OK;
   }
 
-  // Compare the top level content pres shell of typeaheadfind
+  // Compare the top level content pres shell of typeaheadfindsea
   // with the top level content pres shell window where find next is happening
   // If they're different, exit so that webbrowswerfind can handle FindNext()
 
@@ -1764,7 +1764,7 @@
   NS_ENSURE_TRUE(callerPresShell, NS_OK);
 
   if (callerPresShell != typeAheadPresShell) {
-    // This means typeaheadfind is active in a different window or doc
+    // This means typeaheadfindsea is active in a different window or doc
     // So it's not appropriate to find next for the current window
     mFindNextBuffer.Truncate();
     return NS_OK;
@@ -1782,7 +1782,7 @@
     webBrowserFind->GetSearchString(getter_Copies(webBrowserFindString));
     if (!webBrowserFindString.Equals(mFindNextBuffer)) {
       // If they're not equal, then the find dialog was used last,
-      // not typeaheadfind. Typeaheadfind applies to the last find,
+      // not typeaheadfindsea. Typeaheadfind applies to the last find,
       // so we should let nsIWebBrowserFind::FindNext() do it.
       mFindNextBuffer.Truncate();
       return NS_OK;
@@ -1832,7 +1832,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::GetIsActive(PRBool *aIsActive)
+nsTypeAheadFindSea::GetIsActive(PRBool *aIsActive)
 {
   *aIsActive = mLinksOnlyManuallySet || !mTypeAheadBuffer.IsEmpty();
 
@@ -1845,7 +1845,7 @@
  */
 
 NS_IMETHODIMP
-nsTypeAheadFind::StartNewFind(nsIDOMWindow *aWindow, PRBool aLinksOnly)
+nsTypeAheadFindSea::StartNewFind(nsIDOMWindow *aWindow, PRBool aLinksOnly)
 {
   if (!mFind || !mIsTypeAheadOn || !aWindow)
     return NS_ERROR_FAILURE;  // Type Ahead Find not correctly initialized
@@ -1878,7 +1878,7 @@
 }
 
 void
-nsTypeAheadFind::ResetGlobalAutoStart(PRBool aAutoStart)
+nsTypeAheadFindSea::ResetGlobalAutoStart(PRBool aAutoStart)
 {
   // Enumerate through the current top level windows
   // and either attach or remove window listeners
@@ -1916,7 +1916,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::SetAutoStart(nsIDOMWindow *aDOMWin, PRBool aAutoStartOn)
+nsTypeAheadFindSea::SetAutoStart(nsIDOMWindow *aDOMWin, PRBool aAutoStartOn)
 {
   if (!aDOMWin) {
     return NS_ERROR_FAILURE;
@@ -1946,7 +1946,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::GetAutoStart(nsIDOMWindow *aDOMWin, PRBool *aIsAutoStartOn)
+nsTypeAheadFindSea::GetAutoStart(nsIDOMWindow *aDOMWin, PRBool *aIsAutoStartOn)
 {
   *aIsAutoStartOn = PR_FALSE;
 
@@ -2014,7 +2014,7 @@
 
 
 NS_IMETHODIMP
-nsTypeAheadFind::CancelFind()
+nsTypeAheadFindSea::CancelFind()
 {
   // Stop current find if:
   //   1. Escape pressed
@@ -2070,7 +2070,7 @@
 // ------- Helper Methods ---------------
 
 void 
-nsTypeAheadFind::GetTopContentPresShell(nsIDocShellTreeItem *aDocShellTreeItem, 
+nsTypeAheadFindSea::GetTopContentPresShell(nsIDocShellTreeItem *aDocShellTreeItem, 
                                         nsIPresShell **aPresShell)
 {
   *aPresShell = nsnull;
@@ -2086,7 +2086,7 @@
 }
 
 void 
-nsTypeAheadFind::GetStartWindow(nsIDOMWindow *aWindow, nsIDOMWindow **aStartWindow)
+nsTypeAheadFindSea::GetStartWindow(nsIDOMWindow *aWindow, nsIDOMWindow **aStartWindow)
 {
   // Return the root ancestor content window of aWindow
 
@@ -2118,7 +2118,7 @@
 }
 
 nsresult
-nsTypeAheadFind::GetWebBrowserFind(nsIDOMWindow *aWin, 
+nsTypeAheadFindSea::GetWebBrowserFind(nsIDOMWindow *aWin, 
                                    nsIWebBrowserFind **aWebBrowserFind)
 {
   NS_ENSURE_ARG_POINTER(aWin);
@@ -2143,7 +2143,7 @@
 
 
 void
-nsTypeAheadFind::StartTimeout()
+nsTypeAheadFindSea::StartTimeout()
 {
   if (mTimeoutLength) {
     if (!mTimer) {
@@ -2159,7 +2159,7 @@
 }
 
 void
-nsTypeAheadFind::SetSelectionLook(nsIPresShell *aPresShell, 
+nsTypeAheadFindSea::SetSelectionLook(nsIPresShell *aPresShell, 
                                   PRBool aChangeColor, 
                                   PRBool aEnabled)
 {
@@ -2167,8 +2167,8 @@
     return;
 
   // Show caret when type ahead find is on
-  // Also paint selection bright (typeaheadfind on) or normal
-  // (typeaheadfind off)
+  // Also paint selection bright (typeaheadfindsea on) or normal
+  // (typeaheadfindsea off)
 
   if (aChangeColor) {
     mFocusedDocSelCon->SetDisplaySelection(nsISelectionController::SELECTION_ATTENTION);
@@ -2211,7 +2211,7 @@
 
 
 void
-nsTypeAheadFind::RemoveDocListeners()
+nsTypeAheadFindSea::RemoveDocListeners()
 {
   nsCOMPtr<nsIPresShell> presShell(GetPresShell());
   nsIViewManager* vm = nsnull;
@@ -2245,7 +2245,7 @@
 
 
 void
-nsTypeAheadFind::AttachDocListeners(nsIPresShell *aPresShell)
+nsTypeAheadFindSea::AttachDocListeners(nsIPresShell *aPresShell)
 {
   if (!aPresShell) {
     return;
@@ -2275,7 +2275,7 @@
 
 
 void
-nsTypeAheadFind::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
+nsTypeAheadFindSea::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
 {
   nsCOMPtr<nsIDOMEventTarget> chromeEventHandler;
   GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler));
@@ -2332,7 +2332,7 @@
 
 
 void
-nsTypeAheadFind::AttachWindowListeners(nsIDOMWindow *aDOMWin)
+nsTypeAheadFindSea::AttachWindowListeners(nsIDOMWindow *aDOMWin)
 {
   nsCOMPtr<nsIDOMEventTarget> chromeEventHandler;
   GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler));
@@ -2385,7 +2385,7 @@
 
 
 void
-nsTypeAheadFind::GetChromeEventHandler(nsIDOMWindow *aDOMWin,
+nsTypeAheadFindSea::GetChromeEventHandler(nsIDOMWindow *aDOMWin,
                                        nsIDOMEventTarget **aChromeTarget)
 {
   nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aDOMWin));
@@ -2401,7 +2401,7 @@
 }
 
 PRBool
-nsTypeAheadFind::IsTargetContentOkay(nsIContent *aContent)
+nsTypeAheadFindSea::IsTargetContentOkay(nsIContent *aContent)
 {
   if (!aContent) {
     return PR_FALSE;
@@ -2439,7 +2439,7 @@
 
 
 nsresult
-nsTypeAheadFind::GetTargetIfTypeAheadOkay(nsIDOMEvent *aEvent, 
+nsTypeAheadFindSea::GetTargetIfTypeAheadOkay(nsIDOMEvent *aEvent, 
                                           nsIContent **aTargetContent,
                                           nsIPresShell **aTargetPresShell)
 {
@@ -2522,7 +2522,7 @@
 
 
 void
-nsTypeAheadFind::GetSelection(nsIPresShell *aPresShell,
+nsTypeAheadFindSea::GetSelection(nsIPresShell *aPresShell,
                               nsISelectionController **aSelCon,
                               nsISelection **aDOMSel)
 {
@@ -2544,7 +2544,7 @@
 
 
 PRBool
-nsTypeAheadFind::IsRangeVisible(nsIPresShell *aPresShell,
+nsTypeAheadFindSea::IsRangeVisible(nsIPresShell *aPresShell,
                                 nsPresContext *aPresContext,
                                 nsIDOMRange *aRange, PRBool aMustBeInViewPort,
                                 PRBool aGetTopVisibleLeaf,
@@ -2698,7 +2698,7 @@
 
 
 nsresult
-nsTypeAheadFind::GetTranslatedString(const nsAString& aKey,
+nsTypeAheadFindSea::GetTranslatedString(const nsAString& aKey,
                                      nsAString& aStringOut)
 {
   nsXPIDLString xsValue;
@@ -2716,7 +2716,7 @@
 
 
 void
-nsTypeAheadFind::DisplayStatus(PRBool aSuccess, nsIContent *aFocusedContent,
+nsTypeAheadFindSea::DisplayStatus(PRBool aSuccess, nsIContent *aFocusedContent,
                                PRBool aClearStatus, const PRUnichar *aText)
 {
   // pres shell -> pres context -> container -> tree item ->
@@ -2863,7 +2863,7 @@
   // Make sure we're not focused on a text field, listbox
   // or other form control that needs typeahead keystrokes
   if (focusedContent) {
-    *aResult = nsTypeAheadFind::IsTargetContentOkay(focusedContent);
+    *aResult = nsTypeAheadFindSea::IsTargetContentOkay(focusedContent);
     return NS_OK;
   }
 
@@ -2928,8 +2928,8 @@
   EnsureContentWindow(domWinInternal, getter_AddRefs(startContentWin));
   NS_ENSURE_TRUE(startContentWin, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsITypeAheadFind> typeAhead = 
-    do_GetService(NS_TYPEAHEADFIND_CONTRACTID);
+  nsCOMPtr<nsITypeAheadFindSea> typeAhead = 
+    do_GetService(NS_TYPEAHEADFINDSEA_CONTRACTID);
   NS_ENSURE_TRUE(typeAhead, NS_ERROR_FAILURE);
 
   return typeAhead->StartNewFind(startContentWin, isLinkSearch);
@@ -3013,7 +3013,7 @@
 }
 
 already_AddRefed<nsIPresShell>
-nsTypeAheadFind::GetPresShell()
+nsTypeAheadFindSea::GetPresShell()
 {
   if (!mFocusedWeakShell)
     return nsnull;
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.h mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h
--- mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.h	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h	2005-03-26 11:39:29.000000000 -0500
@@ -62,13 +62,13 @@
 #include "nsIDOMRange.h"
 #include "nsIDOMWindow.h"
 #include "nsIDocShellTreeItem.h"
-#include "nsITypeAheadFind.h"
+#include "nsITypeAheadFindSea.h"
 #include "nsIStringBundle.h"
 #include "nsISupportsArray.h"
 #include "nsISound.h"
 
-#define TYPEAHEADFIND_BUNDLE_URL \
-        "chrome://global/locale/typeaheadfind.properties"
+#define TYPEAHEADFINDSEA_BUNDLE_URL \
+        "chrome://global/locale/typeaheadfindsea.properties"
 #define TYPEAHEADFIND_NOTFOUND_WAV_URL \
         "chrome://global/content/notfound.wav"
 
@@ -82,7 +82,7 @@
 
 const int kMaxBadCharsBeforeCancel = 3;
 
-class nsTypeAheadFind : public nsITypeAheadFind,
+class nsTypeAheadFindSea : public nsITypeAheadFindSea,
                         public nsIDOMKeyListener,
                         public nsIDOMTextListener,
                         public nsIDOMCompositionListener,
@@ -93,13 +93,13 @@
                         public nsSupportsWeakReference
 {
 public:
-  nsTypeAheadFind();
-  virtual ~nsTypeAheadFind();
+  nsTypeAheadFindSea();
+  virtual ~nsTypeAheadFindSea();
 
-  NS_DEFINE_STATIC_CID_ACCESSOR(NS_TYPEAHEADFIND_CID);
+  NS_DEFINE_STATIC_CID_ACCESSOR(NS_TYPEAHEADFINDSEA_CID);
 
   NS_DECL_ISUPPORTS
-  NS_DECL_NSITYPEAHEADFIND
+  NS_DECL_NSITYPEAHEADFINDSEA
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIDOMEVENTLISTENER
   NS_DECL_NSISELECTIONLISTENER
@@ -127,7 +127,7 @@
   // ----- nsITimerCallback -----------------------------
   NS_DECL_NSITIMERCALLBACK
 
-  static nsTypeAheadFind *GetInstance();
+  static nsTypeAheadFindSea *GetInstance();
   static void ReleaseInstance(void);
   static PRBool IsTargetContentOkay(nsIContent *aContent);
 
@@ -185,7 +185,7 @@
   nsresult GetTranslatedString(const nsAString& aKey, nsAString& aStringOut);
 
   // Used by GetInstance and ReleaseInstance
-  static nsTypeAheadFind *sInstance;
+  static nsTypeAheadFindSea *sInstance;
 
   // Current find state
   nsString mTypeAheadBuffer;
@@ -196,7 +196,7 @@
 
   // PRBool's are used instead of PRPackedBool's where the address of the
   // boolean variable is getting passed into a method. For example:
-  // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
+  // GetBoolPref("accessibility.typeaheadfindsea.linksonly", &mLinksOnlyPref);
   PRBool mIsFindAllowedInWindow;
   PRBool mAutoStartPref;
   PRBool mLinksOnlyPref;
@@ -251,7 +251,7 @@
   nsCOMPtr<nsIDOMWindow> mFocusedWindow;
   nsCOMPtr<nsIWeakReference> mFocusedWeakShell;
 
-  // Windows where typeaheadfind doesn't auto start as the user types
+  // Windows where typeaheadfindsea doesn't auto start as the user types
   nsCOMPtr<nsISupportsArray> mManualFindWindows;
 };
 
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp mozilla/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp
--- mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp	2005-03-26 11:39:40.000000000 -0500
@@ -55,7 +55,7 @@
 
 // This function is called at component registration time
 static NS_METHOD
-nsTypeAheadFindRegistrationProc(nsIComponentManager *aCompMgr, nsIFile *aPath,
+nsTypeAheadFindSeaRegistrationProc(nsIComponentManager *aCompMgr, nsIFile *aPath,
                                 const char *registryLocation,
                                 const char *componentType,
                                 const nsModuleComponentInfo *info)
@@ -64,7 +64,7 @@
   // an application component. This makes sure that we're
   // initialized on application startup.
 
-  // Register nsTypeAheadFind to be instantiated on startup.
+  // Register nsTypeAheadFindSea to be instantiated on startup.
   // XXX This is needed on linux, but for some reason not needed on win32.
   nsresult rv;
   nsCOMPtr<nsICategoryManager> categoryManager =
@@ -74,7 +74,7 @@
     rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY,
-                                           "Type Ahead Find", 
+                                           "Type Ahead Find Sea", 
                                            "service,"
-                                           NS_TYPEAHEADFIND_CONTRACTID,
+                                           NS_TYPEAHEADFINDSEA_CONTRACTID,
                                            PR_TRUE, PR_TRUE, nsnull);
   }
 
@@ -82,22 +82,22 @@
 }
 
 
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsTypeAheadFind,
-                                         nsTypeAheadFind::GetInstance)
+NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsTypeAheadFindSea,
+                                         nsTypeAheadFindSea::GetInstance)
 
 static void PR_CALLBACK
-TypeAheadFindModuleDtor(nsIModule* self)
+TypeAheadFindSeaModuleDtor(nsIModule* self)
 {
-  nsTypeAheadFind::ReleaseInstance();
+  nsTypeAheadFindSea::ReleaseInstance();
 }
 
 static const nsModuleComponentInfo components[] =
 {
-  { "TypeAheadFind Component", NS_TYPEAHEADFIND_CID,
-    NS_TYPEAHEADFIND_CONTRACTID, nsTypeAheadFindConstructor,
-    nsTypeAheadFindRegistrationProc, nsnull  // Unregistration proc
+  { "TypeAheadFindSea Component", NS_TYPEAHEADFINDSEA_CID,
+    NS_TYPEAHEADFINDSEA_CONTRACTID, nsTypeAheadFindSeaConstructor,
+    nsTypeAheadFindSeaRegistrationProc, nsnull  // Unregistration proc
   }
 };
 
-NS_IMPL_NSGETMODULE_WITH_DTOR(nsTypeAheadFind, components,
-                              TypeAheadFindModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsTypeAheadFindSea, components,
+                              TypeAheadFindSeaModuleDtor)
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/typeaheadfind.pkg mozilla/extensions/typeaheadfind/src/typeaheadfind.pkg
--- mozilla.orig/extensions/typeaheadfind/src/typeaheadfind.pkg	2005-03-26 00:12:02.000000000 -0500
+++ mozilla/extensions/typeaheadfind/src/typeaheadfind.pkg	1969-12-31 19:00:00.000000000 -0500
@@ -1,9 +0,0 @@
-# why not ship this with GRE/embedding, if we're building it?
-
-[xpfe-browser browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/typeaheadfind.xpt
diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/typeaheadfindsea.pkg mozilla/extensions/typeaheadfind/src/typeaheadfindsea.pkg
--- mozilla.orig/extensions/typeaheadfind/src/typeaheadfindsea.pkg	1969-12-31 19:00:00.000000000 -0500
+++ mozilla/extensions/typeaheadfind/src/typeaheadfindsea.pkg	2005-03-26 11:39:29.000000000 -0500
@@ -0,0 +1,9 @@
+# why not ship this with GRE/embedding, if we're building it?
+
+[xpfe-browser browser]
+#if SHARED_LIBRARY
+dist/bin/components/@SHARED_LIBRARY@
+#else
+!staticcomp @LIBRARY@ @MODULE_NAME@
+#endif
+!xpt dist/bin/components/typeaheadfindsea.xpt



1.1                  src/patchsets/xulrunner/1.8.1.10/063_firefox-rpath-3.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/063_firefox-rpath-3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/063_firefox-rpath-3.patch?rev=1.1&content-type=text/plain

Index: 063_firefox-rpath-3.patch
===================================================================
# Gentoo http://bugs.gentoo.org/show_bug.cgi?id=100597

--- mozilla/config/rules.mk.orig	2006-07-07 06:13:36.000000000 +0200
+++ mozilla/config/rules.mk	2006-07-19 13:22:04.000000000 +0200
@@ -510,7 +510,12 @@
 # 
 ifeq ($(OS_ARCH),Linux)
 ifdef IS_COMPONENT
+DSO_LDOPTS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN/..'
+OS_LDFLAGS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN/..'
 EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+else
+DSO_LDOPTS += -Wl,-rpath,'$$ORIGIN'
+OS_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
 endif
 endif 
 



1.1                  src/patchsets/xulrunner/1.8.1.10/064_firefox-nsplugins-v2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/064_firefox-nsplugins-v2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/064_firefox-nsplugins-v2.patch?rev=1.1&content-type=text/plain

Index: 064_firefox-nsplugins-v2.patch
===================================================================
# Gentoo's Add a search path for plugins. by agriffis

--- mozilla/xpcom/io/nsAppFileLocationProvider.cpp.orig	2006-07-16 22:38:44.000000000 +0200
+++ mozilla/xpcom/io/nsAppFileLocationProvider.cpp	2006-07-16 22:39:41.000000000 +0200
@@ -215,6 +215,14 @@
         if (NS_SUCCEEDED(rv))
             rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
     }
+    else if (nsCRT::strcmp(prop, GENTOO_NSPLUGINS_DIR) == 0)
+    {
+        rv = NS_NewNativeLocalFile(nsDependentCString(GENTOO_NSPLUGINS_DIR), PR_TRUE, getter_AddRefs(localFile));
+    }
+    else if (nsCRT::strcmp(prop, GENTOO_NSBROWSER_PLUGINS_DIR) == 0)
+    {
+        rv = NS_NewNativeLocalFile(nsDependentCString(GENTOO_NSBROWSER_PLUGINS_DIR), PR_TRUE, getter_AddRefs(localFile));
+    }
 #if defined(XP_MAC) || defined(XP_MACOSX)
     else if (nsCRT::strcmp(prop, NS_MACOSX_USER_PLUGIN_DIR) == 0)
     {
@@ -617,7 +625,7 @@
 
         *_retval = new nsAppDirectoryEnumerator(this, keys);
 #else
-        static const char* keys[] = { nsnull, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull };
+        static const char* keys[] = { nsnull, GENTOO_NSPLUGINS_DIR, GENTOO_NSBROWSER_PLUGINS_DIR, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull };
         if (!keys[0] && !(keys[0] = PR_GetEnv("MOZ_PLUGIN_PATH"))) {
             static const char nullstr = 0;
             keys[0] = &nullstr;



1.1                  src/patchsets/xulrunner/1.8.1.10/110_components_no_exec.patch

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

Index: 110_components_no_exec.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110_components_no_exec.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: install extra components without exec premissions. bz#331777

@DPATCH@

--- xulrunner/config/rules.mk	2005-08-11 18:41:53.000000000 +0200
+++ xulrunner/config/rules.mk	2005-10-03 10:02:57.000000000 +0200
@@ -1486,12 +1486,12 @@
 ifdef EXTRA_COMPONENTS
 libs:: $(EXTRA_COMPONENTS)
 ifndef NO_DIST_INSTALL
-	$(INSTALL) $(IFLAGS2) $^ $(FINAL_TARGET)/components
+	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/components
 endif
 
 install:: $(EXTRA_COMPONENTS)
 ifndef NO_INSTALL
-	$(SYSINSTALL) $(IFLAGS2) $^ $(DESTDIR)$(mozappdir)/components
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/components
 endif
 endif
 



1.1                  src/patchsets/xulrunner/1.8.1.10/110_icons.patch

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

Index: 110_icons.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110_icons.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Apply patch from bz#314927 to install default.xpm in the right place

@DPATCH@

=== xulrunner/app/Makefile.in
==================================================================
--- xulrunner/xulrunner/app/Makefile.in	(revision 72)
+++ xulrunner/xulrunner/app/Makefile.in	(local)
@@ -274,7 +274,7 @@
 	$(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default
 
 install::
-	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/icons
+	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
 # XXX applications would need to supply this file



1.1                  src/patchsets/xulrunner/1.8.1.10/110_no_chrome_list.patch

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

Index: 110_no_chrome_list.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110_no_chromelist.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't build chromelist.txt files. bz#331781
## DP: Also correctly call make-jars.pl. bz#333543

@DPATCH@

=== config/rules.mk
==================================================================
--- xulrunner/config/rules.mk	(revision 69)
+++ xulrunner/config/rules.mk	(local)
@@ -1561,8 +1561,6 @@
 	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \
 	    -d $(MAKE_JARS_TARGET)/chrome -j $(FINAL_TARGET)/chrome \
 	    $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \
-	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \
-	    $(FINAL_TARGET)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \
 	fi
 endif
 
@@ -1575,10 +1573,8 @@
 	  $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
 	    $(JAR_MANIFEST) | \
 	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \
-	    -d $(MAKE_JARS_TARGET) -j $(DESTDIR)$(mozappdir)/chrome \
+	    -d $(MAKE_JARS_TARGET)/chrome -j $(DESTDIR)$(mozappdir)/chrome \
 	    $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \
-	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \
-	    $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \
 	fi
 endif
 



1.1                  src/patchsets/xulrunner/1.8.1.10/115_jni.patch

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

Index: 115_jni.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 115_jni.dpatch by  <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch from bz#333738 to update java stubs

@DPATCH@

=== sun-java/stubs/include/jni.h
==================================================================
--- xulrunner/sun-java/stubs/include/jni.h	(revision 134)
+++ xulrunner/sun-java/stubs/include/jni.h	(local)
@@ -114,6 +114,8 @@
 
 #endif
 
+typedef jobject jweak;
+
 #if 0	/* moved to jri_md.h */
 typedef jobject jref; /* For transition---not meant to be part of public 
 			 API anymore.*/
@@ -148,8 +150,13 @@
  * possible return values for JNI functions.
  */
 
-#define JNI_OK 0
-#define JNI_ERR (-1)
+#define JNI_OK           0                 /* success */
+#define JNI_ERR          (-1)              /* unknown error */
+#define JNI_EDETACHED    (-2)              /* thread detached from the VM */
+#define JNI_EVERSION     (-3)              /* JNI version error */
+#define JNI_ENOMEM       (-4)              /* not enough memory */
+#define JNI_EEXIST       (-5)              /* VM already created */
+#define JNI_EINVAL       (-6)              /* invalid arguments */
 
 /*
  * used in ReleaseScalarArrayElements
@@ -211,16 +218,21 @@
     jclass (JNICALL *FindClass)
       (JNIEnv *env, const char *name);
 
-    void *reserved4;
-    void *reserved5;
-    void *reserved6;
+    jmethodID (JNICALL *FromReflectedMethod)
+      (JNIEnv *env, jobject method);
+    jfieldID (JNICALL *FromReflectedField)
+      (JNIEnv *env, jobject field);
 
+    jobject (JNICALL *ToReflectedMethod)
+      (JNIEnv *env, jclass cls, jmethodID methodID, jboolean isStatic);
+
     jclass (JNICALL *GetSuperclass)
       (JNIEnv *env, jclass sub);
     jboolean (JNICALL *IsAssignableFrom)
       (JNIEnv *env, jclass sub, jclass sup);
-    void *reserved7;
 
+    jobject (JNICALL *ToReflectedField)
+      (JNIEnv *env, jclass cls, jfieldID fieldID, jboolean isStatic);
 
     jint (JNICALL *Throw)
       (JNIEnv *env, jthrowable obj);
@@ -234,9 +246,12 @@
       (JNIEnv *env);
     void (JNICALL *FatalError)
       (JNIEnv *env, const char *msg);
-    void *reserved8;
-    void *reserved9;
 
+    jint (JNICALL *PushLocalFrame)
+      (JNIEnv *env, jint capacity);
+    jobject (JNICALL *PopLocalFrame)
+      (JNIEnv *env, jobject result);
+
     jobject (JNICALL *NewGlobalRef)
       (JNIEnv *env, jobject lobj);
     void (JNICALL *DeleteGlobalRef)
@@ -245,8 +260,10 @@
       (JNIEnv *env, jobject obj);
     jboolean (JNICALL *IsSameObject)
       (JNIEnv *env, jobject obj1, jobject obj2);
-    void *reserved10;
-    void *reserved11;
+    jobject (JNICALL *NewLocalRef)
+      (JNIEnv *env, jobject ref);
+    jint (JNICALL *EnsureLocalCapacity)
+      (JNIEnv *env, jint capacity);
 
     jobject (JNICALL *AllocObject)
       (JNIEnv *env, jclass clazz);
@@ -706,6 +723,36 @@
  
     jint (JNICALL *GetJavaVM)
       (JNIEnv *env, JavaVM **vm);
+
+    void (JNICALL *GetStringRegion)
+      (JNIEnv *env, jstring str, jsize start, jsize len, jchar *buf);
+    void (JNICALL *GetStringUTFRegion)
+      (JNIEnv *env, jstring str, jsize start, jsize len, char *buf);
+
+    void * (JNICALL *GetPrimitiveArrayCritical)
+      (JNIEnv *env, jarray array, jboolean *isCopy);
+    void (JNICALL *ReleasePrimitiveArrayCritical)
+      (JNIEnv *env, jarray array, void *carray, jint mode);
+
+    const jchar * (JNICALL *GetStringCritical)
+      (JNIEnv *env, jstring string, jboolean *isCopy);
+    void (JNICALL *ReleaseStringCritical)
+      (JNIEnv *env, jstring string, const jchar *cstring);
+
+    jweak (JNICALL *NewWeakGlobalRef)
+       (JNIEnv *env, jobject obj);
+    void (JNICALL *DeleteWeakGlobalRef)
+       (JNIEnv *env, jweak ref);
+
+    jboolean (JNICALL *ExceptionCheck)
+       (JNIEnv *env);
+
+    jobject (JNICALL *NewDirectByteBuffer)
+       (JNIEnv* env, void* address, jlong capacity);
+    void* (JNICALL *GetDirectBufferAddress)
+       (JNIEnv* env, jobject buf);
+    jlong (JNICALL *GetDirectBufferCapacity)
+       (JNIEnv* env, jobject buf);
 };
 
 /*
@@ -722,8 +769,6 @@
 
 struct JNIEnv_ {
     const struct JNINativeInterface_ *functions;
-    void *reserved0;
-    void *reserved1[6];
 #ifdef __cplusplus
 
     jint GetVersion() {
@@ -736,6 +781,17 @@
     jclass FindClass(const char *name) {
         return functions->FindClass(this, name);
     }
+    jmethodID FromReflectedMethod(jobject method) {
+        return functions->FromReflectedMethod(this,method);
+    }
+    jfieldID FromReflectedField(jobject field) {
+        return functions->FromReflectedField(this,field);
+    }
+
+    jobject ToReflectedMethod(jclass cls, jmethodID methodID, jboolean isStatic) {
+        return functions->ToReflectedMethod(this, cls, methodID, isStatic);
+    }
+
     jclass GetSuperclass(jclass sub) {
         return functions->GetSuperclass(this, sub);
     }
@@ -743,6 +799,10 @@
         return functions->IsAssignableFrom(this, sub, sup);
     }
 
+    jobject ToReflectedField(jclass cls, jfieldID fieldID, jboolean isStatic) {
+        return functions->ToReflectedField(this,cls,fieldID,isStatic);
+    }
+
     jint Throw(jthrowable obj) {
         return functions->Throw(this, obj);
     }    
@@ -762,6 +822,13 @@
         functions->FatalError(this, msg);
     }
 
+    jint PushLocalFrame(jint capacity) {
+        return functions->PushLocalFrame(this,capacity);
+    }
+    jobject PopLocalFrame(jobject result) {
+        return functions->PopLocalFrame(this,result);
+    }
+
     jobject NewGlobalRef(jobject lobj) {
         return functions->NewGlobalRef(this,lobj);
     }
@@ -776,6 +843,13 @@
         return functions->IsSameObject(this,obj1,obj2);
     }
 
+    jobject NewLocalRef(jobject ref) {
+        return functions->NewLocalRef(this,ref);
+    }
+    jint EnsureLocalCapacity(jint capacity) {
+        return functions->EnsureLocalCapacity(this,capacity);
+    }
+
     jobject AllocObject(jclass clazz) {
         return functions->AllocObject(this,clazz);
     }
@@ -1726,9 +1800,71 @@
         return functions->GetJavaVM(this,vm);
     }
   
+    void GetStringRegion(jstring str, jsize start, jsize len, jchar *buf) {
+        functions->GetStringRegion(this,str,start,len,buf);
+    }
+    void GetStringUTFRegion(jstring str, jsize start, jsize len, char *buf) {
+        functions->GetStringUTFRegion(this,str,start,len,buf);
+    }
+
+    void * GetPrimitiveArrayCritical(jarray array, jboolean *isCopy) {
+        return functions->GetPrimitiveArrayCritical(this,array,isCopy);
+    }
+    void ReleasePrimitiveArrayCritical(jarray array, void *carray, jint mode) {
+        functions->ReleasePrimitiveArrayCritical(this,array,carray,mode);
+    }
+
+    const jchar * GetStringCritical(jstring string, jboolean *isCopy) {
+        return functions->GetStringCritical(this,string,isCopy);
+    }
+    void ReleaseStringCritical(jstring string, const jchar *cstring) {
+        functions->ReleaseStringCritical(this,string,cstring);
+    }
+
+    jweak NewWeakGlobalRef(jobject obj) {
+        return functions->NewWeakGlobalRef(this,obj);
+    }
+    void DeleteWeakGlobalRef(jweak ref) {
+        functions->DeleteWeakGlobalRef(this,ref);
+    }
+
+    jboolean ExceptionCheck() {
+	return functions->ExceptionCheck(this);
+    }
+
+    jobject NewDirectByteBuffer(void* address, jlong capacity) {
+        return functions->NewDirectByteBuffer(this, address, capacity);
+    }
+    void* GetDirectBufferAddress(jobject buf) {
+        return functions->GetDirectBufferAddress(this, buf);
+    }
+    jlong GetDirectBufferCapacity(jobject buf) {
+        return functions->GetDirectBufferCapacity(this, buf);
+    }
+
 #endif /* __cplusplus */
 };
 
+typedef struct JavaVMOption {
+    char *optionString;
+    void *extraInfo;
+} JavaVMOption;
+
+typedef struct JavaVMInitArgs {
+    jint version;
+
+    jint nOptions;
+    JavaVMOption *options;
+    jboolean ignoreUnrecognized;
+} JavaVMInitArgs;
+
+typedef struct JavaVMAttachArgs {
+    jint version;
+
+    char *name;
+    jobject group;
+} JavaVMAttachArgs;
+
 /* These structures will be VM-specific. */
 
 typedef struct JDK1_1InitArgs {
@@ -1745,7 +1881,7 @@
 
     jint (JNICALL *vfprintf)(FILE *fp, const char *format, va_list args);
     void (JNICALL *exit)(jint code);
-    void (JNICALL *abort)();
+    void (JNICALL *abort)(void);
     
     jint enableClassGC;
     jint enableVerboseGC;
@@ -1759,6 +1895,9 @@
     void * __padding; /* C compilers don't allow empty structures. */
 } JDK1_1AttachArgs;
 
+#define JDK1_2
+#define JDK1_4
+
 /* End VM-specific. */
 
 struct JNIInvokeInterface_ {
@@ -1768,39 +1907,63 @@
 
     jint (JNICALL *DestroyJavaVM)(JavaVM *vm);
 
-    jint (JNICALL *AttachCurrentThread)
-      (JavaVM *vm, JNIEnv **penv, void *args);
+    jint (JNICALL *AttachCurrentThread)(JavaVM *vm, void **penv, void *args);
 
     jint (JNICALL *DetachCurrentThread)(JavaVM *vm);
+
+    jint (JNICALL *GetEnv)(JavaVM *vm, void **penv, jint version);
+
+    jint (JNICALL *AttachCurrentThreadAsDaemon)(JavaVM *vm, void **penv, void *args);
 };
 
 struct JavaVM_ {
     const struct JNIInvokeInterface_ *functions;
-    void *reserved0;
-    void *reserved1;
-    void *reserved2;
 #ifdef __cplusplus
 
     jint DestroyJavaVM() {
         return functions->DestroyJavaVM(this);
     }
-    jint AttachCurrentThread(JNIEnv **penv, void *args) {
+    jint AttachCurrentThread(void **penv, void *args) {
         return functions->AttachCurrentThread(this, penv, args);
     }
     jint DetachCurrentThread() {
         return functions->DetachCurrentThread(this);
     }
 
+    jint GetEnv(void **penv, jint version) {
+        return functions->GetEnv(this, penv, version);
+    }
+    jint AttachCurrentThreadAsDaemon(void **penv, void *args) {
+        return functions->AttachCurrentThreadAsDaemon(this, penv, args);
+    }
 #endif
 };
 
-JNI_PUBLIC_API(void) JNI_GetDefaultJavaVMInitArgs(void *);
+#ifdef _JNI_IMPLEMENTATION_
+#define _JNI_IMPORT_OR_EXPORT_ JNIEXPORT
+#else
+#define _JNI_IMPORT_OR_EXPORT_ JNIIMPORT
+#endif
+_JNI_IMPORT_OR_EXPORT_ jint JNICALL
+JNI_GetDefaultJavaVMInitArgs(void *args);
 
-JNI_PUBLIC_API(jint) JNI_CreateJavaVM(JavaVM **, JNIEnv **, void *);
+_JNI_IMPORT_OR_EXPORT_ jint JNICALL
+JNI_CreateJavaVM(JavaVM **pvm, void **penv, void *args);
 
-JNI_PUBLIC_API(jint) JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *);
-JNI_PUBLIC_API(jref) JNI_MakeLocalRef(JNIEnv *pJNIEnv, void *pHObject);
+_JNI_IMPORT_OR_EXPORT_ jint JNICALL
+JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *);
 
+/* Defined by native libraries. */
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM *vm, void *reserved);
+
+JNIEXPORT void JNICALL
+JNI_OnUnload(JavaVM *vm, void *reserved);
+
+#define JNI_VERSION_1_1 0x00010001
+#define JNI_VERSION_1_2 0x00010002
+#define JNI_VERSION_1_4 0x00010004
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
=== sun-java/stubs/include/jni_md.h
==================================================================
--- xulrunner/sun-java/stubs/include/jni_md.h	(revision 134)
+++ xulrunner/sun-java/stubs/include/jni_md.h	(local)
@@ -81,20 +81,8 @@
  ******************************************************************************/
 
 /* DLL Entry modifiers... */
-#if defined(XP_OS2)
-#  ifdef XP_OS2_VACPP
-#     define JNI_PUBLIC_API(ResultType)      ResultType _System
-#     define JNI_PUBLIC_VAR(VarType)         VarType
-#     define JNICALL                         _Optlink
-#     define JNIEXPORT
-#  else
-#     define JNI_PUBLIC_API(ResultType)	   ResultType
-#     define JNI_PUBLIC_VAR(VarType)         VarType
-#     define JNICALL
-#     define JNIEXPORT
-#  endif
 /* Win32 */
-#elif defined(XP_WIN) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
+#if defined(XP_WIN) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
 #	include <windows.h>
 #	if defined(_MSC_VER) || defined(__GNUC__)
 #		if defined(WIN32) || defined(_WIN32)
@@ -135,7 +123,33 @@
 #	endif
 	/*  This is the stuff inherited from JavaSoft .. */
 #	define JNIEXPORT __declspec(dllexport)
+#	define JNIIMPORT __declspec(dllimport)
 
+/* OS/2 */
+#elif defined(XP_OS2)
+#	ifdef XP_OS2_VACPP
+#		define JNI_PUBLIC_API(ResultType)	ResultType _System
+#		define JNI_PUBLIC_VAR(VarType)		VarType
+#		define JNICALL				_Optlink
+#		define JNIEXPORT
+#		define JNIIMPORT
+#	elif defined(__declspec)
+#		define JNI_PUBLIC_API(ResultType)	__declspec(dllexport) ResultType
+#		define JNI_PUBLIC_VAR(VarType)		VarType
+#		define JNI_NATIVE_STUB(ResultType)	__declspec(dllexport) ResultType
+#		define JNICALL
+#		define JNIEXPORT
+#		define JNIIMPORT
+#	else
+#		define JNI_PUBLIC_API(ResultType)	ResultType
+#		define JNI_PUBLIC_VAR(VarType)		VarType
+#		define JNICALL
+#		define JNIEXPORT
+#		define JNIIMPORT
+#	endif
+#	ifndef IS_LITTLE_ENDIAN
+#		define IS_LITTLE_ENDIAN
+#	endif
 
 /* Mac */
 #elif macintosh || Macintosh || THINK_C
@@ -161,6 +175,7 @@
 #	define JNICALL
 	/*  This is the stuff inherited from JavaSoft .. */
 #	define JNIEXPORT
+#	define JNIIMPORT
 
 /* Unix or else */
 #else
@@ -170,6 +185,7 @@
 #	define JNICALL
 	/*  This is the stuff inherited from JavaSoft .. */
 #	define JNIEXPORT
+#	define JNIIMPORT
 #endif
 
 #ifndef FAR		/* for non-Win16 */



1.1                  src/patchsets/xulrunner/1.8.1.10/115_pyxpcom_deadcode.patch

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

Index: 115_pyxpcom_deadcode.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 115_pyxpcom_deadcode.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove pyxpcom dead code and fix FTBFS on alpha this way. Closes: 
## DP: #381662. bz#347865

@DPATCH@

=== extensions/python/xpcom/src/PyGBase.cpp
==================================================================
--- xulrunner/extensions/python/xpcom/src/PyGBase.cpp	(revision 107)
+++ xulrunner/extensions/python/xpcom/src/PyGBase.cpp	(local)
@@ -595,101 +595,6 @@
 	return nr == NS_OK ? NS_OK : HandleNativeGatewayError(szMethodName);
 }
 
-nsresult PyG_Base::InvokeNativeGetViaPolicy(
-	const char *szPropertyName,
-	PyObject **ppResult /* = NULL */
-	)
-{
-	PyObject *ob_ret = NULL;
-	nsresult ret = NS_OK;
-	PyObject *real_ob = NULL;
-	if ( m_pPyObject == NULL || szPropertyName == NULL )
-		return NS_ERROR_NULL_POINTER;
-	// First see if we have a method of that name.
-	char buf[256];
-	strcpy(buf, "get_");
-	strncat(buf, szPropertyName, sizeof(buf)*sizeof(buf[0])-strlen(buf)-1);
-	buf[sizeof(buf)/sizeof(buf[0])-1] = '\0';
-	ret = InvokeNativeViaPolicyInternal(buf, ppResult, nsnull, nsnull);
-	if (ret == NS_PYXPCOM_NO_SUCH_METHOD) {
-		// No method of that name - just try a property.
-		// Bit to a hack here to maintain the use of a policy.
-		// We actually get the policies underlying object
-		// to make the call on.
-		real_ob = PyObject_GetAttrString(m_pPyObject, "_obj_");
-		if (real_ob == NULL) {
-			PyErr_Format(PyExc_AttributeError, "The policy object does not have an '_obj_' attribute.");
-			ret = HandleNativeGatewayError(szPropertyName);
-			goto done;
-		}
-		ob_ret = PyObject_GetAttrString(real_ob, (char *)szPropertyName);
-		if (ob_ret==NULL) {
-			PyErr_Format(PyExc_AttributeError, 
-				     "The object does not have a 'get_%s' function, or a '%s attribute.", 
-				     szPropertyName, szPropertyName);
-		} else {
-			ret = NS_OK;
-			if (ppResult)
-				*ppResult = ob_ret;
-			else
-				Py_XDECREF(ob_ret);
-		}
-	}
-	if (ret != NS_OK)
-		ret = HandleNativeGatewayError(szPropertyName);
-
-done:
-	Py_XDECREF(real_ob);
-	return ret;
-}
-
-nsresult PyG_Base::InvokeNativeSetViaPolicy(
-	const char *szPropertyName,
-	...
-	)
-{
-	if ( m_pPyObject == NULL || szPropertyName == NULL )
-		return NS_ERROR_NULL_POINTER;
-	nsresult ret = NS_OK;
-	PyObject *real_ob = NULL;
-	char buf[256];
-	strcpy(buf, "set_");
-	strncat(buf, szPropertyName, sizeof(buf)*sizeof(buf[0])-strlen(buf)-1);
-	buf[sizeof(buf)/sizeof(buf[0])-1] = '\0';
-	va_list va;
-	va_start(va, szPropertyName);
-	ret = InvokeNativeViaPolicyInternal(buf, NULL, "O", va);
-	va_end(va);
-	if (ret == NS_PYXPCOM_NO_SUCH_METHOD) {
-		// No method of that name - just try a property.
-		// Bit to a hack here to maintain the use of a policy.
-		// We actually get the policies underlying object
-		// to make the call on.
-		real_ob = PyObject_GetAttrString(m_pPyObject, "_obj_");
-		if (real_ob == NULL) {
-			PyErr_Format(PyExc_AttributeError, "The policy object does not have an '_obj_' attribute.");
-			ret = HandleNativeGatewayError(szPropertyName);
-			goto done;
-		}
-		va_list va2;
-		va_start(va2, szPropertyName);
-		PyObject *arg = va_arg( va2, PyObject *);
-		va_end(va2);
-		if (PyObject_SetAttrString(real_ob, (char *)szPropertyName, arg) == 0)
-			ret = NS_OK;
-		else {
-			PyErr_Format(PyExc_AttributeError, 
-				     "The object does not have a 'set_%s' function, or a '%s attribute.", 
-				     szPropertyName, szPropertyName);
-		}
-	}
-	if (ret != NS_OK)
-		ret = HandleNativeGatewayError(szPropertyName);
-done:
-	Py_XDECREF(real_ob);
-	return ret;
-}
-
 // Get at the underlying Python object.
 PyObject *PyG_Base::UnwrapPythonObject(void)
 {
=== extensions/python/xpcom/src/PyXPCOM.h
==================================================================
--- xulrunner/extensions/python/xpcom/src/PyXPCOM.h	(revision 107)
+++ xulrunner/extensions/python/xpcom/src/PyXPCOM.h	(local)
@@ -416,11 +416,6 @@
 			PyObject **ppResult,
 			const char *szFormat,
 			va_list va);
-	nsresult InvokeNativeGetViaPolicy(const char *szPropertyName,
-			PyObject **ppResult = NULL
-			);
-	nsresult InvokeNativeSetViaPolicy(const char *szPropertyName,
-			...);
 };
 
 class PYXPCOM_EXPORT PyXPCOM_XPTStub : public PyG_Base, public nsXPTCStubBase



1.1                  src/patchsets/xulrunner/1.8.1.10/120_about:plugins.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/120_about:plugins.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/120_about:plugins.patch?rev=1.1&content-type=text/plain

Index: 120_about:plugins.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 120_about:plugins.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Install the files for about:plugins. bz#328678

@DPATCH@

=== toolkit/content/jar.mn
==================================================================
--- toolkit/content/jar.mn.orig	2007-03-17 23:09:53.000000000 +0100
+++ toolkit/content/jar.mn	2007-03-17 23:10:19.000000000 +0100
@@ -51,6 +51,7 @@
    content/global/bindings/autoscroll_all.png  (widgets/autoscroll_all.png)
    content/global/bindings/autoscroll_h.png    (widgets/autoscroll_h.png)
    content/global/bindings/autoscroll_v.png    (widgets/autoscroll_v.png)
+   content/global/plugins.html                 (../../xpfe/global/resources/content/plugins.html)
 #ifdef XP_MACOSX
 *  content/global/macWindowMenu.js             (macWindowMenu.js)
 #endif
=== toolkit/themes/winstripe/global/jar.mn
==================================================================
--- toolkit/themes/winstripe/global/jar.mn.orig	2007-03-17 23:12:29.000000000 +0100
+++ toolkit/themes/winstripe/global/jar.mn	2007-03-17 23:15:04.000000000 +0100
@@ -39,6 +39,7 @@
         skin/classic/global/toolbarbutton.css
         skin/classic/global/tree.css
         skin/classic/global/wizard.css
+	skin/classic/global/plugins.css                             (../../../../themes/classic/global/plugins.css)
         skin/classic/global/arrow/arrow-dn.gif                      (arrow/arrow-dn.gif)
         skin/classic/global/arrow/arrow-dn-dis.gif                  (arrow/arrow-dn-dis.gif)
         skin/classic/global/arrow/arrow-dn-hov.gif                  (arrow/arrow-dn-hov.gif)



1.1                  src/patchsets/xulrunner/1.8.1.10/125_gnome_helpers_with_params.patch

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

Index: 125_gnome_helpers_with_params.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 125_gnome_helpers_with_params.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Make helper applications with parameters work. Adapted patch from 
## DP: bz#273524

@DPATCH@

=== uriloader/exthandler/Makefile.in
==================================================================
--- xulrunner/uriloader/exthandler/Makefile.in	(revision 116)
+++ xulrunner/uriloader/exthandler/Makefile.in	(local)
@@ -102,7 +102,7 @@
 LOCAL_INCLUDES = -I$(srcdir)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-OSHELPER	+= nsGNOMERegistry.cpp
+OSHELPER	+= nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
=== uriloader/exthandler/unix/nsGNOMERegistry.cpp
==================================================================
--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp	(revision 116)
+++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp	(local)
@@ -42,7 +42,7 @@
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsILocalFile.h"
-#include "nsMIMEInfoImpl.h"
+#include "nsMIMEInfoUnix.h"
 #include "nsAutoPtr.h"
 
 #include <glib.h>
@@ -56,12 +56,12 @@
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;
 
-typedef struct {
+struct GnomeVFSMimeApplication {
   char *id;
   char *name;
   char *command;
   /* there is more here, but we don't need it */
-} GnomeVFSMimeApplication;
+};
 
 typedef GConfClient * (*_gconf_client_get_default_fn)();
 typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
@@ -264,7 +264,7 @@
 }
 
 
-/* static */ already_AddRefed<nsMIMEInfoBase>
+/* static */ already_AddRefed<nsMIMEInfoUnix>
 nsGNOMERegistry::GetFromExtension(const char *aFileExt)
 {
   if (!gconfLib)
@@ -286,7 +286,7 @@
   return GetFromType(mimeType);
 }
 
-/* static */ already_AddRefed<nsMIMEInfoBase>
+/* static */ already_AddRefed<nsMIMEInfoUnix>
 nsGNOMERegistry::GetFromType(const char *aMIMEType)
 {
   if (!gconfLib)
@@ -296,7 +296,7 @@
   if (!handlerApp)
     return nsnull;
 
-  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
+  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
   NS_ENSURE_TRUE(mimeInfo, nsnull);
 
   // Get the list of extensions and append then to the mimeInfo.
@@ -320,11 +320,21 @@
     return nsnull;
   }
 
-  gchar *commandPath = g_find_program_in_path(nativeCommand);
+  gchar **argv;
+  gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
+  if (!res) {
+    NS_ERROR("Could not convert helper app command to filesystem encoding");
+    _gnome_vfs_mime_application_free(handlerApp);
+    return nsnull;
+  }
 
+  gchar *commandPath = g_find_program_in_path(argv[0]);
+
   g_free(nativeCommand);
+  g_strfreev(argv);
 
   if (!commandPath) {
+    NS_WARNING("could not find command in path");
     _gnome_vfs_mime_application_free(handlerApp);
     return nsnull;
   }
@@ -342,7 +352,7 @@
 
   _gnome_vfs_mime_application_free(handlerApp);
 
-  nsMIMEInfoBase* retval;
+  nsMIMEInfoUnix* retval;
   NS_ADDREF((retval = mimeInfo));
   return retval;
 }
=== uriloader/exthandler/unix/nsGNOMERegistry.h
==================================================================
--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h	(revision 116)
+++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h	(local)
@@ -35,10 +35,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifndef nsGNOMERegistry_h__
+#define nsGNOMERegistry_h__
+
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 
-class nsMIMEInfoBase;
+class nsMIMEInfoUnix;
 
 class nsGNOMERegistry
 {
@@ -52,7 +55,9 @@
   static void GetAppDescForScheme(const nsACString& aScheme,
                                   nsAString& aDesc);
 
-  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt);
+  static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt);
 
-  static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType);
+  static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType);
 };
+
+#endif // nsGNOMERegistry_h__
=== uriloader/exthandler/unix/nsOSHelperAppService.cpp
==================================================================
--- xulrunner/uriloader/exthandler/unix/nsOSHelperAppService.cpp	(revision 175)
+++ xulrunner/uriloader/exthandler/unix/nsOSHelperAppService.cpp	(local)
@@ -44,11 +44,13 @@
 #include "nsOSHelperAppService.h"
 #ifdef MOZ_WIDGET_GTK2
 #include "nsGNOMERegistry.h"
+#include "nsMIMEInfoUnix.h"
 #endif
 #include "nsISupports.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
+#include "nsIStringEnumerator.h"
 #include "nsXPIDLString.h"
 #include "nsIURL.h"
 #include "nsIFileStreams.h"
@@ -1486,6 +1488,22 @@
   
   LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get()));
 
+#ifdef MOZ_WIDGET_GTK2
+  // Look in GNOME registry first since it is the preferred method in GNOME,
+  // should trump the mailcap entry
+  LOG(("Looking in GNOME registry\n"));
+  nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
+  if (gnomeInfo) {
+    LOG(("Got MIMEInfo from GNOME registry\n"));
+    nsCOMPtr<nsIUTF8StringEnumerator> extensions;
+    gnomeInfo->GetFileExtensions(getter_AddRefs(extensions));
+    PRBool hasMore;
+    extensions->HasMore(&hasMore);
+    if (hasMore)
+      return gnomeInfo;
+  }
+#endif
+
   // extract the major and minor types
   NS_ConvertASCIItoUTF16 mimeType(aMIMEType);
   nsAString::const_iterator start_iter, end_iter,
@@ -1521,21 +1539,6 @@
           NS_LossyConvertUTF16toASCII(handler).get(),
           NS_LossyConvertUTF16toASCII(mailcap_description).get()));
 
-#ifdef MOZ_WIDGET_GTK2
-  nsMIMEInfoBase *gnomeInfo = nsnull;
-  if (handler.IsEmpty()) {
-    // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
-    // GNOME versions no longer have type-to-extension mappings, so we might
-    // get back a MIMEInfo without any extensions set.  In that case we'll have
-    // to look in our mime.types files for the extensions.    
-    LOG(("Looking in GNOME registry\n"));
-    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
-    if (gnomeInfo && gnomeInfo->HasExtensions()) {
-      LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
-      return gnomeInfo;
-    }
-  }
-#endif
 
   // Now look up our extensions
   nsAutoString extensions, mime_types_description;
=== uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
==================================================================
--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	(revision 116)
+++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	(local)
@@ -0,0 +1,196 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Christopher Aillon <caillon@××××××.com> (Original author)
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMIMEInfoUnix.h"
+#include "prlink.h"
+#include "prmem.h"
+#include <glib.h>
+#include <glib-object.h>
+
+static PRLibrary *gnomeLib;
+static PRLibrary *vfsLib;
+
+typedef struct _GnomeProgram GnomeProgram;
+typedef struct _GnomeModuleInfo GnomeModuleInfo;
+
+typedef enum {
+  GNOME_VFS_OK // there's more but we don't care about them.
+} GnomeVFSResult;
+
+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
+                              (GnomeVFSMimeApplication *app,
+                               GList *uris);
+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *);
+typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
+						 const GnomeModuleInfo *, int,
+						 char **, const char *, ...);
+typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
+typedef GnomeProgram * (*_gnome_program_get_fn)();
+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
+
+#define DECL_FUNC_PTR(func) static _##func##_fn _##func
+
+DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
+DECL_FUNC_PTR(gnome_vfs_mime_application_free);
+DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
+DECL_FUNC_PTR(gnome_program_init);
+DECL_FUNC_PTR(gnome_program_get);
+DECL_FUNC_PTR(libgnome_module_info_get);
+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
+
+static PRLibrary *
+LoadVersionedLibrary(const char* libName, const char* libVersion)
+{
+  char *platformLibName = PR_GetLibraryName(nsnull, libName);
+  nsCAutoString versionLibName(platformLibName);
+  versionLibName.Append(libVersion);
+  PR_Free(platformLibName);
+  return PR_LoadLibrary(versionLibName.get());
+}
+
+static void
+Cleanup()
+{
+  // Unload all libraries
+  if (gnomeLib)
+    PR_UnloadLibrary(gnomeLib);
+  if (vfsLib)
+    PR_UnloadLibrary(vfsLib);
+
+  gnomeLib = vfsLib = nsnull;
+}
+
+static void
+InitGnomeVFS()
+{
+  static PRBool initialized = PR_FALSE;
+
+  if (initialized)
+    return;
+
+  #define ENSURE_LIB(lib) \
+    PR_BEGIN_MACRO \
+    if (!lib) { \
+      Cleanup(); \
+      return; \
+    } \
+    PR_END_MACRO
+
+  #define GET_LIB_FUNCTION(lib, func, failure) \
+    PR_BEGIN_MACRO \
+    _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
+    if (!_##func) { \
+      failure; \
+    } \
+    PR_END_MACRO
+
+  // Attempt to open libgnome
+  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
+  ENSURE_LIB(gnomeLib);
+
+  GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
+  GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
+  GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
+
+  // Attempt to open libgnomevfs
+  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
+  ENSURE_LIB(vfsLib);
+
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */);
+  GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
+
+  // Initialize GNOME, if it's not already initialized.  It's not
+  // necessary to tell GNOME about our actual command line arguments.
+
+  if (!_gnome_program_get()) {
+    char *argv[1] = { "gecko" };
+    _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
+                        1, argv, NULL);
+  }
+
+  // Note: after GNOME has been initialized, do not ever unload these
+  // libraries.  They register atexit handlers, so if they are unloaded, we'll
+  // crash on exit.  
+}
+
+void
+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app)
+{
+  if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) {
+    mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
+
+    mPreferredAction = nsIMIMEInfo::useSystemDefault;
+
+    const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
+    if (name) 
+      mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
+  }
+}
+
+nsMIMEInfoUnix::~nsMIMEInfoUnix()
+{
+  if (mDefaultVFSApplication)
+    _gnome_vfs_mime_application_free(mDefaultVFSApplication);
+}
+
+nsresult
+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
+{
+  NS_ENSURE_ARG_POINTER(aFile);
+
+  InitGnomeVFS();
+
+  if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
+    nsCAutoString nativePath;
+    aFile->GetNativePath(nativePath);
+
+    gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
+
+    GList *uris = NULL;
+    uris = g_list_append(uris, uri);
+
+    GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
+
+    g_free(uri);
+    g_list_free(uris);
+
+    if (result != GNOME_VFS_OK)
+      return NS_ERROR_FAILURE;
+
+    return NS_OK;
+  }
+
+  if (!mDefaultApplication)
+    return NS_ERROR_FILE_NOT_FOUND;
+
+  return LaunchWithIProcess(mDefaultApplication, aFile);
+}
=== uriloader/exthandler/unix/nsMIMEInfoUnix.h
==================================================================
--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h	(revision 116)
+++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h	(local)
@@ -0,0 +1,48 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Christopher Aillon <caillon@××××××.com> (Original author)
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsMimeInfoUnix_h__
+#define nsMimeInfoUnix_h__
+
+#include "nsMIMEInfoImpl.h"
+
+struct GnomeVFSMimeApplication;
+
+class nsMIMEInfoUnix : public nsMIMEInfoImpl
+{
+public:
+  nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {}
+  virtual ~nsMIMEInfoUnix();
+
+  void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
+
+protected:
+  virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
+
+  GnomeVFSMimeApplication *mDefaultVFSApplication;
+};
+ 
+#endif // nsMimeInfoUnix_h__



1.1                  src/patchsets/xulrunner/1.8.1.10/125_xpidl.patch

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

Index: 125_xpidl.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 125_xpidl.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix crash when no file is given on the command line.
## DP: Fix the error message about extra arguments given showing before
## DP: the crash. bz#331818.

@DPATCH@

=== xpcom/typelib/xpidl/xpidl.c
==================================================================
--- xulrunner/xpcom/typelib/xpidl/xpidl.c	(revision 62)
+++ xulrunner/xpcom/typelib/xpidl/xpidl.c	(local)
@@ -260,7 +260,7 @@
         xpidl_usage(argc, argv);
         return 1;
     }
-    if (argc != i + 1) {
+    if (argc > i + 1) {
         fprintf(stderr, "ERROR: extra arguments after input file\n");
     }
 
@@ -268,7 +268,9 @@
      * Don't try to process multiple files, given that we don't handle -o
      * multiply.
      */
-    if (xpidl_process_idl(argv[i], inc_head, file_basename, mode))
+    if (i >= argc)
+        fprintf(stderr, "ERROR: no file to process\n");
+    else if (xpidl_process_idl(argv[i], inc_head, file_basename, mode))
         return 0;
 
     return 1;



1.1                  src/patchsets/xulrunner/1.8.1.10/125_xrender_bug_workaround.patch

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

Index: 125_xrender_bug_workaround.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 125_xrender_bug_workaround.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch to work around a bug in XRender. bz#252033
## DP: Ultimately, the rendering is going to be done by cairo, so the bug
## DP: will disappear by itself when the gtk gfx engine will stop being used.

@DPATCH@

=== gfx/src/gtk/nsFontMetricsXft.cpp
==================================================================
--- xulrunner/gfx/src/gtk/nsFontMetricsXft.cpp	(revision 22)
+++ xulrunner/gfx/src/gtk/nsFontMetricsXft.cpp	(local)
@@ -2188,19 +2188,27 @@
 nsAutoDrawSpecBuffer::Flush()
 {
     if (mSpecPos) {
-        // Some Xft libraries will crash if none of the glyphs have any
-        // area.  So before we draw, we scan through the glyphs.  If we
-        // find any that have area, we can draw.
-        for (PRUint32 i = 0; i < mSpecPos; i++) {
-            XftGlyphFontSpec *sp = &mSpecBuffer[i];
-            XGlyphInfo info;
-            XftGlyphExtents(GDK_DISPLAY(), sp->font, &sp->glyph, 1, &info);
-            if (info.width && info.height) {
-                // If we get here it means we found a drawable glyph.  We will
-                // Draw all the remaining glyphs and then break out of the loop
-                XftDrawGlyphFontSpec(mDraw, mColor, mSpecBuffer+i, mSpecPos-i);
-                break;
+        // There are two Xft problems to work around here:
+        // 1.  Some Xft libraries reportedly crash if none of the
+        //     glyphs have any area.
+        // 2.  Because of an apparent X server bug (see bug 252033),
+        //     a glyph with no area may cause all following glyphs to be
+        //     dropped under some circumstances.
+        // For this reason, we manually ship out blocks of glyphs with
+        // area and skip blocks of glyphs with no area.
+        PRUint32 start = 0;
+        while (start < mSpecPos) {
+            PRUint32 i;
+            for (i = start; i < mSpecPos; i++) {
+                XftGlyphFontSpec *sp = &mSpecBuffer[i];
+                XGlyphInfo info;
+                XftGlyphExtents(GDK_DISPLAY(), sp->font, &sp->glyph, 1, &info);
+                if (!info.width || !info.height)
+                    break;
             }
+            if (i > start)
+                XftDrawGlyphFontSpec(mDraw, mColor, mSpecBuffer+start, i-start);
+            start = i + 1;
         }
         mSpecPos = 0;
     }



1.1                  src/patchsets/xulrunner/1.8.1.10/130_embedding_tests.patch

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

Index: 130_embedding_tests.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 130_embedding_tests.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: embedding tests. bz#93213

@DPATCH@

Index: configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503
diff -u -r1.1503 configure.in
--- xulrunner/configure.in	9 Aug 2005 07:41:30 -0000	1.1503
+++ xulrunner/configure.in	30 Aug 2005 08:09:43 -0000
@@ -5152,6 +5152,19 @@
     ENABLE_TESTS=,
     ENABLE_TESTS=1 )
 
+
+dnl ========================================================
+dnl you can enable some tests even if tests are disabled by
+dnl previous option
+dnl ========================================================
+ENABLE_EMBEDDING_TESTS=$ENABLE_TESTS
+MOZ_ARG_ENABLE_BOOL(embedding-tests,
+[  --enable-embedding-tests
+                           Do build embedding tests libraries & programs,
+                           even if tests are disabled],
+    ENABLE_EMBEDDING_TESTS=1,
+    ENABLE_EMBEDDING_TESTS= )
+
 dnl ========================================================
 dnl =
 dnl = Module specific options
@@ -6703,6 +6716,7 @@
 AC_SUBST(MOZ_STATIC_COMPONENT_LIBS)
 AC_SUBST(MOZ_ENABLE_LIBXUL)
 AC_SUBST(ENABLE_TESTS)
+AC_SUBST(ENABLE_EMBEDDING_TESTS)
 AC_SUBST(IBMBIDI)
 AC_SUBST(SUNCTL)
 AC_SUBST(ACCESSIBILITY)
Index: config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.363
diff -u -r3.363 autoconf.mk.in
--- xulrunner/config/autoconf.mk.in	5 Aug 2005 17:09:41 -0000	3.363
+++ xulrunner/config/autoconf.mk.in	30 Aug 2005 08:09:44 -0000
@@ -106,6 +106,7 @@
 MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@
 MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@
 ENABLE_TESTS	= @ENABLE_TESTS@
+ENABLE_EMBEDDING_TESTS	= @ENABLE_EMBEDDING_TESTS@
 IBMBIDI = @IBMBIDI@
 SUNCTL = @SUNCTL@
 ACCESSIBILITY = @ACCESSIBILITY@
Index: embedding/browser/gtk/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/embedding/browser/gtk/Makefile.in,v
retrieving revision 1.8
diff -u -r1.8 Makefile.in
--- xulrunner/embedding/browser/gtk/Makefile.in	18 Apr 2004 22:00:31 -0000	1.8
+++ xulrunner/embedding/browser/gtk/Makefile.in	30 Aug 2005 08:09:50 -0000
@@ -44,7 +44,10 @@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gtkembedmoz
-DIRS=src tests
+DIRS		= src
+ifdef ENABLE_EMBEDDING_TESTS
+DIRS		+= tests
+endif
 
 PACKAGE_FILE = gtkembed.pkg
 
Index: embedding/browser/gtk/gtkembed.pkg
===================================================================
RCS file: /cvsroot/mozilla/embedding/browser/gtk/gtkembed.pkg,v
retrieving revision 1.2
diff -u -r1.2 gtkembed.pkg
--- xulrunner/embedding/browser/gtk/gtkembed.pkg	7 Jan 2004 01:21:23 -0000	1.2
+++ xulrunner/embedding/browser/gtk/gtkembed.pkg	30 Aug 2005 08:09:50 -0000
@@ -1,6 +1,8 @@
 [gtkembed]
 dist/bin/@DLLP@gtkembedmoz@DLLS@
+#if ENABLE_EMBEDDING_TESTS
 dist/bin/TestGtkEmbed
+#endif
 
 #if ENABLE_TESTS
 dist/bin/TestGtkEmbedNotebook@BINS@



1.1                  src/patchsets/xulrunner/1.8.1.10/130_killAll.patch

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

Index: 130_killAll.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 130_killAll.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correctly install the killAll component. bz#333289.

@DPATCH@

=== xpfe/components/killAll/Makefile.in
==================================================================
--- xulrunner/xpfe/components/killAll/Makefile.in	(revision 69)
+++ xulrunner/xpfe/components/killAll/Makefile.in	(local)
@@ -42,11 +42,10 @@
 
 include $(DEPTH)/config/autoconf.mk
 
+EXTRA_COMPONENTS = nsKillAll.js
+
 include $(topsrcdir)/config/rules.mk
 
-libs::
-	$(INSTALL) $(srcdir)/nsKillAll.js $(DIST)/bin/components
-
 clean::
 	rm -f $(DIST)/bin/components/nsKillAll.js
 



1.1                  src/patchsets/xulrunner/1.8.1.10/131_system_bz2.patch

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

Index: 131_system_bz2.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 131_system_bz2.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: use system bz2. bz#305782.

@DPATCH@

=== Makefile.in
==================================================================
--- xulrunner/Makefile.in	(revision 10)
+++ xulrunner/Makefile.in	(local)
@@ -126,7 +126,9 @@
 endif
 
 ifdef MOZ_UPDATER
+ifndef MOZ_NATIVE_BZ2
 tier_1_dirs += modules/libbz2
+endif
 tier_1_dirs += modules/libmar
 endif
 
=== config/autoconf.mk.in
==================================================================
--- xulrunner/config/autoconf.mk.in	(revision 10)
+++ xulrunner/config/autoconf.mk.in	(local)
@@ -181,6 +181,7 @@
 NECKO_COOKIES = @NECKO_COOKIES@
 
 MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
+MOZ_NATIVE_BZ2	= @SYSTEM_BZ2@
 MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
 MOZ_NATIVE_PNG	= @SYSTEM_PNG@
 MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
@@ -370,6 +371,14 @@
 ZLIB_REQUIRES	= zlib
 endif
 
+MOZ_BZ2_CFLAGS	= @MOZ_BZ2_CFLAGS@
+MOZ_BZ2_LIBS	= @MOZ_BZ2_LIBS@
+ifdef MOZ_NATIVE_BZ2
+BZ2_REQUIRES	=
+else
+BZ2_REQUIRES	= libbz2
+endif
+
 ifdef MOZ_NATIVE_PNG
 PNG_CFLAGS	= @PNG_CFLAGS@
 PNG_LIBS	= @PNG_LIBS@
=== configure.in
==================================================================
--- xulrunner/configure.in	(revision 10)
+++ xulrunner/configure.in	(local)
@@ -732,6 +732,8 @@
 MOZ_JPEG_LIBS='-L$(DIST)/lib -lmozjpeg'
 MOZ_ZLIB_CFLAGS=
 MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz'
+MOZ_BZ2_CFLAGS=
+MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2'
 MOZ_PNG_CFLAGS=
 MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng'
 
@@ -1524,6 +1526,7 @@
     MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib'
     MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib'
     MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib'
+    MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib'
     OBJ_SUFFIX=obj
     RANLIB='echo not_ranlib'
     STRIP='echo not_strip'
@@ -1579,6 +1582,7 @@
         RCFLAGS='-O coff --use-temp-file'
         MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg$(MOZ_BITS)$(VERSION_NUMBER)'
         MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz'
+        MOZ_BZ2_LIBS='-L$(DIST)/lib -lbz2'
         MOZ_PNG_LIBS='-L$(DIST)/lib -lpng'
         MOZ_JS_LIBS='-L$(DIST)/lib -ljs$(MOZ_BITS)$(VERSION_NUMBER)'
         MOZ_FIX_LINK_PATHS=
@@ -1618,6 +1622,7 @@
     	MOZ_OPTIMIZE_FLAGS='-O1'
         MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib'
         MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib'
+        MOZ_BZ2_LIBS='$(DIST)/lib/bz2.lib'
         MOZ_PNG_LIBS='$(DIST)/lib/png.lib'
         MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib'
         MOZ_FIX_LINK_PATHS=
@@ -1923,6 +1928,7 @@
         LIBXUL_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xul.lib'
         MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)'
         MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)'
+        MOZ_BZ2_LIBS='$(DIST)/lib/bz2.$(LIB_SUFFIX)'
         MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)'
         MOZ_WIDGET_TOOLKIT_LDFLAGS='$(DIST)/lib/wdgt$(MOZ_WIDGET_TOOLKIT)'
         MOZ_GFX_TOOLKIT_LDFLAGS='$(DIST)/lib/gfx_$(MOZ_GFX_TOOLKIT)'
@@ -3569,6 +3575,35 @@
     ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
 fi
 
+dnl system BZIP2 Support
+dnl ========================================================
+MOZ_ARG_WITH_STRING(system-bz2,
+[  --with-system-bz2[=PFX]
+                          Use system libbz2 [installed at prefix PFX]],
+    BZ2_DIR=$withval)
+
+_SAVE_CFLAGS=$CFLAGS
+_SAVE_LDFLAGS=$LDFLAGS
+_SAVE_LIBS=$LIBS
+if test -n "${BZ2_DIR}" -a "${BZ2_DIR}" != "yes"; then
+    CFLAGS="-I${BZ2_DIR}/include $CFLAGS"
+    LDFLAGS="-L${BZ2_DIR}/lib $LDFLAGS"
+fi
+if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then
+    SYSTEM_BZ2=
+else
+    AC_CHECK_LIB(bz2, BZ2_bzread, [SYSTEM_BZ2=1 MOZ_BZ2_LIBS="-lbz2"], 
+	[SYSTEM_BZ2= MOZ_BZ2_CFLAGS= MOZ_BZ2_LIBS=], $MOZ_BZ2_LIBS)
+fi
+CFLAGS=$_SAVE_CFLAGS
+LDFLAGS=$_SAVE_LDFLAGS
+LIBS=$_SAVE_LIBS
+
+if test "${BZ2_DIR}" -a -d "${BZ2_DIR}" -a "$SYSTEM_BZ2" = 1; then
+    MOZ_BZ2_CFLAGS="-I${BZ2_DIR}/include"
+    MOZ_BZ2_LIBS="-L${BZ2_DIR}/lib ${MOZ_BZ2_LIBS}"
+fi
+
 dnl system PNG Support
 dnl ========================================================
 MOZ_ARG_WITH_STRING(system-png, 
@@ -6679,6 +6714,7 @@
 AC_SUBST(SYSTEM_JPEG)
 AC_SUBST(SYSTEM_PNG)
 AC_SUBST(SYSTEM_ZLIB)
+AC_SUBST(SYSTEM_BZ2)
 
 AC_SUBST(JPEG_CFLAGS)
 AC_SUBST(JPEG_LIBS)
@@ -6691,6 +6727,8 @@
 AC_SUBST(MOZ_JPEG_LIBS)
 AC_SUBST(MOZ_ZLIB_CFLAGS)
 AC_SUBST(MOZ_ZLIB_LIBS)
+AC_SUBST(MOZ_BZ2_CFLAGS)
+AC_SUBST(MOZ_BZ2_LIBS)
 AC_SUBST(MOZ_PNG_CFLAGS)
 AC_SUBST(MOZ_PNG_LIBS)
 
=== toolkit/mozapps/update/src/updater/Makefile.in
==================================================================
--- xulrunner/toolkit/mozapps/update/src/updater/Makefile.in	(revision 10)
+++ xulrunner/toolkit/mozapps/update/src/updater/Makefile.in	(local)
@@ -52,11 +52,11 @@
 
 PROGRAM = updater$(BIN_SUFFIX)
 
-REQUIRES = libmar libbz2
+REQUIRES = libmar \
+	   $(BZ2_REQUIRES)
 
 LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
@@ -118,3 +118,6 @@
 # Pick up nsWindowsRestart.cpp
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
+
+CXXFLAGS += $(MOZ_BZ2_CFLAGS)
+EXTRA_LIBS += $(MOZ_BZ2_LIBS)
=== toolkit/mozapps/update/src/updater/updater.cpp
==================================================================
--- xulrunner/toolkit/mozapps/update/src/updater/updater.cpp	(revision 10)
+++ xulrunner/toolkit/mozapps/update/src/updater/updater.cpp	(local)
@@ -52,6 +52,7 @@
 #include "archivereader.h"
 #include "errors.h"
 #include "bzlib.h"
+#include "nscore.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -121,7 +122,7 @@
 
 // This variable lives in libbz2.  It's declared in bzlib_private.h, so we just
 // declare it here to avoid including that entire header file.
-extern "C" unsigned int BZ2_crc32Table[256];
+extern "C" NS_IMPORT_(unsigned int) BZ2_crc32Table[256];
 
 static unsigned int
 crc32(const unsigned char *buf, unsigned int len)



1.1                  src/patchsets/xulrunner/1.8.1.10/135_gtkmozembed_change_toplevel.patch

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

Index: 135_gtkmozembed_change_toplevel.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 135_gtkmozembed_change_toplevel.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix drop-down menus when gtkmozembed is moved from different toplevel. 
## DP: Patch from bz#296002

@DPATCH@

=== widget/src/gtk2/nsWindow.cpp
==================================================================
--- xulrunner/widget/src/gtk2/nsWindow.cpp	(revision 118)
+++ xulrunner/widget/src/gtk2/nsWindow.cpp	(local)
@@ -116,6 +116,9 @@
 static int    is_parent_grab_leave(GdkEventCrossing *aEvent);
 
 /* callbacks from widgets */
+static void     hierarchy_changed_cb      (GtkWidget *container,
+					   GtkWidget *previous_toplevel,
+					   nsWindow *window);
 static gboolean expose_event_cb           (GtkWidget *widget,
                                            GdkEventExpose *event);
 static gboolean configure_event_cb        (GtkWidget *widget,
@@ -261,6 +264,7 @@
 nsWindow::nsWindow()
 {
     mContainer           = nsnull;
+    mParentContainer     = nsnull;
     mDrawingarea         = nsnull;
     mShell               = nsnull;
     mWindowGroup         = nsnull;
@@ -432,6 +436,15 @@
         mDrawingarea = nsnull;
     }
 
+    if (mParentContainer) {
+        g_object_remove_weak_pointer(G_OBJECT (mParentContainer),
+                                     (void**) &mParentContainer);
+        g_signal_handlers_disconnect_by_func
+            (mParentContainer, (void*)hierarchy_changed_cb, this);
+
+        mParentContainer = nsnull; 
+    }
+
     OnDestroy();
 
 #ifdef ACCESSIBILITY
@@ -2341,18 +2354,14 @@
         }
         else if (mWindowType == eWindowType_popup) {
             mShell = gtk_window_new(GTK_WINDOW_POPUP);
-            if (topLevelParent) {
-                gtk_window_set_transient_for(GTK_WINDOW(mShell),
-                                            topLevelParent);
-                mTransientParent = topLevelParent;
+            SetTransientParent(topLevelParent);
 
-                if (topLevelParent->group) {
-                    gtk_window_group_add_window(topLevelParent->group,
-                                            GTK_WINDOW(mShell));
-                    mWindowGroup = topLevelParent->group;
-                }
-            }
-        }
+            mParentContainer = parentMozContainer;
+            g_object_add_weak_pointer(G_OBJECT(mParentContainer),
+                                      (void**)&mParentContainer);
+            g_signal_connect(parentMozContainer, "hierarchy-changed",
+                             G_CALLBACK(hierarchy_changed_cb), this);
+	}
         else { // must be eWindowType_toplevel
             mShell = gtk_window_new(GTK_WINDOW_TOPLEVEL);
             SetDefaultIcon();
@@ -3236,6 +3245,25 @@
     return w;
 }
 
+void
+nsWindow::SetTransientParent(GtkWindow *aParent)
+{
+    if (mTransientParent && mTransientParent->group) {
+        gtk_window_group_remove_window(mTransientParent->group,
+                                       GTK_WINDOW(mShell));
+      mWindowGroup = nsnull;
+    }
+
+    mTransientParent = aParent;
+    gtk_window_set_transient_for(GTK_WINDOW(mShell), aParent);
+
+    if (aParent && aParent->group) {
+        gtk_window_group_add_window(aParent->group,
+                                    GTK_WINDOW(mShell));
+        mWindowGroup = aParent->group;
+    }
+}
+
 NS_IMETHODIMP
 nsWindow::MakeFullScreen(PRBool aFullScreen)
 {
@@ -3605,6 +3633,16 @@
 // gtk callbacks
 
 /* static */
+void
+hierarchy_changed_cb(GtkWidget *container, GtkWidget *previous_toplevel, nsWindow *window)
+{
+  GtkWidget *toplevelCandidate = gtk_widget_get_toplevel (container);
+  GtkWidget *toplevel = GTK_WIDGET_TOPLEVEL (toplevelCandidate) ? toplevelCandidate : nsnull;
+
+  window->SetTransientParent (GTK_WINDOW (toplevel));
+}
+
+/* static */
 gboolean
 expose_event_cb(GtkWidget *widget, GdkEventExpose *event)
 {
=== widget/src/gtk2/nsWindow.h
==================================================================
--- xulrunner/widget/src/gtk2/nsWindow.h	(revision 118)
+++ xulrunner/widget/src/gtk2/nsWindow.h	(local)
@@ -154,6 +154,8 @@
     void               LoseFocus();
     gint               ConvertBorderStyles(nsBorderStyle aStyle);
 
+    void               SetTransientParent(GtkWindow *aParent);
+
     // event callbacks
     gboolean           OnExposeEvent(GtkWidget *aWidget,
                                      GdkEventExpose *aEvent);
@@ -294,6 +296,7 @@
 
     GtkWidget          *mShell;
     MozContainer       *mContainer;
+    MozContainer       *mParentContainer;
     MozDrawingarea     *mDrawingarea;
 
     GtkWindowGroup     *mWindowGroup;



1.1                  src/patchsets/xulrunner/1.8.1.10/135_pango_null_char.patch

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

Index: 135_pango_null_char.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 135_pango_null_char.dpatch.dpatch by  <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Avoid freeze/crash when null characters are present in justified text
## DP: by discarding NULL characters before displaying. bz#366902
## DP: I don't like to have the two backends do different things, so we
## DP: just unconditionally apply the workaround.

@DPATCH@

=== layout/generic/nsTextTransformer.h
==================================================================
--- xulrunner/layout/generic/nsTextTransformer.h	(revision 161)
+++ xulrunner/layout/generic/nsTextTransformer.h	(local)
@@ -80,10 +80,10 @@
 #ifdef IBMBIDI
 // added BIDI formatting codes
 #define IS_DISCARDED(_ch) \
-  (((_ch) == CH_SHY) || ((_ch) == '\r') || IS_BIDI_CONTROL(_ch))
+  (((_ch) == CH_SHY) || ((_ch) == '\r') || IS_BIDI_CONTROL(_ch) || ((_ch) == '\0'))
 #else
 #define IS_DISCARDED(_ch) \
-  (((_ch) == CH_SHY) || ((_ch) == '\r'))
+  (((_ch) == CH_SHY) || ((_ch) == '\r') || ((_ch) == '\0'))
 #endif
 
 #define IS_ASCII_CHAR(ch) ((ch&0xff80) == 0)



1.1                  src/patchsets/xulrunner/1.8.1.10/135_zip_cache.patch

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

Index: 135_zip_cache.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 135_zip_cache.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Invalidate cache for a zip file that got modified. It will prevent
## DP: corruption of the XUL FastLoad cache when upgrade is performed
## DP: while an instance of the application is running. bz#368428.

@DPATCH@

--- iceape/modules/libjar/nsJAR.h
+++ iceape/modules/libjar/nsJAR.h
@@ -117,6 +117,10 @@
       mCache = cache;
     }
 
+    PRInt64 GetMtime() {
+      return mMtime;
+    }
+
     PRFileDesc* OpenFile();
   protected:
     //-- Private data members
@@ -131,6 +135,7 @@
 	PRLock*					 mLock;	
     PRInt32                  mTotalItemsInManifest;
     PRFileDesc*              mFd;
+    PRInt64                  mMtime;
     
     //-- Private functions
     nsresult ParseManifest(nsISignatureVerifier* verifier);
--- iceape/modules/libjar/nsJAR.cpp
+++ iceape/modules/libjar/nsJAR.cpp
@@ -214,6 +214,7 @@
 nsJAR::Init(nsIFile* zipFile)
 {
   mZipFile = zipFile;
+  zipFile->GetLastModifiedTime(&mMtime);
   mLock = PR_NewLock();
   return mLock ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
 }
@@ -1216,15 +1217,24 @@
   rv = zipFile->GetNativePath(path);
   if (NS_FAILED(rv)) return rv;
 
+  PRInt64 Mtime;
+  rv = zipFile->GetLastModifiedTime(&Mtime);
+  if (NS_FAILED(rv)) return rv;
+
   nsCStringKey key(path);
   nsJAR* zip = NS_STATIC_CAST(nsJAR*, NS_STATIC_CAST(nsIZipReader*,mZips.Get(&key))); // AddRefs
-  if (zip) {
+  if (zip && LL_EQ(Mtime, zip->GetMtime())) {
 #ifdef ZIP_CACHE_HIT_RATE
     mZipCacheHits++;
 #endif
     zip->ClearReleaseTime();
   }
   else {
+    if (zip) {
+      lock.unlock();
+      mZips.Remove(&key);
+      lock.lock();
+    }
     zip = new nsJAR();
     if (zip == nsnull)
         return NS_ERROR_OUT_OF_MEMORY;



1.1                  src/patchsets/xulrunner/1.8.1.10/160_config_install.patch

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

Index: 160_config_install.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 160_config_install.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correct installation of all the headers files from the config/ 
## DP: directory.

@DPATCH@

=== config/Makefile.in
==================================================================
--- xulrunner/config/Makefile.in	(revision 77)
+++ xulrunner/config/Makefile.in	(local)
@@ -157,8 +157,7 @@
 		echo "(nsBuildID.h is missing.)"; \
 		exit 1; \
 	fi;
-	$(SYSINSTALL) $(IFLAGS1) nsBuildID.h $(DESTDIR)$(includedir)
-	$(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir)
+	$(SYSINSTALL) $(IFLAGS1) $(HEADERS) $(DESTDIR)$(includedir)
 
 GARBAGE += build_number nsBuildID \
 	$(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS) $(FINAL_LINK_COMP_NAMES)



1.1                  src/patchsets/xulrunner/1.8.1.10/160_js_binary.patch

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

Index: 160_js_binary.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 160_js_binary.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: - JS binary. bz#331776
## DP: - Add readline support to xpcshell.

@DPATCH@

=== config/autoconf.mk.in
==================================================================
--- xulrunner/config/autoconf.mk.in	(revision 7)
+++ xulrunner/config/autoconf.mk.in	(local)
@@ -73,6 +73,9 @@
 MOZ_X11			= @MOZ_X11@
 
 MOZ_JS_LIBS		   = @MOZ_JS_LIBS@
+ENABLE_JS_BINARY	= @ENABLE_JS_BINARY@
+HAVE_READLINE		= @HAVE_READLINE@
+READLINE_LIBS		= @READLINE_LIBS@
 
 MOZ_GFX_TOOLKIT_LDFLAGS     = @MOZ_GFX_TOOLKIT_LDFLAGS@
 MOZ_WIDGET_TOOLKIT_LDFLAGS  = @MOZ_WIDGET_TOOLKIT_LDFLAGS@
=== config/rules.mk
==================================================================
--- xulrunner/config/rules.mk	(revision 7)
+++ xulrunner/config/rules.mk	(local)
@@ -898,7 +898,7 @@
 ifeq ($(CPP_PROG_LINK),1)
 	$(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
 else
-	$(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
+	$(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS) $(PROG_LIBS)
 endif # CPP_PROG_LINK
 endif # WINNT && !GNU_CC
 endif # OS/2 VACPP
=== configure.in
==================================================================
--- xulrunner/configure.in	(revision 7)
+++ xulrunner/configure.in	(local)
@@ -5116,6 +5116,40 @@
 AC_SUBST(JS_ULTRASPARC_OPTS)
 
 dnl ========================================================
+dnl = Enable building of the js standalone binary
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(js-binary,
+[  --enable-js-binary      Build the standalone JS program],
+    ENABLE_JS_BINARY=1,
+    ENABLE_JS_BINARY= )
+AC_SUBST(ENABLE_JS_BINARY)
+
+if test -n "$ENABLE_JS_BINARY"; then
+    dnl readline Support
+    dnl ========================================================
+    READLINE_DIR=no
+    MOZ_ARG_WITH_STRING(readline,
+    [  --with-readline[=PFX]
+                              Use libreadline [installed at prefix PFX]],
+        READLINE_DIR=$withval)
+    
+    if test -n "${READLINE_DIR}" -a "${READLINE_DIR}" != "no"; then
+        _SAVE_LDFLAGS=$LDFLAGS
+        LDFLAGS="-L${READLINE_DIR}/lib $LDFLAGS"
+        AC_CHECK_LIB(readline, readline, [HAVE_READLINE=1 READLINE_LIBS="-lreadline"], 
+           [HAVE_READLINE= READLINE_LIBS=])
+        LDFLAGS=$_SAVE_LDFLAGS
+    fi
+    
+    if test "${READLINE_DIR}" -a -d "${READLINE_DIR}" -a "$HAVE_READLINE" = 1; then
+        READLINE_LIBS="-L${READLINE_DIR}/lib ${READLINE_LIBS}"
+    fi
+fi
+
+AC_SUBST(HAVE_READLINE)
+AC_SUBST(READLINE_LIBS)
+
+dnl ========================================================
 dnl =
 dnl = Feature options that require extra sources to be pulled
 dnl =
=== js/src/Makefile.in
==================================================================
--- xulrunner/js/src/Makefile.in	(revision 7)
+++ xulrunner/js/src/Makefile.in	(local)
@@ -54,6 +54,16 @@
 RESFILE		= js$(MOZ_BITS)40.res
 endif
 
+ifdef ENABLE_JS_BINARY
+SIMPLE_PROGRAMS	= js
+PROG_LIBS	= -L. $(MOZ_JS_LIBS) $(NSPR_LIBS)
+$(SIMPLE_PROGRAMS): $(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX)
+ifdef HAVE_READLINE
+PROG_LIBS	+= $(READLINE_LIBS)
+DEFINES		= -DEDITLINE
+endif
+endif
+
 PACKAGE_FILE = js.pkg
 
 # JavaScript must be built shared, even for static builds, as it is used by
=== js/src/xpconnect/shell/Makefile.in
==================================================================
--- xulrunner/js/src/xpconnect/shell/Makefile.in	(revision 69)
+++ xulrunner/js/src/xpconnect/shell/Makefile.in	(local)
@@ -74,7 +74,7 @@
 # look at mozilla/js/src/editline, which is license-free (but not part
 # of the mozilla build.)
 #
-ifdef JS_READLINE
+ifdef HAVE_READLINE
 DEFINES += -DEDITLINE
-LIBS += -lreadline $(JS_READLINE_EXTRA_LIBS)
+LIBS += $(READLINE_LIBS)
 endif



1.1                  src/patchsets/xulrunner/1.8.1.10/160_pyxpcom.patch

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

Index: 160_pyxpcom.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 160_pyxpcom.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: - Fix installation directory for PyXPCOM
## DP: - Use a make variable for PYTHON_SO

@DPATCH@

=== extensions/python/xpcom/Makefile.in
==================================================================
--- xulrunner/extensions/python/xpcom/Makefile.in	(revision 85)
+++ xulrunner/extensions/python/xpcom/Makefile.in	(local)
@@ -90,9 +90,9 @@
 	$(INSTALL) $(PYSRCS_XPCOMTOOLS) $(DIST)/bin/python/xpcom/tools
 
 install::
-	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DISTDIR)$(pyexecdir)/xpcom
-	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DISTDIR)$(pyexecdir)/xpcom/client
-	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DISTDIR)$(pyexecdir)/xpcom/server
+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DESTDIR)$(pyexecdir)/xpcom
+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DESTDIR)$(pyexecdir)/xpcom/client
+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DESTDIR)$(pyexecdir)/xpcom/server
 
 clobber::
 	rm -rf $(DIST)/bin/python/xpcom
=== extensions/python/xpcom/src/Makefile.in
==================================================================
--- xulrunner/extensions/python/xpcom/src/Makefile.in	(revision 85)
+++ xulrunner/extensions/python/xpcom/src/Makefile.in	(local)
@@ -104,9 +104,11 @@
 
 install::
 ifneq ($(OS_ARCH),WINNT)
-	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom
-	mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(PYTHON_DLL_SUFFIX)
+	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom
+	mv $(DESTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom/_xpcom$(PYTHON_DLL_SUFFIX)
 endif
+	rm -f $(DESTDIR)$(mozappdir)/$(SHARED_LIBRARY)
+	rm -f $(DESTDIR)$(mozappdir)/$(IMPORT_LIBRARY)
 
 clobber::
 	rm -f *.ilk *.pdb
=== extensions/python/xpcom/src/loader/Makefile.in
==================================================================
--- xulrunner/extensions/python/xpcom/src/loader/Makefile.in	(revision 94)
+++ xulrunner/extensions/python/xpcom/src/loader/Makefile.in	(local)
@@ -61,7 +61,7 @@
 include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
-CXXFLAGS += -DPYTHON_SO=\"libpython$(PYTHON_VER_DOTTED).so\"
+CXXFLAGS += -DPYTHON_SO=\"$(PYTHON_SO)\"
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 clobber::



1.1                  src/patchsets/xulrunner/1.8.1.10/160_xpcomstub.patch

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

Index: 160_xpcomstub.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 160_xpcomstub.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Correctly install dependentlibs.list

@DPATCH@

=== xpcom/stub/Makefile.in
==================================================================
--- xulrunner/xpcom/stub/Makefile.in	(revision 73)
+++ xulrunner/xpcom/stub/Makefile.in	(local)
@@ -118,8 +125,14 @@
 
 include $(topsrcdir)/config/rules.mk
 
-libs:: $(FINAL_TARGET)/dependentlibs.list
+libs:: dependentlibs.list
+	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 
-$(FINAL_TARGET)/dependentlibs.list: Makefile.in
+install:: dependentlibs.list
+	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
+
+dependentlibs.list: Makefile.in
 	$(EXIT_ON_ERROR) \
 	( $(foreach dlib,$(DEPENDENT_LIBS_LIST),echo $(dlib);) ) > $@
+
+GARBAGE += dependentlibs.list



1.1                  src/patchsets/xulrunner/1.8.1.10/161_javaxpcom.patch

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

Index: 161_javaxpcom.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 161_javaxpcom.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: - Don't install GenerateJavaInterfaces. bz#333542
## DP: - Correctly install javaxpcom.jar.
## DP: - Don't use visibility flags so that symbols are exported.

@DPATCH@

=== extensions/java/xpcom/tools/genifaces/Makefile.in
==================================================================
--- xulrunner/extensions/java/xpcom/tools/genifaces/Makefile.in	(revision 73)
+++ xulrunner/extensions/java/xpcom/tools/genifaces/Makefile.in	(local)
@@ -54,6 +54,8 @@
 CPPSRCS = GenerateJavaInterfaces.cpp
 
 SIMPLE_PROGRAMS	= GenerateJavaInterfaces$(BIN_SUFFIX)
+NO_INSTALL	= 1
+NO_DIST_INSTALL	= 1
 
 LIBS		+= \
 		$(LIBS_DIR) \
=== extensions/java/xpcom/glue/Makefile.in
==================================================================
--- xulrunner/extensions/java/xpcom/glue/Makefile.in.orig	2007-03-25 17:19:53.000000000 +0200
+++ xulrunner/extensions/java/xpcom/glue/Makefile.in	2007-03-25 17:20:18.000000000 +0200
@@ -44,6 +44,7 @@
 
 MODULE		= javaxpcomglue
 LIBRARY_NAME	= javaxpcomglue
+VISIBILITY_FLAGS =
 ifeq ($(OS_ARCH),OS2)
 SHORT_LIBNAME	= jxpcmglu
 endif



1.1                  src/patchsets/xulrunner/1.8.1.10/165_mouse_buttons.patch

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

Index: 165_mouse_buttons.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 165_mouse_buttons.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Extended mouse buttons support taken from #244305. Thanks Peter Colberg

@DPATCH@

=== widget/src/gtk2/nsWindow.cpp
==================================================================
--- xulrunner/widget/src/gtk2/nsWindow.cpp	(revision 72)
+++ xulrunner/widget/src/gtk2/nsWindow.cpp	(local)
@@ -1543,6 +1543,9 @@
         return;
 
     switch (aEvent->button) {
+    case 1:
+        eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
+        break;
     case 2:
         eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN;
         break;
@@ -1550,7 +1553,7 @@
         eventType = NS_MOUSE_RIGHT_BUTTON_DOWN;
         break;
     default:
-        eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
+        return;
         break;
     }
 



1.1                  src/patchsets/xulrunner/1.8.1.10/165_native_uconv.patch

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

Index: 165_native_uconv.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 165_native_uconv.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: - Fix for the build to succeed when iconv support is enabled.
## DP: (Makefile.in  ; borrowed from upstream fix in version 1.7 of the file)
## DP: - Don't build what is useless when native uconv is enabled. bz#331780.
## DP: - Properly load invalid UTF-8 files. bz#331748 
## DP: - Add the scriptableunicodeconverter component. bz#333261
## DP: - Correct aliases for gbk and euc-tw.
## DP: - Allow claimed iso-8859-1 actually encoded as windows-1252 to be converted
## DP:   flawlessly

@DPATCH@

--- xulrunner/intl/uconv/Makefile.in	(revision 158)
+++ xulrunner/intl/uconv/Makefile.in	(local)
@@ -57,10 +57,12 @@
 
 MODULE		= uconv
 
-DIRS		= idl public util ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm
+DIRS		= idl public util
 
 ifdef MOZ_USE_NATIVE_UCONV
 DIRS		+= native
+else
+DIRS		+= ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm
 endif
 
 DIRS		+= src
--- xulrunner/intl/uconv/native/nsINativeUConvService.idl	(revision 158)
+++ xulrunner/intl/uconv/native/nsINativeUConvService.idl	(local)
@@ -45,8 +45,9 @@
  *  nsIUnicodeEncoder 
  *  nsICharRepresentable
  */
-[uuid(c60097ba-c79d-461b-9116-80a66404c0b0)]
+[uuid(99e23ae8-c334-44de-a208-a7aa6923f8f5)]
 interface nsINativeUConvService : nsISupports
 {
-  nsISupports getNativeConverter(in string from, in string to);
+  nsISupports getNativeUnicodeDecoder(in string from);
+  nsISupports getNativeUnicodeEncoder(in string to);
 };
--- xulrunner/intl/uconv/native/nsNativeUConvService.cpp	(revision 158)
+++ xulrunner/intl/uconv/native/nsNativeUConvService.cpp	(local)
@@ -52,8 +52,16 @@
 #include <langinfo.h> // nl_langinfo
 #include <iconv.h>    // iconv_open, iconv, iconv_close
 #include <errno.h>
+#include <string.h>   // memcpy
 
+#ifdef IS_LITTLE_ENDIAN
+const char UTF16[] = "UTF-16LE";
+#else
+const char UTF16[] = "UTF-16BE";
+#endif
 
+#define NS_UCONV_CONTINUATION_BUFFER_LENGTH 8
+
 class IConvAdaptor : public nsIUnicodeDecoder, 
                      public nsIUnicodeEncoder, 
                      public nsICharRepresentable
@@ -102,21 +110,13 @@
     
     
 private:
-    nsresult ConvertInternal(void * aSrc, 
-                             PRInt32 * aSrcLength, 
-                             PRInt32 aSrcCharSize,
-                             void * aDest, 
-                             PRInt32 * aDestLength,
-                             PRInt32 aDestCharSize);
-    
-    
     iconv_t mConverter;
     PRBool    mReplaceOnError;
     PRUnichar mReplaceChar;
+    char mContinuationBuffer[NS_UCONV_CONTINUATION_BUFFER_LENGTH];
+    PRInt32 mContinuationLength;
 
-#ifdef DEBUG
-    nsCString mFrom, mTo;
-#endif
+    const char *mFrom, *mTo;
 };
 
 NS_IMPL_ISUPPORTS3(IConvAdaptor, 
@@ -128,6 +128,7 @@
 {
     mConverter = 0;
     mReplaceOnError = PR_FALSE;
+    mContinuationLength = 0;
 }
 
 IConvAdaptor::~IConvAdaptor()
@@ -139,10 +140,8 @@
 nsresult 
 IConvAdaptor::Init(const char* from, const char* to)
 {
-#ifdef DEBUG
     mFrom = from;
     mTo = to;
-#endif
 
     mConverter = iconv_open(to, from);
     if (mConverter == (iconv_t) -1 )    
@@ -153,22 +152,129 @@
         mConverter = nsnull;
         return NS_ERROR_FAILURE;
     }
+    mContinuationLength = 0;
+
     return NS_OK;
 }
 
-// From some charset to ucs2
+// From some charset to UTF-16
 nsresult 
 IConvAdaptor::Convert(const char * aSrc, 
                      PRInt32 * aSrcLength, 
                      PRUnichar * aDest, 
                      PRInt32 * aDestLength)
 {
-    return ConvertInternal( (void*) aSrc, 
-                            aSrcLength, 
-                            1,
-                            (void*) aDest, 
-                            aDestLength,
-                            2);
+    nsresult res = NS_OK;
+    size_t inLeft, outLeft;
+
+    if (!mConverter) {
+        NS_WARNING("Converter Not Initialized");
+        return NS_ERROR_NOT_INITIALIZED;
+    }
+
+    if (mTo != UTF16) {
+        NS_WARNING("Not an UnicodeDecoder");
+        return NS_ERROR_UNEXPECTED;
+    }
+
+    inLeft = (size_t) *aSrcLength;
+    outLeft = (size_t) *aDestLength * sizeof(PRUnichar);
+
+    if (mContinuationLength > 0) {
+        PRInt32 bufLength = NS_UCONV_CONTINUATION_BUFFER_LENGTH - mContinuationLength,
+                oneChar = 2, continuationLength = mContinuationLength;
+
+#ifdef DEBUG
+        printf(" * IConvAdaptor - Have %d bytes in continuation buffer\n", mContinuationLength);
+#endif
+
+        bufLength = bufLength > *aSrcLength ? *aSrcLength : bufLength;
+        memcpy(&mContinuationBuffer[mContinuationLength],
+               aSrc, bufLength);
+        bufLength = mContinuationLength + bufLength;
+        
+        mContinuationLength = 0; // We don't want to enter an infinite loop
+
+        res = Convert(mContinuationBuffer, &bufLength, aDest, &oneChar);
+        switch (res) {
+        case NS_OK_UDEC_MOREINPUT: // Contination buffer ended before filling the 2
+                                   // output words, with an incomplete sequence, filling
+                                   // a new continuation buffer.
+            if (bufLength < continuationLength) { // still not enough data
+              *aSrcLength = 0;
+              *aDestLength = 0;
+              return NS_OK_UDEC_MOREINPUT;
+            }
+            mContinuationLength = 0;
+        case NS_OK: // Continuation buffer ended, unlikely (8 input bytes leading
+                    // exactly to 2 output words is quite unlikely)
+        case NS_OK_UDEC_MOREOUTPUT: // Standard case, we continue with the
+                                    // normal conversion
+            inLeft = (size_t) *aSrcLength - (bufLength - continuationLength);
+            outLeft -= oneChar * sizeof(PRUnichar);
+            aSrc += bufLength - continuationLength;
+            aDest += oneChar;
+            break;
+        case NS_ERROR_UDEC_ILLEGALINPUT:
+            *aSrcLength = 0; // Corner case: replacement won't be done as
+                             // if it were in the middle of the buffer, since
+                             // we can't tell the caller the bad character is
+                             // at -mContinuationLength
+            *aDestLength = 0;
+            return res;
+        }
+    }
+
+    do {
+        if ( iconv(mConverter,
+                   (char **)&aSrc,
+                   &inLeft,
+                   (char **)&aDest,
+                   &outLeft) == (size_t) -1 ) {
+            switch (errno) {
+            case EILSEQ: // Invalid multibyte sequence
+                if (mReplaceOnError) {
+                    *(aDest++) = mReplaceChar;
+                    outLeft -= sizeof(PRUnichar);
+                    aSrc++;
+                    inLeft--;
+                    res = NS_OK;
+#ifdef DEBUG
+                    printf(" * IConvAdaptor - Replacing char in output ( %s -> %s )\n",
+                           mFrom, mTo);
+#endif
+                } else {
+#ifdef DEBUG
+                    printf(" * IConvAdaptor - Bad input ( %s -> %s )\n",
+                           mFrom, mTo);
+#endif
+                    res = NS_ERROR_UDEC_ILLEGALINPUT;
+                }
+                break;
+            case EINVAL: // Incomplete multibyte sequence
+                mContinuationLength = inLeft;
+                memmove(mContinuationBuffer, aSrc, inLeft);
+#ifdef DEBUG
+                printf(" * IConvAdaptor - Incomplete multibyte sequence in input ( %s -> %s )\n",
+                       mFrom, mTo);
+#endif
+                res = NS_OK_UDEC_MOREINPUT;
+                break;
+            case E2BIG: // Output buffer full
+#ifdef DEBUG
+                printf(" * IConvAdaptor - Output buffer full ( %s -> %s )\n",
+                       mFrom, mTo);
+#endif
+                res = NS_OK_UDEC_MOREOUTPUT;
+                break;
+            }
+        }
+    } while (mReplaceOnError && (res == NS_OK) && (inLeft != 0));
+
+    *aSrcLength -= inLeft;
+    *aDestLength -= (outLeft / sizeof(PRUnichar));
+
+    return res;
 }
 
 nsresult
@@ -176,12 +282,14 @@
                           PRInt32 aSrcLength, 
                           PRInt32 * aDestLength)
 {
-    if (!mConverter)
-        return NS_ERROR_UENC_NOMAPPING;
+    if (!mConverter) {
+        NS_WARNING("Converter Not Initialized");
+        return NS_ERROR_NOT_INITIALIZED;
+    }
 
     *aDestLength = aSrcLength*4; // sick
 #ifdef DEBUG
-    printf(" * IConvAdaptor - - GetMaxLength %d ( %s -> %s )\n", *aDestLength, mFrom.get(), mTo.get());
+    printf(" * IConvAdaptor - GetMaxLength %d ( %s -> %s )\n", *aDestLength, mFrom, mTo);
 #endif
     return NS_OK;
 }
@@ -190,19 +298,16 @@
 nsresult 
 IConvAdaptor::Reset()
 {
-    const char *zero_char_in_ptr  = NULL;
-    char       *zero_char_out_ptr = NULL;
-    size_t      zero_size_in      = 0,
-                zero_size_out     = 0;
+    if (!mConverter) {
+        NS_WARNING("Converter Not Initialized");
+        return NS_ERROR_NOT_INITIALIZED;
+    }
 
-    iconv(mConverter, 
-          (char **)&zero_char_in_ptr,
-          &zero_size_in,
-          &zero_char_out_ptr,
-          &zero_size_out);
+    iconv(mConverter, NULL, NULL, NULL, NULL);
+    mContinuationLength = 0;
 
 #ifdef DEBUG
-    printf(" * IConvAdaptor - - Reset\n");
+    printf(" * IConvAdaptor - Reset\n");
 #endif
     return NS_OK;
 }
@@ -215,19 +320,138 @@
                      char * aDest, 
                      PRInt32 * aDestLength)
 {
-    return ConvertInternal( (void*) aSrc, 
-                            aSrcLength, 
-                            2,
-                            (void*) aDest, 
-                            aDestLength,
-                            1);
+    nsresult res = NS_OK;
+    size_t inLeft, outLeft;
+
+    if (!mConverter) {
+        NS_WARNING("Converter Not Initialized");
+        return NS_ERROR_NOT_INITIALIZED;
+    }
+
+    if (mFrom != UTF16) {
+        NS_WARNING("Not an UnicodeEncoder");
+        return NS_ERROR_UNEXPECTED;
+    }
+
+    inLeft = (size_t) *aSrcLength * sizeof(PRUnichar);
+    outLeft = (size_t) *aDestLength;
+
+    if (mContinuationLength > 0) {
+        // If we're continuing, that means we have a word in the buffer, and
+        // that we only need one more word, UTF-16 characters being 2 or 4 bytes
+        // long.
+        PRInt32 bufLength = 2, destLength = *aDestLength;
+
+#ifdef DEBUG
+        printf(" * IConvAdaptor - Have %d bytes in continuation buffer\n", mContinuationLength);
+#endif
+
+        mContinuationLength = 0; // We don't want to enter an infinite loop
+
+        ((PRUnichar *) mContinuationBuffer)[1] = *aSrc;
+
+        int i;
+        for (i = 0; i < 4; i++) {
+        printf("%02x ", mContinuationBuffer[i]);
+        }
+        printf("\n");
+
+        res = Convert((PRUnichar *) mContinuationBuffer, &bufLength, aDest, &destLength);
+        switch (res) {
+        case NS_OK_UENC_MOREOUTPUT:
+        case NS_ERROR_UENC_NOMAPPING:
+            *aSrcLength = 0;
+            *aDestLength = 0;
+            return res;
+        case NS_OK:
+            printf("NS_OK %d\n", bufLength);
+            outLeft -= destLength;
+            inLeft -= sizeof(PRUnichar); // We necessarily have consumed 1 word
+            aSrc++;
+            aDest += destLength;
+        }
+    }
+
+    do {
+        if ( iconv(mConverter,
+                   (char **)&aSrc,
+                   &inLeft,
+                   (char **)&aDest,
+                   &outLeft) == (size_t) -1 ) {
+            switch (errno) {
+            case EILSEQ: // Invalid multibyte sequence ; there's no way
+                         // to know if it's invalid input or input that
+                         // doesn't have mapping in the output charset,
+                         // but we'll assume our input UTF-16 is valid.
+                if (mReplaceOnError) {
+                    *(aDest++) = (char)mReplaceChar;
+                    outLeft--;
+                    aSrc++;
+                    inLeft -= sizeof(PRUnichar);
+                    res = NS_OK;
+#ifdef DEBUG
+                    printf(" * IConvAdaptor - Replacing char in output ( %s -> %s )\n",
+                           mFrom, mTo);
+#endif
+                } else {
+#ifdef DEBUG
+                    printf(" * IConvAdaptor - No mapping in output charset ( %s -> %s )\n",
+                           mFrom, mTo);
+#endif
+                    res = NS_ERROR_UENC_NOMAPPING;
+                }
+                break;
+            case EINVAL: // Incomplete UTF-16 sequence. Happens when dealing with characters
+                         // outside BMP split between 2 buffers.
+#ifdef DEBUG
+                printf(" * IConvAdaptor - Incomplete UTF-16 character in input. ( %s -> %s )\n",
+                       mFrom, mTo);
+#endif
+                mContinuationLength = 2;
+                ((PRUnichar *) mContinuationBuffer)[0] = *aSrc;
+                res = NS_OK_UENC_MOREINPUT;
+                break;
+            case E2BIG: // Output buffer full
+#ifdef DEBUG
+                printf(" * IConvAdaptor - Output buffer full ( %s -> %s )\n",
+                       mFrom, mTo);
+#endif
+                res = NS_OK_UENC_MOREOUTPUT;
+                break;
+            }
+        }
+    } while (mReplaceOnError && (res == NS_OK) && (inLeft != 0));
+
+    *aSrcLength -= (inLeft / sizeof(PRUnichar));
+    *aDestLength -= outLeft;
+
+    return res;
 }
 
 
 nsresult 
 IConvAdaptor::Finish(char * aDest, PRInt32 * aDestLength)
 {
+    PRInt32 length = *aDestLength;
+
+    if (!mConverter) {
+        NS_WARNING("Converter Not Initialized");
+        return NS_ERROR_NOT_INITIALIZED;
+    }
+
+#ifdef DEBUG
+    printf(" * IConvAdaptor - Finish\n");
+#endif
     *aDestLength = 0;
+    // Flush continuation and send replacement character.
+    if ((mContinuationLength > 0) && (mReplaceOnError)) {
+        if (length > 0 ) {
+            *(aDest++) = (char) mReplaceChar;
+            *aDestLength = 1;
+        } else {
+            return NS_OK_UENC_MOREOUTPUT;
+        }
+    }
     return NS_OK;
 }
 
@@ -236,8 +460,10 @@
                           PRInt32 aSrcLength, 
                           PRInt32 * aDestLength)
 {
-    if (!mConverter)
-        return NS_ERROR_UENC_NOMAPPING;
+    if (!mConverter) {
+        NS_WARNING("Converter Not Initialized");
+        return NS_ERROR_NOT_INITIALIZED;
+    }
 
     *aDestLength = aSrcLength*4; // sick
 
@@ -251,13 +477,13 @@
                                     PRUnichar aChar)
 {
 
-    if (aBehavior != kOnError_Replace) {
+    if (aBehavior == kOnError_Replace) {
         mReplaceOnError = PR_TRUE;
         mReplaceChar = aChar;
         return NS_OK;
     }
 
-    NS_WARNING("Uconv Error Behavior not support");
+    NS_WARNING("Uconv Error: Behavior not supported");
     return NS_ERROR_FAILURE;
 }
 
@@ -272,103 +498,38 @@
 }
 
 
-nsresult 
-IConvAdaptor::ConvertInternal(void * aSrc, 
-                             PRInt32 * aSrcLength, 
-                             PRInt32 aSrcCharSize,
-                             void * aDest, 
-                             PRInt32 * aDestLength,
-                             PRInt32 aDestCharSize)
+NS_IMPL_ISUPPORTS1(NativeUConvService, nsINativeUConvService)
+
+NS_IMETHODIMP 
+NativeUConvService::GetNativeUnicodeDecoder(const char* from,
+                                            nsISupports** aResult) 
 {
-    if (!mConverter) {
-        NS_WARNING("Converter Not Initialize");
-        return NS_ERROR_NOT_INITIALIZED;
-    }
-    size_t res = 0;
-    size_t inLeft = (size_t) *aSrcLength * aSrcCharSize;
-    size_t outLeft = (size_t) *aDestLength * aDestCharSize;
-    size_t outputAvail = outLeft;
+    *aResult = nsnull;
 
-    while (true){
+    IConvAdaptor* ucl = new IConvAdaptor();
+    if (!ucl)
+        return NS_ERROR_OUT_OF_MEMORY;
 
-        res = iconv(mConverter, 
-                    (char**)&aSrc, 
-                    &inLeft, 
-                    (char**)&aDest, 
-                    &outLeft);
-        
-        if (res == (size_t) -1) {
-            // on some platforms (e.g., linux) iconv will fail with
-            // E2BIG if it cannot convert _all_ of its input.  it'll
-            // still adjust all of the in/out params correctly, so we
-            // can ignore this error.  the assumption is that we will
-            // be called again to complete the conversion.
-            if ((errno == E2BIG) && (outLeft < outputAvail)) {
-                res = 0;
-                break;
-            }
-            
-            if (errno == EILSEQ) {
+    // Trick to allow conversion of 0x5c into U+005c instead of U+00a5 with glibc's iconv
+    if (strcmp(from, "Shift_JIS") == 0)
+        from = "sjis-open";
 
-                if (mReplaceOnError) {
-                    if (aDestCharSize == 1) {
-                        (*(char*)aDest) = (char)mReplaceChar;
-                        aDest = (char*)aDest + sizeof(char);
-                    }
-                    else
-                    {
-                        (*(PRUnichar*)aDest) = (PRUnichar)mReplaceChar;
-                        aDest = (PRUnichar*)aDest + sizeof(PRUnichar);
-                    
-                    }
-                    inLeft -= aSrcCharSize;
-                    outLeft -= aDestCharSize;
+    // Trick to allow claimed iso-8859-1 actually encoded as windows-1252 to be converted flawlessly
+    if (strcmp(from, "ISO-8859-1") == 0)
+        from = "windows-1252";
 
-#ifdef DEBUG
-                    printf(" * IConvAdaptor - replacing char in output  ( %s -> %s )\n", 
-                           mFrom.get(), mTo.get());
+    nsresult rv = ucl->Init(from, UTF16);
 
-#endif
-                    res = 0;
-                }
-            }
-
-            if (res == -1) {
-#ifdef DEBUG
-                printf(" * IConvAdaptor - Bad input ( %s -> %s )\n", mFrom.get(), mTo.get());
-#endif
-                return NS_ERROR_UENC_NOMAPPING;
-            }
-        }
-
-        if (inLeft <= 0 || outLeft <= 0 || res == -1)
-            break;
+    if (NS_SUCCEEDED(rv)) {
+        NS_ADDREF(*aResult = (nsISupports*)(nsIUnicodeDecoder*)ucl);
     }
 
-
-    if (res != (size_t) -1) {
-
-        // xp_iconv deals with how much is remaining in a given buffer
-        // but what uconv wants how much we read/written already.  So
-        // we fix it up here.
-        *aSrcLength  -= (inLeft  / aSrcCharSize);
-        *aDestLength -= (outLeft / aDestCharSize);
-        return NS_OK;
-    }
-    
-#ifdef DEBUG
-    printf(" * IConvAdaptor - - xp_iconv error( %s -> %s )\n", mFrom.get(), mTo.get());
-#endif
-    Reset();    
-    return NS_ERROR_UENC_NOMAPPING;
+    return rv;
 }
 
-NS_IMPL_ISUPPORTS1(NativeUConvService, nsINativeUConvService)
-
 NS_IMETHODIMP 
-NativeUConvService::GetNativeConverter(const char* from,
-                                       const char* to,
-                                       nsISupports** aResult) 
+NativeUConvService::GetNativeUnicodeEncoder(const char* to,
+                                            nsISupports** aResult) 
 {
     *aResult = nsnull;
 
@@ -376,10 +537,10 @@
     if (!ucl)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    nsresult rv = ucl->Init(from, to);
+    nsresult rv = ucl->Init(UTF16, to);
 
     if (NS_SUCCEEDED(rv)) {
-        NS_ADDREF(*aResult = (nsISupports*)(nsIUnicharEncoder*)ucl);
+        NS_ADDREF(*aResult = (nsISupports*)(nsIUnicodeEncoder*)ucl);
     }
 
     return rv;
--- xulrunner/intl/uconv/src/Makefile.in.orig	2007-03-25 17:36:50.000000000 +0200
+++ xulrunner/intl/uconv/src/Makefile.in	2007-03-25 17:37:24.000000000 +0200
@@ -82,13 +82,13 @@
 		nsUTF8ConverterService.cpp \
 		nsUTF8ToUnicode.cpp \
 		nsUnicodeToUTF8.cpp \
+		nsScriptableUConv.cpp \
 		$(NULL)
 
 ifdef MOZ_USE_NATIVE_UCONV
 REQUIRES	+= ucnative
 else
 CPPSRCS         += \
-		nsScriptableUConv.cpp \
 		nsUnicodeDecodeHelper.cpp \
 		nsUnicodeEncodeHelper.cpp \
 		nsMappingCache.cpp \
--- xulrunner/intl/uconv/src/charsetalias.properties	(revision 158)
+++ xulrunner/intl/uconv/src/charsetalias.properties	(local)
@@ -120,13 +120,13 @@
 t.61-8bit=T.61-8bit
 hz-gb-2312=HZ-GB-2312
 big5-hkscs=Big5-HKSCS
-gbk=x-gbk
-cns11643=x-euc-tw
+gbk=gbk
+cns11643=euc-tw
 #
 # Netscape private ...
 #
 x-imap4-modified-utf7=x-imap4-modified-utf7
-x-euc-tw=x-euc-tw
+x-euc-tw=euc-tw
 x-mac-roman=x-mac-roman
 x-mac-ce=x-mac-ce
 x-mac-turkish=x-mac-turkish
@@ -475,7 +475,7 @@
 #
 # Aliases for x-euc-tw
 #
-zh_tw-euc=x-euc-tw
+zh_tw-euc=euc-tw
 #
 # Following names appears in unix nl_langinfo(CODESET)
 # They can be compiled as platform specific if necessary
@@ -513,6 +513,6 @@
 x-obsoleted-shift_jis=x-obsoleted-Shift_JIS
 x-obsoleted-iso-2022-jp=x-obsoleted-ISO-2022-JP
 x-obsoleted-euc-jp=x-obsoleted-EUC-JP
-x-gbk=x-gbk
+x-gbk=gbk
 windows-936=windows-936
 ansi-1251=windows-1251
--- xulrunner/intl/uconv/src/nsCharsetConverterManager.cpp	(revision 158)
+++ xulrunner/intl/uconv/src/nsCharsetConverterManager.cpp	(local)
@@ -191,9 +191,8 @@
 #ifdef MOZ_USE_NATIVE_UCONV
   if (mNativeUC) {
     nsCOMPtr<nsISupports> supports;
-    mNativeUC->GetNativeConverter("UCS-2", 
-                                  aDest,
-                                  getter_AddRefs(supports));
+    mNativeUC->GetNativeUnicodeEncoder(aDest,
+                                       getter_AddRefs(supports));
 
     encoder = do_QueryInterface(supports);
 
@@ -202,7 +201,8 @@
       return NS_OK;
     }
   }
-#endif  
+  return NS_ERROR_UCONV_NOCONV;
+#else
   nsresult rv = NS_OK;
 
   nsCAutoString
@@ -220,6 +220,7 @@
     NS_ADDREF(*aResult);
   }
   return rv;
+#endif
 }
 
 NS_IMETHODIMP
@@ -246,9 +247,8 @@
 #ifdef MOZ_USE_NATIVE_UCONV
   if (mNativeUC) {
     nsCOMPtr<nsISupports> supports;
-    mNativeUC->GetNativeConverter(aSrc,
-                                  "UCS-2", 
-                                  getter_AddRefs(supports));
+    mNativeUC->GetNativeUnicodeDecoder(aSrc,
+                                       getter_AddRefs(supports));
     
     decoder = do_QueryInterface(supports);
 
@@ -257,7 +257,8 @@
       return NS_OK;
     }
   }
-#endif
+  return NS_ERROR_UCONV_NOCONV;
+#else
   nsresult rv = NS_OK;
 
   NS_NAMED_LITERAL_CSTRING(kUnicodeDecoderContractIDBase,
@@ -285,6 +286,7 @@
     NS_ADDREF(*aResult);
   }
   return rv;
+#endif
 }
 
 nsresult 
--- xulrunner/intl/uconv/src/nsUConvModule.cpp	(revision 158)
+++ xulrunner/intl/uconv/src/nsUConvModule.cpp	(local)
@@ -58,6 +58,7 @@
 #include "nsConverterInputStream.h"
 #include "nsConverterOutputStream.h"
 #include "nsPlatformCharset.h"
+#include "nsScriptableUConv.h"
 
 #ifndef MOZ_USE_NATIVE_UCONV
 #include "nsIUnicodeDecodeHelper.h"
@@ -67,7 +68,6 @@
 
 #include "nsUConvDll.h"
 #include "nsIFile.h"
-#include "nsIScriptableUConv.h"
 
 #include "nsCRT.h"
 
@@ -82,7 +82,6 @@
 #include "nsUnicodeToCP1252.h"
 #include "nsUnicodeToMacRoman.h"
 #include "nsUnicodeToUTF8.h"
-#include "nsScriptableUConv.h"
 
 // ucvlatin
 #include "nsUCvLatinCID.h"
@@ -489,7 +488,6 @@
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeDecodeHelper)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeEncodeHelper)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableUnicodeConverter)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF8)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF8ToUnicode)
 
@@ -720,6 +718,7 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsConverterInputStream)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsConverterOutputStream)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPlatformCharset, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableUnicodeConverter)
 
 static const nsModuleComponentInfo components[] = 
 {
@@ -752,6 +751,11 @@
     "@mozilla.org/intl/converter-output-stream;1",
     nsConverterOutputStreamConstructor 
   },   
+  { 
+    "Unicode Encoder / Decoder for Script", NS_ISCRIPTABLEUNICODECONVERTER_CID,
+    NS_ISCRIPTABLEUNICODECONVERTER_CONTRACTID, 
+    nsScriptableUnicodeConverterConstructor
+  },
 #ifdef MOZ_USE_NATIVE_UCONV
   { 
     "Native UConv Service", 
@@ -776,11 +780,6 @@
     nsUTF8ConverterServiceConstructor
   },
   { 
-    "Unicode Encoder / Decoder for Script", NS_ISCRIPTABLEUNICODECONVERTER_CID,
-    NS_ISCRIPTABLEUNICODECONVERTER_CONTRACTID, 
-    nsScriptableUnicodeConverterConstructor
-  },
-  { 
     "ISO-8859-1 To Unicode Converter", NS_ISO88591TOUNICODE_CID, 
     NS_ISO88591TOUNICODE_CONTRACTID,
     nsISO88591ToUnicodeConstructor,



1.1                  src/patchsets/xulrunner/1.8.1.10/180_libxpcom_hack.patch

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

Index: 180_libxpcom_hack.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 180_libxpcom_hack.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force libxpcom to be linked to xulrunner-bin, xpcshell and libgtkmozembed
## DP: so that it is loaded in most of the cases.

@DPATCH@

=== embedding/browser/gtk/src/Makefile.in
==================================================================
--- xulrunner/embedding/browser/gtk/src/Makefile.in	(revision 118)
+++ xulrunner/embedding/browser/gtk/src/Makefile.in	(local)
@@ -120,7 +120,9 @@
 
 ifdef MOZ_ENABLE_GTK2
 EXTRA_DSO_LDOPTS = \
+		-Wl,--no-as-needed \
 		$(MOZ_COMPONENT_LIBS) \
+		-Wl,--as-needed \
 		$(NULL)
 endif
 
=== js/src/xpconnect/shell/Makefile.in
==================================================================
--- xulrunner/js/src/xpconnect/shell/Makefile.in	(revision 118)
+++ xulrunner/js/src/xpconnect/shell/Makefile.in	(local)
@@ -57,7 +57,9 @@
 
 LIBS		= \
 		$(MOZ_JS_LIBS) \
+		-Wl,--no-as-needed \
 		$(XPCOM_LIBS) \
+		-Wl,--as-needed \
 		$(NSPR_LIBS) \
 		$(NULL)
 
=== xulrunner/app/Makefile.in
==================================================================
--- xulrunner/xulrunner/app/Makefile.in	(revision 118)
+++ xulrunner/xulrunner/app/Makefile.in	(local)
@@ -104,7 +104,9 @@
 	$(STATIC_COMPONENTS_LINKER_PATH) \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_JS_LIBS) \
+        -Wl,--no-as-needed \
 	$(XPCOM_LIBS) \
+        -Wl,--as-needed \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
 	$(NULL)



1.1                  src/patchsets/xulrunner/1.8.1.10/180_no_examples.patch

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

Index: 180_no_examples.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 180_no_examples.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't build examples

@DPATCH@

=== xulrunner/Makefile.in
==================================================================
--- xulrunner/xulrunner/Makefile.in	(revision 62)
+++ xulrunner/xulrunner/Makefile.in	(local)
@@ -48,7 +48,6 @@
 	stub \
 	util \
 	app \
-	examples \
 	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
=== extensions/python/xpcom/Makefile.in
==================================================================
--- xulrunner/extensions/python/xpcom/Makefile.in	(revision 85)
+++ xulrunner/extensions/python/xpcom/Makefile.in	(local)
@@ -40,7 +40,6 @@
 
 DIRS = \
         src \
-        test/test_component \
         $(NULL)
 
 topsrcdir	= @top_srcdir@



1.1                  src/patchsets/xulrunner/1.8.1.10/180_no_sys_profile.patch

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

Index: 180_no_sys_profile.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 180_no_sys_profile.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Don't install system profile

@DPATCH@

=== xulrunner/app/Makefile.in
==================================================================
--- xulrunner/xulrunner/app/Makefile.in	(revision 61)
+++ xulrunner/xulrunner/app/Makefile.in	(local)
@@ -49,8 +49,6 @@
 
 MOZILLA_INTERNAL_API = 1
 
-DIRS		= profile
-
 PREF_JS_EXPORTS = $(srcdir)/xulrunner.js
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
 



1.1                  src/patchsets/xulrunner/1.8.1.10/181_sonames.patch

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

Index: 181_sonames.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 181_sonames.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add soname support

@DPATCH@

=== config/rules.mk
==================================================================
--- xulrunner/config/rules.mk.orig	2007-03-18 00:59:30.000000000 +0100
+++ xulrunner/config/rules.mk	2007-03-18 01:31:27.000000000 +0100
@@ -133,6 +133,26 @@
 
 SHARED_LIBRARY		:= $(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX)
 
+SONAME			:= $(notdir $(SHARED_LIBRARY))
+
+ifdef SO_VERSION
+ifneq (,$(findstring $(SONAME),$(MKSHLIB)))
+SO_VERSION_MAJOR	:= $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\1/')
+SO_VERSION_MINOR	:= $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\2/')
+SO_VERSION_MICRO	:= $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\3/')
+
+SHARED_LIBRARY_LINKS	:= $(SONAME)
+ifdef SO_VERSION_MINOR
+SHARED_LIBRARY_LINKS	+= $(SONAME).$(SO_VERSION_MAJOR)
+endif
+
+SONAME			:= $(SONAME).$(SO_VERSION_MAJOR)
+SHARED_LIBRARY		:= $(SHARED_LIBRARY).$(SO_VERSION)
+
+MKSHLINKS		= (cd $(1) && for link in $(SHARED_LIBRARY_LINKS); do rm -f $$link; ln -s $(notdir $(SHARED_LIBRARY)) $$link; done)
+endif
+endif
+
 ifeq ($(OS_ARCH),OS2)
 DEF_FILE		:= $(SHARED_LIBRARY:.dll=.def)
 endif
@@ -264,7 +284,7 @@
 	$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\
 	$(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) $(wildcard *.RES) \
 	$(wildcard *.pdb) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \
-	$(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(wildcard *.ilk) \
+	$(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(SHARED_LIBRARY_LINKS) $(wildcard *.ilk) \
 	$(PROGRAM:$(BIN_SUFFIX)=.exp) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.exp) \
 	$(PROGRAM:$(BIN_SUFFIX)=.lib) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.lib) \
 	$(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.$(OBJ_SUFFIX)) \
@@ -662,6 +682,8 @@
 ifdef IS_COMPONENT
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
 	$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
+	$(call MKSHLINKS, $(FINAL_TARGET)/components)
+	$(call MKSHLINKS, $(FINAL_TARGET)/components/$(SHARED_LIBRARY))
 ifdef BEOS_ADDON_WORKAROUND
 	( cd $(FINAL_TARGET)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
 endif
@@ -670,8 +692,10 @@
 	$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
 else
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
+	$(call MKSHLINKS,$(DIST)/lib)
 endif
 	$(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)
+	$(call MKSHLINKS,$(FINAL_TARGET))
 ifdef BEOS_ADDON_WORKAROUND
 	( cd $(FINAL_TARGET) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
 endif
@@ -717,45 +741,32 @@
 endif
 endif
 
+ifdef MRE_DIST
+DESTSUBDIR=$(mredir)
+else
+DESTSUBDIR=$(mozappdir)
+endif
+
 install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS)
 ifndef NO_INSTALL
 #ifdef LIBRARY
 #ifndef IS_COMPONENT
-#ifdef MRE_DIST
-#	$(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(mredir)
-#else
-#	$(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(mozappdir)
-#endif
+#	$(SYSINSTALL) $(IFLAGS1) $(LIBRARY) $(DESTDIR)$(DESTSUBDIR)
 #endif # !IS_COMPONENT
 #endif # LIBRARY
 ifdef SHARED_LIBRARY
 ifdef IS_COMPONENT
-ifdef MRE_DIST
-	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components
+	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(DESTSUBDIR)/components
 else
-	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components
-endif
-else
-ifdef MRE_DIST
-	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)
-else
-	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)
-endif
+	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(DESTSUBDIR)
+	$(call MKSHLINKS,$(DESTDIR)$(DESTSUBDIR))
 endif
 endif # SHARED_LIBRARY
 ifdef PROGRAM
-ifdef MRE_DIST
-	$(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mredir)
-else
-	$(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)
-endif
+	$(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(DESTSUBDIR)
 endif # PROGRAM
 ifdef SIMPLE_PROGRAMS
-ifdef MRE_DIST
-	$(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(mredir)
-else
-	$(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(mozappdir)
-endif
+	$(SYSINSTALL) $(IFLAGS2) $(SIMPLE_PROGRAMS) $(DESTDIR)$(DESTSUBDIR)
 endif # SIMPLE_PROGRAMS
 endif # NO_INSTALL
 
@@ -987,6 +998,8 @@
 SUB_SHLOBJS = $(SUB_LOBJS)
 endif
 
+$(SHARED_LIBRARY_LINKS): %: $(SHARED_LIBRARY)
+
 $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) Makefile Makefile.in
 ifndef INCREMENTAL_LINKER
 	rm -f $@
@@ -1013,6 +1026,7 @@
 endif # SHARED_LIBRARY_LIBS
 endif # NO_LD_ARCHIVE_FLAGS
 	$(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
+	$(call MKSHLINKS,.)
 	@rm -f foodummyfilefoo $(SUB_SHLOBJS) $(DELETE_AFTER_LINK)
 else # os2 vacpp
 	$(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
@@ -1352,11 +1366,7 @@
 
 install:: $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt
 ifndef NO_INSTALL
-ifdef MRE_DIST
-	$(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mredir)/components
-else 
-	$(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(mozappdir)/components
-endif 
+	$(SYSINSTALL) $(IFLAGS1) $(XPIDL_GEN_DIR)/$(XPIDL_MODULE).xpt $(DESTDIR)$(DESTSUBDIR)/components
 endif # NO_INSTALL
 endif # NO_GEN_XPT

=== configure.in
--- xulrunner/configure.in.orig	2007-03-18 02:07:01.000000000 +0100
+++ xulrunner/configure.in	2007-03-18 02:38:19.000000000 +0100
@@ -1121,8 +1121,8 @@
 dnl GNU specific defaults
 dnl ========================================================
 if test "$GNU_CC"; then
-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
+    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@'
+    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@'
     DSO_LDOPTS='-shared'
     if test "$GCC_USE_GNU_LD"; then
         # Don't allow undefined symbols in libraries
@@ -1152,8 +1152,9 @@
     _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
     _USE_CPP_INCLUDE_FLAG=1
 else
-    MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-    MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
+    MKSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@'
+    MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $(SONAME) -o $@'
+
 
     DSO_LDOPTS='-shared'
     if test "$GNU_LD"; then
@@ -1389,7 +1390,7 @@
 
 *-beos*)
     no_x=yes
-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
+    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$(SONAME) -o $@'
     _PLATFORM_DEFAULT_TOOLKIT="beos"
     DSO_LDOPTS='-nostart'
     TK_LIBS='-lbe -lroot'
@@ -1902,8 +1903,9 @@
     if test "$LIBRUNPATH"; then
 	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
     fi
-    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
-    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
+    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@'
+    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@'
+
     ;;
 
 *-nto*) 
@@ -2070,8 +2072,9 @@
 
 alpha*-*-osf*)
     if test "$GNU_CC"; then
-      MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
-      MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$@ -o $@'
+      MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@'
+      MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(SONAME) -o $@'
+
 
     else
 	MOZ_DEBUG_FLAGS='-g'
@@ -2081,8 +2084,9 @@
 	DSO_LDOPTS='-shared -msym -expect_unresolved \* -update_registry $(DIST)/so_locations'
 	DSO_CFLAGS=
 	DSO_PIC_CFLAGS=
-	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
-	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $@ -o $@'
+	MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@'
+	MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -soname $(SONAME) -o $@'
+
 	MKSHLIB_FORCE_ALL='-all'
 	MKSHLIB_UNFORCE_ALL='-none'
 	dnl Might fix the libxpcom.so breakage on this platform as well....
@@ -2139,8 +2143,9 @@
                        [LDFLAGS=$_SAVE_LDFLAGS])
        fi
        MOZ_OPTIMIZE_FLAGS="-xO4"
-       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
+       MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $(SONAME) -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $(SONAME) -o $@'
+
        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
        MKSHLIB_UNFORCE_ALL=''
        DSO_LDOPTS='-G -Qoption ld -z,muldefs'
=== embedding/browser/gtk/src/Makefile.in
--- xulrunner/embedding/browser/gtk/src/Makefile.in	(revision 8)
+++ xulrunner/embedding/browser/gtk/src/Makefile.in	(local)
@@ -46,6 +46,7 @@
 MODULE		= gtkembedmoz
 LIBRARY_NAME	= gtkembedmoz
 MOZILLA_INTERNAL_API = 1
+SO_VERSION	= 1
 
 REQUIRES	= xpcom \
 		  string \
=== js/src/Makefile.in
--- xulrunner/js/src/Makefile.in	(revision 8)
+++ xulrunner/js/src/Makefile.in	(local)
@@ -48,6 +48,7 @@
 LIBRARY_NAME	= mozjs
 LIB_IS_C_ONLY	= 1
 GRE_MODULE	= 1
+SO_VERSION	= 1
 
 ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 LIBRARY_NAME	= js$(MOZ_BITS)$(VERSION_NUMBER)
=== toolkit/library/Makefile.in
--- xulrunner/toolkit/library/Makefile.in	(revision 8)
+++ xulrunner/toolkit/library/Makefile.in	(local)
@@ -48,6 +48,7 @@
 FORCE_USE_PIC = 1
 FORCE_SHARED_LIB = 1
 MOZILLA_INTERNAL_API = 1
+SO_VERSION = 1
 
 ifeq ($(OS_ARCH),Darwin)
 # This is going to be a framework named "XUL", not an ordinary library named
=== xpcom/stub/Makefile.in
--- xulrunner/xpcom/stub/Makefile.in	(revision 8)
+++ xulrunner/xpcom/stub/Makefile.in	(local)
@@ -44,6 +44,7 @@
 
 MODULE		= xpcom
 LIBRARY_NAME	= xpcom
+SO_VERSION	= 1
 
 # The XPCOM glue uses realpath() on libxpcom.so to resolve any symlinks. We
 # want it to find dist/bin and not xpcom/stub so we copy instead of symlinking.



1.1                  src/patchsets/xulrunner/1.8.1.10/182_locale.patch

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

Index: 182_locale.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 182_locale.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: use OS locale and display it correctly. bz#331779

@DPATCH@

=== xulrunner/app/xulrunner.js
==================================================================
--- xulrunner/xulrunner/app/xulrunner.js	(revision 17)
+++ xulrunner/xulrunner/app/xulrunner.js	(local)
@@ -39,7 +39,8 @@
 // We need to override the default values of these preferences since all.js
 // assumes these are in the navigator package, which for us is non-existant.
 // XXX(darin): perhaps all.js should not be seamonkey specific
-pref("general.useragent.locale", "@AB_CD@");
+pref("intl.locale.matchOS", true);
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
 pref("font.language.group", "chrome://global/locale/intl.properties");
 pref("intl.accept_languages", "chrome://global/locale/intl.properties");
 pref("intl.collationOption",  "chrome://global-platform/locale/intl.properties");



1.1                  src/patchsets/xulrunner/1.8.1.10/182_prefs.patch

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

Index: 182_prefs.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 82_prefs.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix font defaults.
## DP: Set javascript.options.showInConsole.

@DPATCH@

=== modules/libpref/src/init/all.js
==================================================================
--- xulrunner/modules/libpref/src/init/all.js	(revision 67)
+++ xulrunner/modules/libpref/src/init/all.js	(local)
@@ -439,6 +439,7 @@
 pref("javascript.enabled",                  true);
 pref("javascript.allow.mailnews",           false);
 pref("javascript.options.strict",           false);
+pref("javascript.options.showInConsole",    true);
 
 // advanced prefs
 pref("security.enable_java",                true);
@@ -1872,33 +1873,33 @@
 
 // th
 
-pref("font.name.serif.tr", "Times");
-pref("font.name.sans-serif.tr", "Helvetica");
-pref("font.name.monospace.tr", "Courier");
+pref("font.name.serif.tr", "serif");
+pref("font.name.sans-serif.tr", "sans-serif");
+pref("font.name.monospace.tr", "monospace");
 
 pref("font.name.serif.x-baltic", "serif");
 pref("font.name.sans-serif.x-baltic", "sans-serif");
 pref("font.name.monospace.x-baltic", "monospace");
 
-pref("font.name.serif.x-central-euro", "Times");
-pref("font.name.sans-serif.x-central-euro", "Helvetica");
-pref("font.name.monospace.x-central-euro", "Courier");
+pref("font.name.serif.x-central-euro", "serif");
+pref("font.name.sans-serif.x-central-euro", "sans-serif");
+pref("font.name.monospace.x-central-euro", "monospace");
 
 pref("font.name.serif.x-cyrillic", "serif");
 pref("font.name.sans-serif.x-cyrillic", "sans-serif");
 pref("font.name.monospace.x-cyrillic", "monospace");
 
-pref("font.name.serif.x-unicode", "Times");
-pref("font.name.sans-serif.x-unicode", "Helvetica");
-pref("font.name.monospace.x-unicode", "Courier");
+pref("font.name.serif.x-unicode", "serif");
+pref("font.name.sans-serif.x-unicode", "sans-serif");
+pref("font.name.monospace.x-unicode", "monospace");
 
-pref("font.name.serif.x-user-def", "Times");
-pref("font.name.sans-serif.x-user-def", "Helvetica");
-pref("font.name.monospace.x-user-def", "Courier");
+pref("font.name.serif.x-user-def", "serif");
+pref("font.name.sans-serif.x-user-def", "sans-serif");
+pref("font.name.monospace.x-user-def", "monospace");
 
-pref("font.name.serif.x-western", "Times");
-pref("font.name.sans-serif.x-western", "Helvetica");
-pref("font.name.monospace.x-western", "Courier");
+pref("font.name.serif.x-western", "serif");
+pref("font.name.sans-serif.x-western", "sans-serif");
+pref("font.name.monospace.x-western", "monospace");
 
 pref("font.name.serif.zh-CN", "serif");
 pref("font.name.sans-serif.zh-CN", "sans-serif");



1.1                  src/patchsets/xulrunner/1.8.1.10/185_installer.patch

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

Index: 185_installer.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 185_installer.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: - Install applications in /usr/local/lib instead of /usr/lib

@DPATCH@

=== xulrunner/setup/nsXULAppInstall.js
==================================================================
--- xulrunner/xulrunner/setup/nsXULAppInstall.js	(revision 72)
+++ xulrunner/xulrunner/setup/nsXULAppInstall.js	(local)
@@ -246,7 +246,7 @@
 #else
       aDirectory = Components.classes["@mozilla.org/file/local;1"].
         createInstance(nsILocalFile);
-      aDirectory.initWithPath("/usr/lib");
+      aDirectory.initWithPath("/usr/local/lib");
       if (vendor)
         aDirectory.append(vendor.toLowerCase());
 #endif



1.1                  src/patchsets/xulrunner/1.8.1.10/185_no_register.patch

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

Index: 185_no_register.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 185_no_register.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove (un|)registering system.

@DPATCH@

=== xulrunner/app/nsXULRunnerApp.cpp
==================================================================
--- xulrunner/xulrunner/app/nsXULRunnerApp.cpp	(revision 69)
+++ xulrunner/xulrunner/app/nsXULRunnerApp.cpp	(local)
@@ -43,7 +43,6 @@
 
 #include "nsXULAppAPI.h"
 #include "nsXPCOMGlue.h"
-#include "nsRegisterGRE.h"
 #include "nsAppRunner.h"
 #include "nsINIParser.h"
 #include "nsILocalFile.h"
@@ -264,12 +263,6 @@
            "  -h, --help                 show this message\n"
            "  -v, --version              show version\n"
            "  --gre-version              print the GRE version string on stdout\n"
-           "  --register-global          register this GRE in the machine registry\n"
-           "  --register-user            register this GRE in the user registry\n"
-           "  --unregister-global        unregister this GRE formerly registered with\n"
-           "                             --register-global\n"
-           "  --unregister-user          unregister this GRE formely registered with\n"
-           "                             --register-user\n"
            "  --find-gre <version>       Find a GRE with version <version> and print\n"
            "                             the path on stdout\n"
            "  --install-app <application> [<destination> [<directoryname>]]\n"
@@ -373,40 +366,6 @@
   }
 
   if (argc > 1) {
-    PRBool registerGlobal = IsArg(argv[1], "register-global");
-    PRBool registerUser   = IsArg(argv[1], "register-user");
-    if (registerGlobal || registerUser) {
-      if (argc != 2) {
-        Usage();
-        return 1;
-      }
-
-      nsCOMPtr<nsIFile> regDir;
-      nsresult rv = GetXULRunnerDir(argv[0], getter_AddRefs(regDir));
-      if (NS_FAILED(rv))
-        return 2;
-
-      return RegisterXULRunner(registerGlobal, regDir,
-                               kGREProperties,
-                               NS_ARRAY_LENGTH(kGREProperties)) ? 0 : 2;
-    }
-
-    registerGlobal = IsArg(argv[1], "unregister-global");
-    registerUser   = IsArg(argv[1], "unregister-user");
-    if (registerGlobal || registerUser) {
-      if (argc != 2) {
-        Usage();
-        return 1;
-      }
-
-      nsCOMPtr<nsIFile> regDir;
-      nsresult rv = GetXULRunnerDir(argv[0], getter_AddRefs(regDir));
-      if (NS_FAILED(rv))
-        return 2;
-      UnregisterXULRunner(registerGlobal, regDir);
-      return 0;
-    }
-
     if (IsArg(argv[1], "find-gre")) {
       if (argc != 3) {
         Usage();



1.1                  src/patchsets/xulrunner/1.8.1.10/185_sidebar.patch

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

Index: 185_sidebar.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 185_sidebar.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add sidebar component 

@DPATCH@

=== allmakefiles.sh
==================================================================
--- xulrunner/allmakefiles.sh	(revision 4)
+++ xulrunner/allmakefiles.sh	(local)
@@ -985,6 +985,9 @@
 toolkit/components/satchel/Makefile
 toolkit/components/satchel/public/Makefile
 toolkit/components/satchel/src/Makefile
+toolkit/components/sidebar/Makefile
+toolkit/components/sidebar/public/Makefile
+toolkit/components/sidebar/src/Makefile
 toolkit/components/startup/Makefile
 toolkit/components/startup/public/Makefile
 toolkit/components/startup/src/Makefile
=== toolkit/components/Makefile.in
==================================================================
--- xulrunner/toolkit/components/Makefile.in.orig	2007-03-18 02:55:06.000000000 +0100
+++ xulrunner/toolkit/components/Makefile.in	2007-03-18 02:56:45.000000000 +0100
@@ -73,6 +73,7 @@
 	history \
 	passwordmgr \
 	satchel \
+	sidebar \
 	$(NULL)
 endif # MOZ_THUNDERBIRD
 
=== toolkit/components/sidebar/Makefile.in
==================================================================
--- xulrunner/toolkit/components/sidebar/Makefile.in	(revision 4)
+++ xulrunner/toolkit/components/sidebar/Makefile.in	(local)
@@ -0,0 +1,48 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org Code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src
+
+include $(topsrcdir)/config/rules.mk
+
=== toolkit/components/sidebar/public/Makefile.in
==================================================================
--- xulrunner/toolkit/components/sidebar/public/Makefile.in	(revision 4)
+++ xulrunner/toolkit/components/sidebar/public/Makefile.in	(local)
@@ -0,0 +1,50 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org Code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= sidebar
+
+XPIDLSRCS	= nsISidebar.idl
+
+include $(topsrcdir)/config/rules.mk
+
=== toolkit/components/sidebar/public/nsISidebar.idl
==================================================================
--- xulrunner/toolkit/components/sidebar/public/nsISidebar.idl	(revision 4)
+++ xulrunner/toolkit/components/sidebar/public/nsISidebar.idl	(local)
@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+
+  The Sidebar API for 3rd parties
+
+*/
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(577CB745-8CAF-11d3-AAEF-00805F8A4905)]
+interface nsISidebar : nsISupports
+{
+    void addPanel(in wstring aTitle, in string aContentURL,
+                  in string aCustomizeURL);
+    void addPersistentPanel(in wstring aTitle, in string aContentURL,
+                            in string aCustomizeURL);
+    void addSearchEngine(in string engineURL, in string iconURL,
+                         in wstring suggestedTitle, in wstring suggestedCategory);
+};
+
+%{ C++
+// {577CB744-8CAF-11d3-AAEF-00805F8A4905} 
+#define NS_SIDEBAR_CID \
+{ 0x577cb744, 0x8caf, 0x11d3, { 0xaa, 0xef, 0x0, 0x80, 0x5f, 0x8a, 0x49, 0x5 } }
+
+#define NS_SIDEBAR_CONTRACTID "@mozilla.org/sidebar;1"
+%}
+
+/*
+ var isidebar = Components.interfaces.nsISidebar;
+ var csidebar = Components.classes['@mozilla.org/sidebar;1'];
+ var sidebar = csidebar.createInstance(isidebar);
+*/
=== toolkit/components/sidebar/src/Makefile.in
==================================================================
--- xulrunner/toolkit/components/sidebar/src/Makefile.in	(revision 4)
+++ xulrunner/toolkit/components/sidebar/src/Makefile.in	(local)
@@ -0,0 +1,48 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org Code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+EXTRA_COMPONENTS = nsSidebar.js
+
+include $(topsrcdir)/config/rules.mk
+
=== toolkit/components/sidebar/src/nsSidebar.js
==================================================================
--- xulrunner/toolkit/components/sidebar/src/nsSidebar.js	(revision 4)
+++ xulrunner/toolkit/components/sidebar/src/nsSidebar.js	(local)
@@ -0,0 +1,315 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stephen Lamm            <slamm@××××××××.com>
+ *   Robert John Churchill   <rjc@××××××××.com>
+ *   David Hyatt             <hyatt@×××××××.org>
+ *   Christopher A. Aillon   <christopher@××××××.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * No magic constructor behaviour, as is de rigeur for XPCOM.
+ * If you must perform some initialization, and it could possibly fail (even
+ * due to an out-of-memory condition), you should use an Init method, which
+ * can convey failure appropriately (thrown exception in JS,
+ * NS_FAILED(nsresult) return in C++).
+ *
+ * In JS, you can actually cheat, because a thrown exception will cause the
+ * CreateInstance call to fail in turn, but not all languages are so lucky.
+ * (Though ANSI C++ provides exceptions, they are verboten in Mozilla code
+ * for portability reasons -- and even when you're building completely
+ * platform-specific code, you can't throw across an XPCOM method boundary.)
+ */
+
+const DEBUG = false; /* set to false to suppress debug messages */
+
+const SIDEBAR_CONTRACTID        = "@mozilla.org/sidebar;1";
+const SIDEBAR_CID               = Components.ID("{22117140-9c6e-11d3-aaf1-00805f8a4905}");
+const NETSEARCH_CONTRACTID      = "@mozilla.org/rdf/datasource;1?name=internetsearch"
+const nsISupports               = Components.interfaces.nsISupports;
+const nsIFactory                = Components.interfaces.nsIFactory;
+const nsISidebar                = Components.interfaces.nsISidebar;
+const nsIInternetSearchService  = Components.interfaces.nsIInternetSearchService;
+const nsIClassInfo              = Components.interfaces.nsIClassInfo;
+
+function nsSidebar()
+{
+    const PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1";
+    const nsIPromptService = Components.interfaces.nsIPromptService;
+    this.promptService =
+        Components.classes[PROMPTSERVICE_CONTRACTID].getService(nsIPromptService);
+}
+
+nsSidebar.prototype.nc = "http://home.netscape.com/NC-rdf#";
+
+function sidebarURLSecurityCheck(url)
+{
+    if (url.search(/(^http:|^ftp:|^https:)/) == -1)
+        throw "Script attempted to add sidebar panel from illegal source";
+}
+
+/* decorate prototype to provide ``class'' methods and property accessors */
+nsSidebar.prototype.addPanel =
+function (aTitle, aContentURL, aCustomizeURL)
+{
+    debug("addPanel(" + aTitle + ", " + aContentURL + ", " +
+          aCustomizeURL + ")");
+   
+    return this.addPanelInternal(aTitle, aContentURL, aCustomizeURL, false);
+}
+
+nsSidebar.prototype.addPersistentPanel = 
+function(aTitle, aContentURL, aCustomizeURL)
+{
+    debug("addPersistentPanel(" + aTitle + ", " + aContentURL + ", " +
+           aCustomizeURL + ")\n");
+
+    return this.addPanelInternal(aTitle, aContentURL, aCustomizeURL, true);
+}
+
+nsSidebar.prototype.addPanelInternal =
+function (aTitle, aContentURL, aCustomizeURL, aPersist)
+{
+    var WINMEDSVC = Components.classes['@mozilla.org/appshell/window-mediator;1']
+                              .getService(Components.interfaces.nsIWindowMediator);
+    var win = WINMEDSVC.getMostRecentWindow( "navigator:browser" );
+                                                                                
+    sidebarURLSecurityCheck(aContentURL);
+    var dialogArgs = {
+      name: aTitle,
+      url: aContentURL,
+      bWebPanel: true
+    }
+    var features;
+    if (!/Mac/.test(win.navigator.platform))
+      features = "centerscreen,chrome,dialog,resizable,dependent";
+    else
+      features = "chrome,dialog,resizable,modal";
+    win.openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
+                   features, dialogArgs);
+}
+
+/* decorate prototype to provide ``class'' methods and property accessors */
+nsSidebar.prototype.addSearchEngine =
+function (engineURL, iconURL, suggestedTitle, suggestedCategory)
+{
+    debug("addSearchEngine(" + engineURL + ", " + iconURL + ", " +
+          suggestedCategory + ", " + suggestedTitle + ")");
+
+    try
+    {
+        // make sure using HTTP (for both engine as well as icon URLs)
+
+        if (engineURL.search(/^http:\/\//i) == -1)
+        {
+            debug ("must use HTTP to fetch search engine file");
+            throw Components.results.NS_ERROR_INVALID_ARG;
+        }
+
+        if (iconURL.search(/^http:\/\//i) == -1)
+        {
+            debug ("must use HTTP to fetch search icon file");
+            throw Components.results.NS_ERROR_INVALID_ARG;
+        }
+
+        // make sure engineURL refers to a .src file
+        if (engineURL.search(/\.src$/i) == -1)
+        {
+            debug ("engineURL doesn't reference a .src file");
+            throw Components.results.NS_ERROR_INVALID_ARG;
+        }
+
+        // make sure iconURL refers to a .gif/.jpg/.jpeg/.png file
+        if (iconURL.search(/\.(gif|jpg|jpeg|png)$/i) == -1)
+        {
+            debug ("iconURL doesn't reference a supported image file");
+            throw Components.results.NS_ERROR_INVALID_ARG;
+        }
+
+    }
+    catch(ex)
+    {
+        this.promptService.alert(null, "Failed to add the search engine.");
+        throw Components.results.NS_ERROR_INVALID_ARG;
+    }
+
+    var titleMessage, dialogMessage;
+    try {
+        var stringBundle = srGetStrBundle("chrome://browser/locale/sidebar/sidebar.properties");
+        if (stringBundle) {
+            titleMessage = stringBundle.GetStringFromName("addEngineConfirmTitle");
+            dialogMessage = stringBundle.GetStringFromName("addEngineConfirmMessage");
+            dialogMessage = dialogMessage.replace(/%title%/, suggestedTitle);
+            dialogMessage = dialogMessage.replace(/%category%/, suggestedCategory);
+            dialogMessage = dialogMessage.replace(/%url%/, engineURL);
+            dialogMessage = dialogMessage.replace(/#/g, "\n");
+        }
+    }
+    catch (e) {
+        titleMessage = "Add Search Engine";
+        dialogMessage = "Add the following search engine?\n\nName: " + suggestedTitle;
+        dialogMessage += "\nSearch Category: " + suggestedCategory;
+        dialogMessage += "\nSource: " + engineURL;
+    }
+          
+    var rv = this.promptService.confirm(null, titleMessage, dialogMessage);
+      
+    if (!rv)
+        return;
+
+    var internetSearch = Components.classes[NETSEARCH_CONTRACTID].getService();
+    if (internetSearch)    
+        internetSearch = internetSearch.QueryInterface(nsIInternetSearchService);
+    if (internetSearch)
+    {
+        internetSearch.AddSearchEngine(engineURL, iconURL, suggestedTitle,
+                                       suggestedCategory);
+    }
+}
+
+// property of nsIClassInfo
+nsSidebar.prototype.flags = nsIClassInfo.DOM_OBJECT;
+
+// property of nsIClassInfo
+nsSidebar.prototype.classDescription = "Sidebar";
+
+// method of nsIClassInfo
+nsSidebar.prototype.getInterfaces = function(count) {
+    var interfaceList = [nsISidebar, nsIClassInfo];
+    count.value = interfaceList.length;
+    return interfaceList;
+}
+
+// method of nsIClassInfo
+nsSidebar.prototype.getHelperForLanguage = function(count) {return null;}
+
+nsSidebar.prototype.QueryInterface =
+function (iid) {
+    if (!iid.equals(nsISidebar) && 
+        !iid.equals(nsIClassInfo) &&
+        !iid.equals(nsISupports))
+        throw Components.results.NS_ERROR_NO_INTERFACE;
+    return this;
+}
+
+var sidebarModule = new Object();
+
+sidebarModule.registerSelf =
+function (compMgr, fileSpec, location, type)
+{
+    debug("registering (all right -- a JavaScript module!)");
+    compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar);
+
+    compMgr.registerFactoryLocation(SIDEBAR_CID, 
+                                    "Sidebar JS Component",
+                                    SIDEBAR_CONTRACTID, 
+                                    fileSpec, 
+                                    location,
+                                    type);
+    const CATMAN_CONTRACTID = "@mozilla.org/categorymanager;1";
+    const nsICategoryManager = Components.interfaces.nsICategoryManager;
+    var catman = Components.classes[CATMAN_CONTRACTID].
+                            getService(nsICategoryManager);
+                            
+    const JAVASCRIPT_GLOBAL_PROPERTY_CATEGORY = "JavaScript global property";
+    catman.addCategoryEntry(JAVASCRIPT_GLOBAL_PROPERTY_CATEGORY,
+                            "sidebar",
+                            SIDEBAR_CONTRACTID,
+                            true,
+                            true);
+}
+
+sidebarModule.getClassObject =
+function (compMgr, cid, iid) {
+    if (!cid.equals(SIDEBAR_CID))
+        throw Components.results.NS_ERROR_NO_INTERFACE;
+    
+    if (!iid.equals(Components.interfaces.nsIFactory))
+        throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+    
+    return sidebarFactory;
+}
+
+sidebarModule.canUnload =
+function(compMgr)
+{
+    debug("Unloading component.");
+    return true;
+}
+    
+/* factory object */
+var sidebarFactory = new Object();
+
+sidebarFactory.createInstance =
+function (outer, iid) {
+    debug("CI: " + iid);
+    if (outer != null)
+        throw Components.results.NS_ERROR_NO_AGGREGATION;
+
+    return (new nsSidebar()).QueryInterface(iid);
+}
+
+/* entrypoint */
+function NSGetModule(compMgr, fileSpec) {
+    return sidebarModule;
+}
+
+/* static functions */
+if (DEBUG)
+    debug = function (s) { dump("-*- sidebar component: " + s + "\n"); }
+else
+    debug = function (s) {}
+
+var strBundleService = null;
+function srGetStrBundle(path)
+{
+   var strBundle = null;
+   if (!strBundleService) {
+       try {
+          strBundleService =
+          Components.classes["@mozilla.org/intl/stringbundle;1"].getService(); 
+          strBundleService = 
+          strBundleService.QueryInterface(Components.interfaces.nsIStringBundleService);
+       } catch (ex) {
+          dump("\n--** strBundleService failed: " + ex + "\n");
+          return null;
+      }
+   }
+   strBundle = strBundleService.createBundle(path); 
+   if (!strBundle) {
+       dump("\n--** strBundle createInstance failed **--\n");
+   }
+   return strBundle;
+}



1.1                  src/patchsets/xulrunner/1.8.1.10/185_useragent.patch

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

Index: 185_useragent.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 185_useragent.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove useless useragent setter at startup. bz#331783.

@DPATCH@

=== layout/build/Makefile.in
==================================================================
--- xulrunner/layout/build/Makefile.in	(revision 42)
+++ xulrunner/layout/build/Makefile.in	(local)
@@ -105,7 +105,6 @@
 
 CPPSRCS		= \
 		nsLayoutModule.cpp \
-		nsContentHTTPStartup.cpp \
 		nsContentDLF.cpp \
 		$(NULL)
 
=== layout/build/nsLayoutModule.cpp
==================================================================
--- xulrunner/layout/build/nsLayoutModule.cpp	(revision 42)
+++ xulrunner/layout/build/nsLayoutModule.cpp	(local)
@@ -43,7 +43,6 @@
 #include "nsCSSProps.h"                 // to addref/release table
 #include "nsColorNames.h"               // to addref/release table
 #include "nsContentCID.h"
-#include "nsContentHTTPStartup.h"
 #include "nsContentDLF.h"
 #include "nsContentPolicyUtils.h"
 #include "nsContentUtils.h"
@@ -593,7 +592,6 @@
 #ifdef MOZ_SVG
 MAKE_CTOR(CreateSVGRect,                  nsIDOMSVGRect,               NS_NewSVGRect)
 #endif
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsContentHTTPStartup)
 MAKE_CTOR(CreateContentDLF,               nsIDocumentLoaderFactory,    NS_NewContentDocumentLoaderFactory)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCSSOMFactory)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsInspectorCSSUtils)
@@ -1258,13 +1256,6 @@
     CreateSVGRect },
 #endif
 
-  { "Content HTTP Startup Listener",
-    NS_CONTENTHTTPSTARTUP_CID,
-    NS_CONTENTHTTPSTARTUP_CONTRACTID,
-    nsContentHTTPStartupConstructor,
-    nsContentHTTPStartup::RegisterHTTPStartup,
-    nsContentHTTPStartup::UnregisterHTTPStartup },
-
   { "Document Loader Factory",
     NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID,
     "@mozilla.org/content/document-loader-factory;1",



1.1                  src/patchsets/xulrunner/1.8.1.10/185_xpcomglue.patch

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

Index: 185_xpcomglue.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 185_xpcomglue.dpatch by Mike Hommey <glandium@××××××.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: - Build the xpcom glue as a shared library. Still hackish.
## DP: - Load DSOs from . when directory is not given.

@DPATCH@

=== xpcom/glue/Makefile.in
==================================================================
--- xulrunner/xpcom/glue/Makefile.in	(revision 62)
+++ xulrunner/xpcom/glue/Makefile.in	(local)
@@ -45,6 +45,7 @@
 
 DIRS            = standalone
 
+ifeq (1,0)
 MODULE		= xpcom
 LIBRARY_NAME	= xpcomglue_s
 
@@ -64,6 +65,7 @@
 		$(XPCOM_GLUE_SRC_LCPPSRCS) \
 		$(XPCOM_GLUENS_SRC_LCPPSRCS) \
 		$(NULL)
+endif
 
 EXPORTS		= \
 		pldhash.h \
@@ -96,6 +98,7 @@
 		nsVersionComparator.h \
 		$(NULL)
 
+ifeq (1,0)
 SDK_LIBRARY     =                        \
 		$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(NULL)
@@ -105,6 +108,7 @@
 
 # Force use of PIC
 FORCE_USE_PIC	= 1
+endif
 
 include $(topsrcdir)/config/rules.mk
 
=== xpcom/glue/standalone/Makefile.in
==================================================================
--- xulrunner/xpcom/glue/standalone/Makefile.in	(revision 62)
+++ xulrunner/xpcom/glue/standalone/Makefile.in	(local)
@@ -45,10 +45,15 @@
 
 MODULE		= xpcom
 LIBRARY_NAME	= xpcomglue
+SO_VERSION	= 1
+VISIBILITY_FLAGS=
 
 REQUIRES	= string \
 		  $(NULL)
 
+EXTRA_DSO_LDOPTS += $(NSSLIBS) \
+		$(NSPR_LIBS)
+
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../build \
 		$(NULL)
@@ -87,11 +91,11 @@
 		$(NULL)
 
 SDK_LIBRARY     	= \
-		$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
+		$(DLL_PREFIX)xpcomglue$(DLL_SUFFIX) \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
+#FORCE_STATIC_LIB = 1
 
 # Force use of PIC
 FORCE_USE_PIC	= 1
=== xpcom/glue/standalone/nsGlueLinking.h
==================================================================
--- xulrunner/xpcom/glue/standalone/nsGlueLinking.h	(revision 62)
+++ xulrunner/xpcom/glue/standalone/nsGlueLinking.h	(local)
@@ -42,15 +42,15 @@
 
 #define XPCOM_DEPENDENT_LIBS_LIST "dependentlibs.list"
 
-NS_HIDDEN_(GetFrozenFunctionsFunc)
+NS_EXPORT_(GetFrozenFunctionsFunc)
 XPCOMGlueLoad(const char *xpcomFile);
 
-NS_HIDDEN_(void)
+NS_EXPORT_(void)
 XPCOMGlueUnload();
 
 typedef void (*DependentLibsCallback)(const char *aDependentLib);
 
-NS_HIDDEN_(void)
+NS_EXPORT_(void)
 XPCOMGlueLoadDependentLibs(const char *xpcomDir, DependentLibsCallback cb);
 
 #endif // nsGlueLinking_h__
=== xpcom/glue/standalone/nsXPCOMGlue.h
==================================================================
--- xulrunner/xpcom/glue/standalone/nsXPCOMGlue.h	(revision 62)
+++ xulrunner/xpcom/glue/standalone/nsXPCOMGlue.h	(local)
@@ -99,7 +99,7 @@
  * Initialize the XPCOM glue by dynamically linking against the XPCOM
  * shared library indicated by xpcomFile.
  */
-extern "C" NS_HIDDEN_(nsresult)
+extern "C" NS_EXPORT_(nsresult)
 XPCOMGlueStartup(const char* xpcomFile);
 
 typedef void (*NSFuncPtr)();
@@ -118,13 +118,13 @@
  * @throws NS_ERROR_LOSS_OF_SIGNIFICANT_DATA if only some of the required
  *         functions were found.
  */
-extern "C" NS_HIDDEN_(nsresult)
+extern "C" NS_EXPORT_(nsresult)
 XPCOMGlueLoadXULFunctions(const nsDynamicFunctionLoad *symbols);
 
 /**
  * Finish the XPCOM glue after it is no longer needed.
  */
-extern "C" NS_HIDDEN_(nsresult)
+extern "C" NS_EXPORT_(nsresult)
 XPCOMGlueShutdown();
 
 
@@ -139,7 +139,7 @@
  *         not need to free this buffer.
  * @status DEPRECATED - Use GRE_GetGREPathWithProperties
  */
-extern "C" NS_HIDDEN_(char const *)
+extern "C" NS_EXPORT_(char const *)
 GRE_GetXPCOMPath();
 
 
@@ -148,7 +148,7 @@
  *
  * @param _retval   Ordinary XPCOM getter, returns an addrefed interface.
  */
-extern "C" NS_HIDDEN_(nsresult)
+extern "C" NS_EXPORT_(nsresult)
 GRE_GetGREDirectory(nsILocalFile* *_retval);
 
 
@@ -157,14 +157,14 @@
  * directoryserviceprovider may use GRE_Startup to start the XPCOM
  * glue and initialize the GRE in one step.
  */
-extern "C" NS_HIDDEN_(nsresult)
+extern "C" NS_EXPORT_(nsresult)
 GRE_Startup();
 
 
 /**
  * Shut down XPCOM and the XPCOM glue in one step.
  */
-extern "C" NS_HIDDEN_(nsresult)
+extern "C" NS_EXPORT_(nsresult)
 GRE_Shutdown();
 
 #endif // XPCOM_GLUE
=== xpcom/string/public/nsStringAPI.h
==================================================================
--- xulrunner/xpcom/string/public/nsStringAPI.h	(revision 62)
+++ xulrunner/xpcom/string/public/nsStringAPI.h	(local)
@@ -75,7 +75,7 @@
 #include "nscore.h"
 
 #if defined( XPCOM_GLUE )
-#define NS_STRINGAPI(type) extern "C" NS_HIDDEN_(type)
+#define NS_STRINGAPI(type) extern "C" NS_EXPORT_(type)
 #elif defined( _IMPL_NS_STRINGAPI )
 #define NS_STRINGAPI(type) extern "C" NS_EXPORT type
 #else
=== xpcom/tools/registry/Makefile.in
==================================================================
--- xulrunner/xpcom/tools/registry/Makefile.in	(revision 62)
+++ xulrunner/xpcom/tools/registry/Makefile.in	(local)
@@ -55,7 +55,6 @@
 
 LIBS            = \
 		$(XPCOM_STANDALONE_GLUE_LDOPTS) \
-		$(NSPR_LIBS) \
 		$(NULL)
 
 # Need to link with CoreFoundation on Mac
=== configure.in
==================================================================
--- xulrunner/configure.in	(revision 62)
+++ xulrunner/configure.in	(local)
@@ -754,7 +754,7 @@
 XPCOM_FROZEN_LDOPTS='-L$(DIST)/bin $(MOZ_FIX_LINK_PATHS) -lxpcom'
 LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
 XPCOM_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
-XPCOM_STANDALONE_GLUE_LDOPTS='$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX)'
+XPCOM_STANDALONE_GLUE_LDOPTS='-L$(DIST)/lib -lxpcomglue'
 
 MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)'
 MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat'
=== xpcom/glue/standalone/nsGlueLinkingDlopen.cpp
==================================================================
--- xulrunner/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp	(revision 65)
+++ xulrunner/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp	(local)
@@ -86,20 +86,22 @@
 GetFrozenFunctionsFunc
 XPCOMGlueLoad(const char *xpcomFile)
 {
-    char xpcomDir[MAXPATHLEN];
-    if (realpath(xpcomFile, xpcomDir)) {
-        char *lastSlash = strrchr(xpcomDir, '/');
-        if (lastSlash) {
-            *lastSlash = '\0';
+    char xulFile[MAXPATHLEN];
+    char *lastSlash = strrchr(xpcomFile, '/');
+    if (!lastSlash) {
+        snprintf(xulFile, MAXPATHLEN, "./%s", xpcomFile);
+        return XPCOMGlueLoad(xulFile);
+    }
+    *lastSlash = '\0';
 
-            XPCOMGlueLoadDependentLibs(xpcomDir, ReadDependentCB);
+    XPCOMGlueLoadDependentLibs(xpcomFile, ReadDependentCB);
 
-            snprintf(lastSlash, MAXPATHLEN - strlen(xpcomDir), "/" XUL_DLL);
+    snprintf(xulFile, MAXPATHLEN - strlen(xpcomFile), "%s/" XUL_DLL, xpcomFile);
 
-            sXULLibHandle = dlopen(xpcomDir, RTLD_GLOBAL | RTLD_LAZY);
-        }
-    }
+    sXULLibHandle = dlopen(xulFile, RTLD_GLOBAL | RTLD_LAZY);
 
+    *lastSlash = '/';
+
     // RTLD_DEFAULT is not defined in non-GNU toolchains, and it is
     // (void*) 0 in any case.
 



1.1                  src/patchsets/xulrunner/1.8.1.10/300_firefox-1.5-makeopts.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/300_firefox-1.5-makeopts.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/300_firefox-1.5-makeopts.patch?rev=1.1&content-type=text/plain

Index: 300_firefox-1.5-makeopts.patch
===================================================================
--- Makefile.in-orig	2006-01-31 14:25:38.508639384 -0600
+++ Makefile.in	2006-01-31 14:25:52.018585560 -0600
@@ -58,6 +58,7 @@
 	$(MAKE) -C config export
 	$(MAKE) nspr
 	$(MAKE) ldap
+	$(MAKE) -C parser/expat
 	$(MAKE) tier_0
 	$(MAKE) tier_1
 	$(MAKE) tier_2



1.1                  src/patchsets/xulrunner/1.8.1.10/401_firefox-1.5-theme-change.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/401_firefox-1.5-theme-change.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/401_firefox-1.5-theme-change.patch?rev=1.1&content-type=text/plain

Index: 401_firefox-1.5-theme-change.patch
===================================================================
Index: layout/base/nsPresContext.cpp
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsPresContext.cpp,v
retrieving revision 3.288.12.2.4.1
diff -d -u -p -r3.288.12.2.4.1 nsPresContext.cpp
--- layout/base/nsPresContext.cpp	21 Apr 2006 23:30:50 -0000	3.288.12.2.4.1
+++ layout/base/nsPresContext.cpp	26 Sep 2006 19:26:40 -0000
@@ -73,6 +73,9 @@
 #include "nsIDOMDocument.h"
 #include "nsAutoPtr.h"
 #include "nsEventStateManager.h"
+#include "nsIEventQueue.h"
+#include "nsIEventQueueService.h"
+
 #ifdef IBMBIDI
 #include "nsBidiPresUtils.h"
 #endif // IBMBIDI
@@ -267,6 +270,7 @@ nsPresContext::~nsPresContext()
   NS_IF_RELEASE(mDeviceContext);
   NS_IF_RELEASE(mLookAndFeel);
   NS_IF_RELEASE(mLangGroup);
+  NS_IF_RELEASE(mEventQueueService);
 }
 
 NS_IMPL_ISUPPORTS2(nsPresContext, nsPresContext, nsIObserver)
@@ -285,6 +289,17 @@ static const char* const kGenericFont[] 
   ".fantasy."
 };
 
+// Set to true when LookAndFeelChanged needs to be called.  This is used
+// because the look and feel is a service, so there's no need to notify it from
+// more than one prescontext.
+static PRBool sLookAndFeelChanged;
+
+// Set to true when ThemeChanged needs to be called on mTheme.  This is used
+// because mTheme is a service, so there's no need to notify it from more than
+// one prescontext.
+static PRBool sThemeChanged;
+
+
 void
 nsPresContext::GetFontPreferences()
 {
@@ -709,6 +724,9 @@ nsPresContext::Init(nsIDeviceContext* aD
                                        this);
 #endif
 
+  rv = CallGetService(NS_EVENTQUEUESERVICE_CONTRACTID, &mEventQueueService);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   // Initialize our state from the user preferences
   GetUserPreferences();
 
@@ -1180,33 +1198,126 @@ nsPresContext::GetTheme()
 void
 nsPresContext::ThemeChanged()
 {
+  if (!mPendingThemeChanged) {
+    sLookAndFeelChanged = PR_TRUE;
+    sThemeChanged = PR_TRUE;
+
+    nsCOMPtr<nsIEventQueue> eventQ;
+    mEventQueueService->
+      GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
+                           getter_AddRefs(eventQ));
+    if (!eventQ) {
+      return;
+    }
+
+    PLEvent* evt = new PLEvent();
+    if (!evt) {
+      return;
+    }
+
+    PL_InitEvent(evt, this, nsPresContext::ThemeChangedInternal,
+                 nsPresContext::DestroyThemeChangeEvt);
+
+    // After this point, event destruction will release |this|
+    NS_ADDREF_THIS();
+
+    nsresult rv = eventQ->PostEvent(evt);
+    if (NS_FAILED(rv)) {
+      PL_DestroyEvent(evt);
+    } else {
+      mPendingThemeChanged = PR_TRUE;
+    }
+  }    
+}
+
+void* PR_CALLBACK
+nsPresContext::ThemeChangedInternal(PLEvent *aEvent)
+{
+  nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner);
+
+  pc->mPendingThemeChanged = PR_FALSE;
+
   // Tell the theme that it changed, so it can flush any handles to stale theme
   // data.
-  if (mTheme)
-    mTheme->ThemeChanged();
+  if (pc->mTheme && sThemeChanged) {
+    pc->mTheme->ThemeChanged();
+    sThemeChanged = PR_FALSE;
+  }
 
   // Clear all cached nsILookAndFeel colors.
-  if (mLookAndFeel)
-    mLookAndFeel->LookAndFeelChanged();
+  if (pc->mLookAndFeel && sLookAndFeelChanged) {
+    pc->mLookAndFeel->LookAndFeelChanged();
+    sLookAndFeelChanged = PR_FALSE;
+  }
 
   // We have to clear style data because the assumption of style rule
   // immutability has been violated since any style rule that uses
   // system colors or fonts (and probably -moz-appearance as well) has
   // changed.
-  nsPresContext::ClearStyleDataAndReflow();
+  pc->ClearStyleDataAndReflow();
+
+  return nsnull;
+}
+
+
+void PR_CALLBACK
+nsPresContext::DestroyThemeChangeEvt(PLEvent* aEvent)
+{
+  nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner);
+  NS_RELEASE(pc);
+  delete aEvent;
 }
 
 void
 nsPresContext::SysColorChanged()
 {
-  if (mLookAndFeel) {
+  if (!mPendingSysColorChanged) {
+    sLookAndFeelChanged = PR_TRUE;
+
+    nsCOMPtr<nsIEventQueue> eventQ;
+    mEventQueueService->
+      GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
+                           getter_AddRefs(eventQ));
+    if (!eventQ) {
+      return;
+    }
+
+    PLEvent* evt = new PLEvent();
+    if (!evt) {
+      return;
+    }
+
+    PL_InitEvent(evt, this, nsPresContext::SysColorChangedInternal,
+                 nsPresContext::DestroySysColorChangeEvt);
+
+    // After this point, event destruction will release |this|
+    NS_ADDREF_THIS();
+
+    nsresult rv = eventQ->PostEvent(evt);
+    if (NS_FAILED(rv)) {
+      PL_DestroyEvent(evt);
+    } else {
+      mPendingSysColorChanged = PR_TRUE;
+    }
+  }
+}
+
+void* PR_CALLBACK
+nsPresContext::SysColorChangedInternal(PLEvent *aEvent)
+{
+  nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner);
+
+  pc->mPendingSysColorChanged = PR_FALSE;
+  
+  if (pc->mLookAndFeel && sLookAndFeelChanged) {
      // Don't use the cached values for the system colors
-    mLookAndFeel->LookAndFeelChanged();
+    pc->mLookAndFeel->LookAndFeelChanged();
+    sLookAndFeelChanged = PR_FALSE;
   }
-   
+
   // Reset default background and foreground colors for the document since
   // they may be using system colors
-  GetDocumentColorPreferences();
+  pc->GetDocumentColorPreferences();
 
   // Clear out all of the style data since it may contain RGB values
   // which originated from system colors.
@@ -1222,7 +1333,17 @@ nsPresContext::SysColorChanged()
   // data without reflowing/updating views will lead to incorrect change hints
   // later, because when generating change hints, any style structs which have
   // been cleared and not reread are assumed to not be used at all.
-  ClearStyleDataAndReflow();
+  pc->ClearStyleDataAndReflow();
+
+  return nsnull;
+}
+
+void PR_CALLBACK
+nsPresContext::DestroySysColorChangeEvt(PLEvent* aEvent)
+{
+  nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner);
+  NS_RELEASE(pc);
+  delete aEvent;
 }
 
 void
Index: layout/base/nsPresContext.h
===================================================================
RCS file: /cvsroot/mozilla/layout/base/nsPresContext.h,v
retrieving revision 3.150.4.2
diff -d -u -p -r3.150.4.2 nsPresContext.h
--- layout/base/nsPresContext.h	29 Aug 2005 16:15:39 -0000	3.150.4.2
+++ layout/base/nsPresContext.h	26 Sep 2006 19:26:40 -0000
@@ -56,6 +56,7 @@
 #include "nsCRT.h"
 #include "nsIPrintSettings.h"
 #include "nsPropertyTable.h"
+#include "plevent.h"
 #ifdef IBMBIDI
 class nsBidiPresUtils;
 #endif // IBMBIDI
@@ -76,6 +77,7 @@ class nsIAtom;
 class nsIEventStateManager;
 class nsIURI;
 class nsILookAndFeel;
+class nsIEventQueueService;
 class nsICSSPseudoComparator;
 class nsIAtom;
 struct nsStyleStruct;
@@ -627,6 +629,14 @@ public:
   const nscoord* GetBorderWidthTable() { return mBorderWidthTable; }
 
 protected:
+  static NS_HIDDEN_(void*) PR_CALLBACK ThemeChangedInternal(PLEvent* aEvent);
+  static NS_HIDDEN_(void*) PR_CALLBACK SysColorChangedInternal(PLEvent* aEvent);
+  static NS_HIDDEN_(void) PR_CALLBACK DestroyThemeChangeEvt(PLEvent* aEvent);
+  static NS_HIDDEN_(void) PR_CALLBACK DestroySysColorChangeEvt(PLEvent* aEvent);
+
+  friend void* PR_CALLBACK ThemeChangedInternal(PLEvent* aEvent);
+  friend void* PR_CALLBACK SysColorChangedInternal(PLEvent* aEvent);
+
   NS_HIDDEN_(void) SetImgAnimations(nsIContent *aParent, PRUint16 aMode);
   NS_HIDDEN_(void) GetDocumentColorPreferences();
 
@@ -654,6 +664,7 @@ protected:
                                         // from gfx back to layout.
   nsIEventStateManager* mEventManager;  // [STRONG]
   nsILookAndFeel*       mLookAndFeel;   // [STRONG]
+  nsIEventQueueService *mEventQueueService; // [STRONG]
   nsIAtom*              mMedium;        // initialized by subclass ctors;
                                         // weak pointer to static atom
 
@@ -724,6 +735,8 @@ protected:
   unsigned              mCanPaginatedScroll : 1;
   unsigned              mDoScaledTwips : 1;
   unsigned              mEnableJapaneseTransform : 1;
+  unsigned              mPendingSysColorChanged : 1;
+  unsigned              mPendingThemeChanged : 1;
 #ifdef IBMBIDI
   unsigned              mIsVisual : 1;
   unsigned              mIsBidiSystem : 1;



1.1                  src/patchsets/xulrunner/1.8.1.10/402_firefox-2.0-pango-cursor.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/402_firefox-2.0-pango-cursor.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/402_firefox-2.0-pango-cursor.patch?rev=1.1&content-type=text/plain

Index: 402_firefox-2.0-pango-cursor.patch
===================================================================
# Upstream bug #335810

Index: mozilla/gfx/src/gtk/nsFontMetricsPango.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp,v
retrieving revision 1.24
diff -d -u -p -6 -r1.24 nsFontMetricsPango.cpp
--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	25 Aug 2006 01:02:34 -0000	1.24
+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	6 Sep 2006 07:01:49 -0000
@@ -948,13 +948,12 @@ nsFontMetricsPango::GetClusterInfo(const
 PRInt32
 nsFontMetricsPango::GetPosition(const PRUnichar *aText, PRUint32 aLength,
                                 nsPoint aPt)
 {
     int trailing = 0;
     int inx = 0;
-    gboolean found = FALSE;
     const gchar *curChar;
     PRInt32 retval = 0;
 
     float f = mDeviceContext->AppUnitsToDevUnits();
     
     PangoLayout *layout = pango_layout_new(mPangoContext);
@@ -974,28 +973,18 @@ nsFontMetricsPango::GetPosition(const PR
     }
 
     // Set up the pango layout
     pango_layout_set_text(layout, text, strlen(text));
     FixupSpaceWidths(layout, text);
     
-    found = pango_layout_xy_to_index(layout, localX, localY,
-                                     &inx, &trailing);
+    pango_layout_xy_to_index(layout, localX, localY,
+                             &inx, &trailing);
 
     // Convert the index back to the utf-16 index
     curChar = text;
 
-    // Jump to the end if it's not found.
-    if (!found) {
-        if (inx == 0)
-            retval = 0;
-        else if (trailing)
-            retval = aLength;
-
-        goto loser;
-    }
-
     for (PRUint32 curOffset=0; curOffset < aLength;
          curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) {
 
         // Check for a match before checking for a surrogate pair
         if (curChar - text == inx) {
             retval = curOffset;



1.1                  src/patchsets/xulrunner/1.8.1.10/501_firefox-2.0-gtk-cursors.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/501_firefox-2.0-gtk-cursors.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/501_firefox-2.0-gtk-cursors.patch?rev=1.1&content-type=text/plain

Index: 501_firefox-2.0-gtk-cursors.patch
===================================================================
## 501_firefox-2.0-gtk-cursors-patch
##
## All lines beginning with `## GP:' are a description of the patch.
## GP: use X cursor theme for more cursors. bz#310924

--- widget/src/gtk2/nsWindow.cpp	2006-01-09 05:48:56.000000000 +0000
+++ widget/src/gtk2/nsWindow.cpp	2006-08-09 18:51:41.000000000 +0000
@@ -3512,15 +3512,19 @@
         gdkcursor = gdk_cursor_new(GDK_FLEUR);
         break;
     case eCursor_help:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "help");
         newType = MOZ_CURSOR_QUESTION_ARROW;
         break;
     case eCursor_copy: // CSS3
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "copy");
         newType = MOZ_CURSOR_COPY;
         break;
     case eCursor_alias:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "alias");
         newType = MOZ_CURSOR_ALIAS;
         break;
     case eCursor_context_menu:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "context-menu");
         newType = MOZ_CURSOR_CONTEXT_MENU;
         break;
     case eCursor_cell:
@@ -3533,6 +3537,7 @@
         newType = MOZ_CURSOR_HAND_GRABBING;
         break;
     case eCursor_spinning:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "wait"); // or maybe "progress" ?
         newType = MOZ_CURSOR_SPINNING;
         break;
     case eCursor_zoom_in:
@@ -3542,25 +3547,34 @@
         newType = MOZ_CURSOR_ZOOM_OUT;
         break;
     case eCursor_not_allowed:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "not-allowed");
+        newType = MOZ_CURSOR_NOT_ALLOWED;
+        break;
     case eCursor_no_drop:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "no-drop");
         newType = MOZ_CURSOR_NOT_ALLOWED;
         break;
     case eCursor_col_resize:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "col-resize");
         newType = MOZ_CURSOR_COL_RESIZE;
         break;
     case eCursor_row_resize:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "row-resize");
         newType = MOZ_CURSOR_ROW_RESIZE;
         break;
     case eCursor_vertical_text:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "vertical-text");
         newType = MOZ_CURSOR_VERTICAL_TEXT;
         break;
     case eCursor_all_scroll:
         gdkcursor = gdk_cursor_new(GDK_FLEUR);
         break;
     case eCursor_nesw_resize:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "nesw-resize");
         newType = MOZ_CURSOR_NESW_RESIZE;
         break;
     case eCursor_nwse_resize:
+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "nwse-resize");
         newType = MOZ_CURSOR_NWSE_RESIZE;
         break;
     case eCursor_ns_resize:
@@ -3577,7 +3591,7 @@
 
     // if by now we dont have a xcursor, this means we have to make a
     // custom one
-    if (newType != 0xff) {
+    if (!gdkcursor && newType != 0xff) {
         gdk_color_parse("#000000", &fg);
         gdk_color_parse("#ffffff", &bg);
 



1.1                  src/patchsets/xulrunner/1.8.1.10/502_xulrunner-2.0-window-blur.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/502_xulrunner-2.0-window-blur.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/502_xulrunner-2.0-window-blur.patch?rev=1.1&content-type=text/plain

Index: 502_xulrunner-2.0-window-blur.patch
===================================================================
## 502_xulrunner-2.0-window-blur.patch
##
## All lines beginning with `## GP:' are a description of the patch.
## GP: window.blur() fails on popup window in gtkmozembed. bz#325644

--- dom/src/base/nsGlobalWindow.cpp	2006-06-29 05:24:47.000000000 +0000
+++ dom/src/base/nsGlobalWindow.cpp	2006-08-09 18:55:49.000000000 +0000
@@ -3571,7 +3571,9 @@
   if (NS_SUCCEEDED(rv))
     mDocShell->SetHasFocus(PR_FALSE);
 
-  return rv;
+  // If embedding apps don't implement nsIEmbeddingSiteWindow2, we
+  // shouldn't throw to web content.
+  return NS_OK;
 }
 
 NS_IMETHODIMP



1.1                  src/patchsets/xulrunner/1.8.1.10/600_python_dynamic.patch

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

Index: 600_python_dynamic.patch
===================================================================
--- configure.in.orig	2007-03-25 20:41:24.000000000 +0200
+++ configure.in	2007-03-25 22:09:40.000000000 +0200
@@ -6909,8 +6909,8 @@
     else
         dnl Non-Windows include and libs
         MOZ_PYTHON_DLL_SUFFIX=$DLL_SUFFIX
-        PYTHON_INCLUDE_SRC=$MOZ_PYTHON_PREFIX/include/python$MOZ_PYTHON_VER_DOTTED
-        PYTHON_LIB_SRC=`$PYTHON  -c 'from distutils import sysconfig; print sysconfig.get_config_var("LIBPL")'`
+        PYTHON_INCLUDE_SRC=`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_config_var("INCLUDEPY")'`
+        PYTHON_LIB_SRC=`$PYTHON  -c 'from distutils import sysconfig; print sysconfig.get_config_var("LIBDIR")'`
         if test ! -f $PYTHON_INCLUDE_SRC/Python.h; then
             AC_MSG_ERROR([Include directory $PYTHON_INCLUDE_SRC not found or does not contain development headers])
         fi



1.1                  src/patchsets/xulrunner/1.8.1.10/610_xpcom_sample.patch

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

Index: 610_xpcom_sample.patch
===================================================================
--- xpcom/sample/Makefile.in.orig	2007-04-18 05:24:25.000000000 +0200
+++ xpcom/sample/Makefile.in	2007-04-18 05:25:16.000000000 +0200
@@ -89,7 +89,7 @@
 # from this Makefile. We link against the "dependent glue" and against the
 # frozen XPCOM shared library.
 EXTRA_DSO_LDOPTS = \
-		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
+		$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 



1.1                  src/patchsets/xulrunner/1.8.1.10/801_fbsd-1.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/801_fbsd-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/801_fbsd-1.patch?rev=1.1&content-type=text/plain

Index: 801_fbsd-1.patch
===================================================================
--- mozilla/config/rules.mk.orig	2007-07-04 17:34:35.000000000 +0000
+++ mozilla/config/rules.mk	2007-07-04 17:34:58.000000000 +0000
@@ -137,9 +137,9 @@
 
 ifdef SO_VERSION
 ifneq (,$(findstring $(SONAME),$(MKSHLIB)))
-SO_VERSION_MAJOR	:= $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\1/')
-SO_VERSION_MINOR	:= $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\2/')
-SO_VERSION_MICRO	:= $(shell echo $(SO_VERSION) | sed 's/^\([^.]*\)\(\.[^.]*\)\?\(\.[^.]*\)\?/\3/')
+SO_VERSION_MAJOR   := $(shell echo $(SO_VERSION) | sed -n -e 's/^\([^.]*\).*/\1/p')
+SO_VERSION_MINOR   := $(shell echo $(SO_VERSION) | sed -n -e 's/^\([^.]*\)\(\.[^.]*\).*/\2/p')
+SO_VERSION_MICRO   := $(shell echo $(SO_VERSION) | sed -n -e 's/^\([^.]*\)\(\.[^.]*\)\(\.[^.]*\).*/\3/p')
 
 SHARED_LIBRARY_LINKS	:= $(SONAME)
 ifdef SO_VERSION_MINOR


1.1                  src/patchsets/xulrunner/1.8.1.10/802_fbsd-2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/802_fbsd-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/802_fbsd-2.patch?rev=1.1&content-type=text/plain

Index: 802_fbsd-2.patch
===================================================================
--- mozilla/configure.in.orig	2007-07-04 17:42:33.000000000 +0000
+++ mozilla/configure.in	2007-07-04 17:43:08.000000000 +0000
@@ -7563,6 +7563,7 @@
 AC_CONFIG_HEADER(
 gfx/gfx-config.h
 netwerk/necko-config.h
+intl/uconv/native/config.h
 xpcom/xpcom-config.h
 xpcom/xpcom-private.h
 )
diff -Nur mozilla/intl/uconv/native/config.h.in mozilla/intl/uconv/native/config.h.in
--- mozilla/intl/uconv/native/config.h.in 1970-01-01 01:00:00 +0100
+++ mozilla/intl/uconv/native/config.h.in 2007-07-03 14:53:53 +0100
@@ -0,0 +1,2 @@
+/* Define if iconv() supports const input */
+#undef HAVE_ICONV_WITH_CONST_INPUT
diff -Nur mozilla/intl/uconv/native/nsNativeUConvService.cpp mozilla/intl/uconv/native/nsNativeUConvService.cpp
--- mozilla/intl/uconv/native/nsNativeUConvService.cpp    2007-07-03 15:10:08 +0100
+++ mozilla/intl/uconv/native/nsNativeUConvService.cpp    2007-07-03 15:05:07 +0100
@@ -37,6 +37,7 @@


 #ifdef MOZ_USE_NATIVE_UCONV
+#include "config.h"
 #include "nsString.h"
 #include "nsIGenericFactory.h"

@@ -227,7 +228,11 @@

     do {
         if ( iconv(mConverter,
+#ifdef HAVE_ICONV_WITH_CONST_INPUT
+                   (const char **)&aSrc,
+#else
                    (char **)&aSrc,
+#endif
                    &inLeft,
                    (char **)&aDest,
                    &outLeft) == (size_t) -1 ) {
@@ -374,7 +379,11 @@

     do {
         if ( iconv(mConverter,
+#ifdef HAVE_ICONV_WITH_CONST_INPUT
+                   (const char **)&aSrc,
+#else
                    (char **)&aSrc,
+#endif
                    &inLeft,
                    (char **)&aDest,
                    &outLeft) == (size_t) -1 ) {


1.1                  src/patchsets/xulrunner/1.8.1.10/803_fbsd-3.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/803_fbsd-3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.8.1.10/803_fbsd-3.patch?rev=1.1&content-type=text/plain

Index: 803_fbsd-3.patch
===================================================================
--- a/config/rules.mk	2007-07-03 17:39:53 +0100
+++ b/config/rules.mk	2007-07-03 17:41:50 +0100
@@ -462,6 +462,8 @@
 endif
 
 ifeq ($(OS_ARCH),FreeBSD)
+DSO_LDOPTS += -Wl,-rpath,'$(mozappdir)'
+OS_LDFLAGS += -Wl,-rpath,'$(mozappdir)'
 EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
 endif
 



-- 
gentoo-commits@g.o mailing list