- Update to firefox-rc1

- Add patch for s390(x)

5 files changed, 124 insertions, 33 deletions

diff --git a/.cvsignore b/.cvsignore
index 86710eb..003b547 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 firefox-0.9.3-source.tar.bz2
 firefox-1.0PR-source.tar.bz2
 firefox-0.10.1-source.tar.bz2
+firefox-1.0rc1-source.tar.bz2
diff --git a/firefox-redhat-homepage.patch b/firefox-redhat-homepage.patch
index 9449dbd..d9371fb 100644
--- a/firefox-redhat-homepage.patch
+++ b/firefox-redhat-homepage.patch
@@ -1,3 +1,13 @@
+Index: browser/app/profile/firefox.js
+===================================================================
+RCS file: /cvsroot/mozilla/browser/app/profile/firefox.js,v
+retrieving revision 1.7.4.38
+diff -d -u -p -U0 -r1.7.4.38 firefox.js
+--- browser/app/profile/firefox.js      26 Oct 2004 22:44:47 -0000      1.7.4.38
++++ browser/app/profile/firefox.js      30 Oct 2004 22:28:34 -0000
+@@ -144 +144 @@ pref("browser.startup.page",
+-pref("browser.startup.homepage",                 "resource:/browserconfig.properties");
++pref("browser.startup.homepage",                 "chrome://browser-region/locale/region.properties");
 Index: browser/locales/en-US/chrome/browser-region/region.properties
 ===================================================================
 RCS file: /cvsroot/mozilla/browser/locales/en-US/chrome/browser-region/region.properties,v
@@ -9,7 +19,7 @@ diff -d -u -p -0 -r1.1.2.3 region.properties
 -homePageDefault=http://www.mozilla.org/products/firefox/start/
 +homePageDefault=file:///usr/share/doc/HTML/index.html
 @@ -10 +10 @@ promoteURL=http://www.spreadfirefox.com/
--browser.startup.homepage=http://www.mozilla.org/products/firefox/start/
+-browser.startup.homepage=http://start.mozilla.org/firefox/
 +browser.startup.homepage=file:///usr/share/doc/HTML/index.html
 @@ -15 +15 @@ browser.search.defaulturl=http://www.goo
 -startup.homepage_override_url=http://www.mozilla.org/products/firefox/start/
diff --git a/firefox.spec b/firefox.spec
index a81f52c..58c2beb 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -3,17 +3,18 @@
 
 %define desktop_file_utils_version 0.9
 
-ExclusiveArch: i386 x86_64 ia64 ppc
+ExclusiveArch: i386 x86_64 ia64 ppc s390 s390x
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        0.10.1
-Release:        1.0PR1.21
+Version:        0.99
+Release:        1.0RC1.1
 Epoch:          0
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
-Source0:        firefox-%{version}-source.tar.bz2
+#Source0:        firefox-%{version}-source.tar.bz2
+Source0:        firefox-1.0rc1-source.tar.bz2
 Source1:        firefox-redhat-default-bookmarks.html
 Source2:        mozconfig-firefox
 Source3:        firefox.desktop
@@ -27,7 +28,6 @@ Source100:      find-external-requires
 
 # build patches
 Patch1:         firefox-0.7.3-freetype-compile.patch
-Patch2:         firefox-PR1-oji-gcc342-compile.patch
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
@@ -42,23 +42,11 @@ Patch40:        firefox-PR1-gnome-vfs-default-app.patch
 Patch41:        firefox-PR1-stack-direction.patch
 
 # backported patches
-Patch90:        firefox-PR1-gtk-file-chooser-trunk.patch
-Patch91:        firefox-PR1-gtk-file-chooser-updates.patch
-Patch92:        firefox-PR1-gtk-file-chooser-morefixes.patch
+Patch90:        firefox-PR1-gtk-file-chooser-morefixes.patch
 
 # official upstream patches
-Patch100:       firefox-PR1-js-64bit-math.patch
 Patch101:       firefox-PR1-pkgconfig.patch
-Patch102:       firefox-PR1-clipboard-access.patch
-Patch103:       firefox-PR1-alt-num-tab-switch.patch
-Patch104:       firefox-PR1-button-focus.patch
-Patch105:       firefox-PR1-tab-focus-stealing.patch
-Patch106:       firefox-PR1-tab-focus-stealing2.patch
-Patch107:       firefox-PR1-access-64bit-crash.patch
-Patch108:       firefox-PR1-defaultHeight.patch
-Patch109:       firefox-PR1-bug262689.patch
-Patch110:       firefox-PR1-bug263263.patch
-
+Patch102:       mozilla-1.7.3-xptcall-s390.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libpng-devel, libjpeg-devel
@@ -89,7 +77,6 @@ compliance, performance and portability.
 %if %{freetype_fc3}
 %patch1 -p0
 %endif
-%patch2 -p0
 %patch20 -p0
 %patch21 -p1
 %patch22 -p1
@@ -99,19 +86,8 @@ compliance, performance and portability.
 %patch40 -p1
 %patch41 -p0
 %patch90 -p0
-%patch91 -p1
-%patch92 -p0
-%patch100 -p0
 %patch101 -p0
 %patch102 -p0
-%patch103 -p0
-%patch104 -p0
-%patch105 -p0
-%patch106 -p0
-%patch107 -p0
-%patch108 -p1
-%patch109 -p0
-%patch110 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE2} .mozconfig
@@ -227,6 +203,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Oct 30 2004 Christopher Aillon <caillon@redhat.com> 0:0.90-1.0RC1.1
+- Update to firefox-rc1
+- Add patch for s390(x)
+
 * Tue Oct 26 2004 Christopher Aillon <caillon@redhat.com>
 - Fix LD_LIBRARY_PATH at startup (Steve Knodle)
 
