# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1276091945 -7200
# Node ID c8f7496d60e72b32dce03a794119480ae3448ea0
# Parent  67e4ee4409471d1209c4f163f7b8249f5ba4e7a4
First cut for building Firefox 3.7/4.0a (not ready yet)

diff -r 67e4ee440947 -r c8f7496d60e7 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Jun 09 14:49:01 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Jun 09 15:59:05 2010 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package MozillaFirefox (Version 3.6.4)
+# spec file for package MozillaFirefox (Version 3.7a)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2010 Wolfgang Rosenauer
@@ -20,12 +20,9 @@
 
 
 Name:           MozillaFirefox
-%define xulrunner mozilla-xulrunner192
-BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip
-BuildRequires:  %{xulrunner}-devel = 1.9.2.4
-%if %suse_version > 1020
-BuildRequires:  fdupes
-%endif
+%define xulrunner mozilla-xulrunner193
+BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa
+BuildRequires:  %{xulrunner}-devel = 1.9.3a4
 %if %suse_version > 1110
 BuildRequires:  libiw-devel
 %else
@@ -34,9 +31,9 @@
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
 Provides:       web_browser
 Provides:       firefox
-Version:        3.6.4
+Version:        3.7a
 Release:        1
-%define         releasedate 2010050300
+%define         releasedate 2010060800
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -58,12 +55,9 @@
 Patch4:         firefox-linkorder.patch
 Patch5:         firefox-browser-css.patch
 Patch6:         firefox-cross-desktop.patch
-Patch7:         firefox-no-gnomevfs.patch
 Patch8:         firefox-appname.patch
 Patch9:         firefox-kde.patch
 Patch10:        firefox-ui-lockdown.patch
-Patch11:        firefox-crashreporter.patch
-Patch12:        mozilla-crashreporter-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -158,16 +152,13 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %if %suse_version >= 1110
-%patch9 -p1
+#%patch9 -p1
 # install kde.js
-install -m 644 %{SOURCE6} browser/app/profile/kde.js
+#install -m 644 %{SOURCE6} browser/app/profile/kde.js
 %endif
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+#%patch10 -p1
 
 %build
 export MOZ_BUILD_DATE=%{releasedate}
@@ -175,12 +166,6 @@
 export BUILD_OFFICIAL=1
 export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"  
 export CXXFLAGS="$CFLAGS"
-# 10.3-x86_64 build fails probably because gcc bug
-%if %suse_version == 1030
-%ifarch x86_64
-export ac_cv_visibility_hidden="no"
-%endif
-%endif
 export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
 SDKDIR=$(pkg-config --variable=sdkdir libxul)
 cat << EOF > $MOZCONFIG
@@ -193,7 +178,7 @@
 ac_add_options --sysconfdir=%{_sysconfdir}
 ac_add_options --mandir=%{_mandir}
 ac_add_options --includedir=%{_includedir}
-ac_add_options --with-system-nspr
+#ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-libxul-sdk=$SDKDIR
 ac_add_options --with-l10n-base=../l10n
diff -r 67e4ee440947 -r c8f7496d60e7 firefox-browser-css.patch
--- a/firefox-browser-css.patch	Wed Jun 09 14:49:01 2010 +0200
+++ b/firefox-browser-css.patch	Wed Jun 09 15:59:05 2010 +0200
@@ -9,8 +9,8 @@
 diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
 --- a/browser/themes/gnomestripe/browser/browser.css
 +++ b/browser/themes/gnomestripe/browser/browser.css
-@@ -788,16 +788,30 @@ toolbar[iconsize="small"] #fullscreen-bu
-   display: none;
+@@ -811,16 +811,30 @@ toolbar[iconsize="small"] #fullscreen-bu
+   -moz-margin-end: 3px;
  }
  
  #PopupAutoComplete,
diff -r 67e4ee440947 -r c8f7496d60e7 firefox-linkorder.patch
--- a/firefox-linkorder.patch	Wed Jun 09 14:49:01 2010 +0200
+++ b/firefox-linkorder.patch	Wed Jun 09 15:59:05 2010 +0200
@@ -5,7 +5,7 @@
 diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
 --- a/browser/components/build/Makefile.in
 +++ b/browser/components/build/Makefile.in
-@@ -78,19 +78,21 @@ LOCAL_INCLUDES += -I$(srcdir)/../migrati
+@@ -61,19 +61,21 @@ LOCAL_INCLUDES += -I$(srcdir)/../migrati
  SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
  EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
  endif
@@ -22,7 +22,7 @@
 +
  # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
  # GTK2: Need to link with glib for GNOME shell service
- ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ ifneq (,$(filter cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
  EXTRA_DSO_LDOPTS += \
    $(TK_LIBS) \
    $(NULL)
diff -r 67e4ee440947 -r c8f7496d60e7 series
--- a/series	Wed Jun 09 14:49:01 2010 +0200
+++ b/series	Wed Jun 09 15:59:05 2010 +0200
@@ -21,5 +21,5 @@
 firefox-browser-css.patch
 firefox-cross-desktop.patch
 firefox-appname.patch
-firefox-kde.patch
-firefox-ui-lockdown.patch
+#firefox-kde.patch
+#firefox-ui-lockdown.patch