From a8dcde9c0b7244c0eb570e4616851af6e287a54704e1cd6c82e1e3101e76512c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 4 Jul 2011 07:43:09 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/MozillaFirefox revision 123.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=5737bc8670d3c32b334baaf9de428672 --- MozillaFirefox.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 95a06f7..87a2dc5 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -22,7 +22,7 @@ %define mainver %major.0 Name: MozillaFirefox -BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files zip fdupes Mesa-devel yasm +BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip %if %suse_version > 1110 BuildRequires: libiw-devel BuildRequires: libproxy-devel @@ -133,6 +133,7 @@ Requires: perl(Archive::Zip) Development files for Firefox to make packaging of addons easier. %if %localize + %package translations-common Summary: Common translations for MozillaFirefox License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -180,6 +181,7 @@ This package provides upstream look and feel for MozillaFirefox. %if %crashreporter + %package buildsymbols License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Breakpad buildsymbols for %{name} @@ -190,7 +192,6 @@ This subpackage contains the Breakpad created and compatible debugging symbols meant for upload to Mozilla's crash collector database. %endif - %prep %setup -q -n mozilla -b 7 -b 10 cd $RPM_BUILD_DIR/mozilla @@ -539,6 +540,7 @@ exit 0 %config /etc/rpm/macros.%{progname} %if %localize + %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} @@ -552,11 +554,13 @@ exit 0 # this package does not need to provide files but is needed to fulfill # requirements if no other branding package is to be installed + %files branding-upstream %defattr(-,root,root) %dir %{progdir} %if %crashreporter + %files buildsymbols %defattr(-,root,root) %{_datadir}/mozilla/*.zip From b154e4e219e59d40772ad4976a606a4767b2180ebf61f9eb812e4c8d0b8c00ce Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 23 Jul 2011 14:46:28 +0000 Subject: [PATCH 2/2] 6.0b3 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=214 --- MozillaFirefox.changes | 12 ++ MozillaFirefox.spec | 27 +-- compare-locales.tar.bz2 | 4 +- create-tar.sh | 8 +- firefox-5.0-source.tar.bz2 | 3 - firefox-5.99-source.tar.bz2 | 3 + firefox-branded-icons.patch | 60 +++--- firefox-kde.patch | 64 +++--- firefox-linkorder.patch | 30 --- firefox-multilocale-chrome.patch | 16 +- firefox-no-sync-l10n.patch | 26 --- firefox-shellservice.patch | 326 ------------------------------- l10n-5.0.tar.bz2 | 3 - l10n-5.99.tar.bz2 | 3 + mozilla-gio.patch | 284 --------------------------- mozilla-kde.patch | 90 +++++---- mozilla-linux3.patch | 23 +++ mozilla-ppc-ipc.patch | 222 --------------------- mozilla-prefer_plugin_pref.patch | 87 +++++---- mozilla-repo.patch | 10 +- mozilla-shared-nss-db.patch | 18 +- source-stamp.txt | 4 +- 22 files changed, 233 insertions(+), 1090 deletions(-) delete mode 100644 firefox-5.0-source.tar.bz2 create mode 100644 firefox-5.99-source.tar.bz2 delete mode 100644 firefox-linkorder.patch delete mode 100644 firefox-no-sync-l10n.patch delete mode 100644 firefox-shellservice.patch delete mode 100644 l10n-5.0.tar.bz2 create mode 100644 l10n-5.99.tar.bz2 delete mode 100644 mozilla-gio.patch create mode 100644 mozilla-linux3.patch delete mode 100644 mozilla-ppc-ipc.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 631f7d9..f16e594 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jul 22 13:34:12 UTC 2011 - wr@rosenauer.org + +- update to 6.0b3 + * removed obsolete patches + - firefox-shellservice.patch + - mozilla-gio.patch + - mozilla-ppc-ipc.patch + - firefox-linkorder.patch + - firefox-no-sync-l10n.patch +- recognize linux3 as platform for symbolstore.py + ------------------------------------------------------------------- Fri Jul 1 19:53:18 CEST 2011 - vuntz@opensuse.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 87a2dc5..9f8c013 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -19,10 +19,10 @@ # norootforbuild %define major 5 -%define mainver %major.0 +%define mainver %major.99 Name: MozillaFirefox -BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files zip fdupes Mesa-devel yasm %if %suse_version > 1110 BuildRequires: libiw-devel BuildRequires: libproxy-devel @@ -35,7 +35,7 @@ BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} Release: 1 -%define releasedate 2011061500 +%define releasedate 2011072100 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -68,23 +68,19 @@ Patch4: mozilla-shared-nss-db.patch Patch5: mozilla-kde.patch Patch6: mozilla-cairo-lcd.patch Patch7: mozilla-language.patch -Patch8: mozilla-gio.patch Patch9: mozilla-cairo-return.patch Patch10: mozilla-ntlm-full-path.patch -Patch11: mozilla-ppc-ipc.patch Patch12: mozilla-repo.patch Patch13: mozilla-dump_syms-static.patch Patch14: mozilla-sle11.patch +Patch15: mozilla-linux3.patch # Firefox/browser -Patch30: firefox-linkorder.patch Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch Patch33: firefox-kde.patch Patch34: firefox-kde-114.patch -Patch36: firefox-no-sync-l10n.patch Patch38: firefox-no-default-ualocale.patch Patch39: firefox-multilocale-chrome.patch -Patch40: firefox-shellservice.patch Patch41: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils @@ -133,7 +129,6 @@ Requires: perl(Archive::Zip) Development files for Firefox to make packaging of addons easier. %if %localize - %package translations-common Summary: Common translations for MozillaFirefox License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -181,7 +176,6 @@ This package provides upstream look and feel for MozillaFirefox. %if %crashreporter - %package buildsymbols License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Breakpad buildsymbols for %{name} @@ -192,6 +186,7 @@ This subpackage contains the Breakpad created and compatible debugging symbols meant for upload to Mozilla's crash collector database. %endif + %prep %setup -q -n mozilla -b 7 -b 10 cd $RPM_BUILD_DIR/mozilla @@ -202,17 +197,15 @@ cd $RPM_BUILD_DIR/mozilla %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 %patch12 -p1 %patch13 -p1 %if %suse_version < 1120 %patch14 -p1 %endif +%patch15 -p1 # -%patch30 -p1 %patch31 -p1 %patch32 -p1 %if %suse_version >= 1110 @@ -223,10 +216,8 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %if %suse_version >= 1140 %patch34 -p1 %endif -%patch36 -p1 %patch38 -p1 %patch39 -p1 -%patch40 -p1 %patch41 -p1 %build @@ -277,7 +268,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=default +ac_add_options --enable-update-channel=beta EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -502,6 +493,7 @@ exit 0 %{progdir}/distribution/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/icons/ +%{progdir}/hyphenation/ %{progdir}/searchplugins/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox-bin @@ -540,7 +532,6 @@ exit 0 %config /etc/rpm/macros.%{progname} %if %localize - %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} @@ -554,13 +545,11 @@ exit 0 # this package does not need to provide files but is needed to fulfill # requirements if no other branding package is to be installed - %files branding-upstream %defattr(-,root,root) %dir %{progdir} %if %crashreporter - %files buildsymbols %defattr(-,root,root) %{_datadir}/mozilla/*.zip diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 3936363..6106e7c 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:975887be612f645ef36442a32bfc4eb39d04ceda612f77aaff18c336e4815238 -size 25684 +oid sha256:38fd3130c110a020cc58672840bf106231b70a0777ef2ecc87890e02e2ab259e +size 25676 diff --git a/create-tar.sh b/create-tar.sh index a95faef..230384f 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,8 +1,8 @@ #!/bin/bash -BRANCH="releases/mozilla-release" -RELEASE_TAG="FIREFOX_5_0_RELEASE" -VERSION="5.0" +BRANCH="releases/mozilla-beta" +RELEASE_TAG="FIREFOX_6_0b3_RELEASE" +VERSION="5.99" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla @@ -23,7 +23,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do ja-JP-mac|en-US) ;; *) - hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n/mozilla-beta/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac diff --git a/firefox-5.0-source.tar.bz2 b/firefox-5.0-source.tar.bz2 deleted file mode 100644 index a477f57..0000000 --- a/firefox-5.0-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73693461ffe498055577d6d7d211b42f2ad71577124dfb6cb566ee52603eafa7 -size 68756958 diff --git a/firefox-5.99-source.tar.bz2 b/firefox-5.99-source.tar.bz2 new file mode 100644 index 0000000..ae5997e --- /dev/null +++ b/firefox-5.99-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04a876b1d4512696bdee12fbfac04dcd5c1babb0ae5426095adf84cfac413ca5 +size 67707242 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index 6a09912..eeace9c 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 20b50e5bd650d19c30c308bb3b10f9903c83f581 +# Parent 0a9fd1d7099ccdff12205e23f0d9bf4d93a328ee diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -277,16 +277,21 @@ endif +@@ -221,16 +221,21 @@ endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: @@ -26,34 +26,9 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in $(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin endif endif -diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in ---- a/browser/installer/package-manifest.in -+++ b/browser/installer/package-manifest.in -@@ -423,18 +423,21 @@ - #ifdef SHIP_FEEDBACK - @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi - #endif - @BINPATH@/chrome/toolkit@JAREXT@ - @BINPATH@/chrome/toolkit.manifest - #ifdef XP_UNIX - #ifndef XP_MACOSX - @BINPATH@/chrome/icons/default/default16.png -+@BINPATH@/chrome/icons/default/default22.png -+@BINPATH@/chrome/icons/default/default24.png - @BINPATH@/chrome/icons/default/default32.png - @BINPATH@/chrome/icons/default/default48.png -+@BINPATH@/chrome/icons/default/default256.png - #endif - #endif - - - ; shell icons - #ifdef XP_UNIX - #ifndef XP_MACOSX - @BINPATH@/icons/*.xpm -diff --git a/other-licenses/branding/firefox/Makefile.in b/other-licenses/branding/firefox/Makefile.in ---- a/other-licenses/branding/firefox/Makefile.in -+++ b/other-licenses/branding/firefox/Makefile.in +diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in +--- a/browser/branding/official/Makefile.in ++++ b/browser/branding/official/Makefile.in @@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ @@ -76,3 +51,28 @@ diff --git a/other-licenses/branding/firefox/Makefile.in b/other-licenses/brandi firefox-os2.ico \ document-os2.ico \ $(NULL) +diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in +--- a/browser/installer/package-manifest.in ++++ b/browser/installer/package-manifest.in +@@ -416,18 +416,21 @@ + #ifdef SHIP_FEEDBACK + @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi + #endif + @BINPATH@/chrome/toolkit@JAREXT@ + @BINPATH@/chrome/toolkit.manifest + #ifdef XP_UNIX + #ifndef XP_MACOSX + @BINPATH@/chrome/icons/default/default16.png ++@BINPATH@/chrome/icons/default/default22.png ++@BINPATH@/chrome/icons/default/default24.png + @BINPATH@/chrome/icons/default/default32.png + @BINPATH@/chrome/icons/default/default48.png ++@BINPATH@/chrome/icons/default/default256.png + #endif + #endif + + + ; shell icons + #ifdef XP_UNIX + #ifndef XP_MACOSX + @BINPATH@/icons/*.xpm diff --git a/firefox-kde.patch b/firefox-kde.patch index 4f7e924..ceba606 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -23,7 +23,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1078 @@ +@@ -0,0 +1,1076 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -133,7 +133,9 @@ new file mode 100644 + +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the +# browser-sets.inc file for sharing with hiddenWindow.xul. ++#define FULL_BROWSER_WINDOW +#include browser-sets.inc ++#undef FULL_BROWSER_WINDOW + + + + + +