diff --git a/mozilla-1.7.3-xptcall-s390.patch b/mozilla-1.7.3-xptcall-s390.patch
new file mode 100644
index 0000000..995d352
--- /dev/null
+++ b/mozilla-1.7.3-xptcall-s390.patch
@@ -0,0 +1,100 @@
+Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp,v
+retrieving revision 1.1
+diff -u -p -r1.1 xptcinvoke_linux_s390.cpp
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp	27 Jan 2003 21:52:51 -0000	1.1
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp	14 Oct 2004 09:14:05 -0000
+@@ -184,6 +184,8 @@ invoke_copy_to_stack(PRUint32 paramCount
+     }
+ }
+ 
++volatile register void* r14 asm("r14");
++
+ XPTC_PUBLIC_API(nsresult)
+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                    PRUint32 paramCount, nsXPTCVariant* params)
+@@ -197,6 +199,8 @@ XPTC_InvokeByIndex(nsISupports* that, PR
+     PRUint32 overflow = invoke_count_words (paramCount, params);
+     PRUint32 result;
+ 
++    volatile void* sav_r14 = r14;
++
+     __asm__ __volatile__
+     (
+         "lr    7,15\n\t"
+@@ -233,6 +237,8 @@ XPTC_InvokeByIndex(nsISupports* that, PR
+           "a" (method)
+         : "2", "3", "4", "5", "6", "7", "memory"
+     );
++
++    r14 = sav_r14;
+   
+     return result;
+ }    
+Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp,v
+retrieving revision 1.1
+diff -u -p -r1.1 xptcinvoke_linux_s390x.cpp
+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp	27 Jan 2003 21:52:51 -0000	1.1
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp	14 Oct 2004 09:14:12 -0000
+@@ -178,6 +178,8 @@ invoke_copy_to_stack(PRUint32 paramCount
+     }
+ }
+ 
++volatile register void* r14 asm("r14");
++
+ XPTC_PUBLIC_API(nsresult)
+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                    PRUint32 paramCount, nsXPTCVariant* params)
+@@ -191,6 +193,8 @@ XPTC_InvokeByIndex(nsISupports* that, PR
+     PRUint64 overflow = invoke_count_words (paramCount, params);
+     PRUint64 result;
+ 
++    volatile void* sav_r14 = r14;
++
+     __asm__ __volatile__
+     (
+         "lgr    7,15\n\t"
+@@ -229,6 +233,8 @@ XPTC_InvokeByIndex(nsISupports* that, PR
+           "a" (method)
+         : "2", "3", "4", "5", "6", "7", "memory"
+     );
++
++    r14 = sav_r14;
+   
+     return result;
+ }    
+Index: xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390.cpp,v
+retrieving revision 1.1
+diff -u -p -r1.1 xptcstubs_linux_s390.cpp
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390.cpp	27 Jan 2003 21:52:52 -0000	1.1
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390.cpp	14 Oct 2004 09:14:22 -0000
+@@ -177,7 +177,7 @@ nsresult nsXPTCStubBase::Stub##n() \
+                               \
+     __asm__ __volatile__      \
+     (                         \
+-        "l     %0,0(15)\n\t"  \
++        "lr    %0,15\n\t"     \
+         "ahi   %0,96\n\t"     \
+         "stm   3,6,0(%3)\n\t" \
+         "std   0,%1\n\t"      \
+Index: xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390x.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390x.cpp,v
+retrieving revision 1.1
+diff -u -p -r1.1 xptcstubs_linux_s390x.cpp
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390x.cpp	27 Jan 2003 21:52:52 -0000	1.1
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390x.cpp	14 Oct 2004 09:14:26 -0000
+@@ -177,7 +177,7 @@ nsresult nsXPTCStubBase::Stub##n() \
+                               \
+     __asm__ __volatile__      \
+     (                         \
+-        "lg     %0,0(15)\n\t" \
++        "lgr    %0,15\n\t"    \
+         "aghi   %0,160\n\t"   \
+         "stmg   3,6,0(%5)\n\t"\
+         "std    0,%1\n\t"     \
diff --git a/sources b/sources
index 66e9583..b3537fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff9eae3b90b8573bf44293ea44bf3c50  firefox-0.10.1-source.tar.bz2
+7a0411859fc5d5f647e211c24beaf94b  firefox-1.0rc1-source.tar.bz2