From 6e63619cba0f921728112047f14b1178724b352be0659c4f5e13d66d960511e2 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 15 Sep 2011 09:55:26 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/MozillaFirefox revision 132.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=61556f4ecaaa200051f2cedbb692b31a --- MozillaFirefox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index ce67ad5..7b4ba11 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -34,7 +34,7 @@ BuildRequires: mozilla-nss-devel >= 3.12.10 BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} -Release: 1 +Release: 4 %define releasedate 2011090700 Provides: web_browser Provides: firefox = %{version}-%{release} From 081a75e659f54f5e447a5ca73bc314f6f5836a8d5631b4f4ac71221704898ca2 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 16 Sep 2011 12:57:01 +0000 Subject: [PATCH 2/3] - fixed loading of kde.js under KDE (bnc#718311) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=230 --- MozillaFirefox.changes | 5 +++++ MozillaFirefox.spec | 6 ++++-- firefox-kde.patch | 21 --------------------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 195f0d9..b2ca5e5 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 16 06:57:38 UTC 2011 - wr@rosenauer.org + +- fixed loading of kde.js under KDE (bnc#718311) + ------------------------------------------------------------------- Wed Sep 14 07:02:04 UTC 2011 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 7b4ba11..c68c8fa 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -213,8 +213,6 @@ cd $RPM_BUILD_DIR/mozilla %patch32 -p1 %if %suse_version >= 1110 %patch33 -p1 -# install kde.js -install -m 644 %{SOURCE6} browser/app/profile/kde.js %endif %if %suse_version >= 1140 %patch34 -p1 @@ -311,6 +309,10 @@ mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions find $RPM_BUILD_ROOT%{progdir} \ -name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins +# install kde.js +%if %suse_version >= 1110 +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js +%endif # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh diff --git a/firefox-kde.patch b/firefox-kde.patch index ceba606..767823a 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,24 +1,3 @@ -diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in ---- a/browser/app/Makefile.in -+++ b/browser/app/Makefile.in -@@ -44,16 +44,17 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - - include $(DEPTH)/config/autoconf.mk - - DIRS = profile/extensions - - PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \ - $(srcdir)/profile/channel-prefs.js \ -+ $(srcdir)/profile/kde.js \ - $(NULL) - - - # hardcode en-US for the moment - AB_CD = en-US - - DEFINES += -DAB_CD=$(AB_CD) - diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 --- /dev/null From 9933e45a18af6c30082db0e24551a94cd5009854761ac1c40df5a5f0dbf14ab3 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 26 Sep 2011 06:53:33 +0000 Subject: [PATCH 3/3] version 7 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=231 --- MozillaFirefox.changes | 13 + MozillaFirefox.spec | 10 +- compare-locales.tar.bz2 | 4 +- create-tar.sh | 4 +- firefox-6.0.2-source.tar.bz2 | 3 - firefox-7.0-source.tar.bz2 | 3 + firefox-branded-icons.patch | 12 +- firefox-kde.patch | 62 +- l10n-6.0.2.tar.bz2 | 3 - l10n-7.0.tar.bz2 | 3 + mozilla-cairo-lcd.patch | 1333 ---------------------------------- mozilla-kde.patch | 34 +- mozilla-language.patch | 64 +- mozilla-repo.patch | 11 +- mozilla-shared-nss-db.patch | 18 +- mozilla-sle11.patch | 24 - mozilla.sh.in | 3 - source-stamp.txt | 2 +- 18 files changed, 108 insertions(+), 1498 deletions(-) delete mode 100644 firefox-6.0.2-source.tar.bz2 create mode 100644 firefox-7.0-source.tar.bz2 delete mode 100644 l10n-6.0.2.tar.bz2 create mode 100644 l10n-7.0.tar.bz2 delete mode 100644 mozilla-cairo-lcd.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index b2ca5e5..b9a05f7 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Sep 23 11:22:22 UTC 2011 - wr@rosenauer.org + +- update to Firefox 7 (bnc#720264) + including + * Improve Responsiveness with Memory Reductions + * Instant Sync + * WebSocket protocol 8 +- removed obsolete mozilla-cairo-lcd.patch +- rebased patches +- removed XLIB_SKIP_ARGB_VISUALS=1 from environment in + mozilla.sh.in (bnc#680758) + ------------------------------------------------------------------- Fri Sep 16 06:57:38 UTC 2011 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index c68c8fa..5f701c0 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,8 +18,8 @@ # norootforbuild -%define major 6 -%define mainver %major.0.2 +%define major 7 +%define mainver %major.0 Name: MozillaFirefox BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip @@ -34,8 +34,8 @@ BuildRequires: mozilla-nss-devel >= 3.12.10 BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} -Release: 4 -%define releasedate 2011090700 +Release: 1 +%define releasedate 2011092200 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -66,7 +66,6 @@ Patch2: mozilla-nongnome-proxies.patch Patch3: mozilla-prefer_plugin_pref.patch Patch4: mozilla-shared-nss-db.patch Patch5: mozilla-kde.patch -Patch6: mozilla-cairo-lcd.patch Patch7: mozilla-language.patch Patch9: mozilla-cairo-return.patch Patch10: mozilla-ntlm-full-path.patch @@ -197,7 +196,6 @@ cd $RPM_BUILD_DIR/mozilla %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch9 -p1 %patch10 -p1 diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index e77a9bc..1ddf5cf 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:4fef12ea80b521bb636916cc620e6575e1d4cc66a588ac40b4b3f457604da3aa -size 25675 +oid sha256:06bff322fffe3c28f59acd11752faccef00c061858acca2f7384601aaa198f03 +size 25646 diff --git a/create-tar.sh b/create-tar.sh index 3b94482..a227ae8 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="releases/mozilla-release" -RELEASE_TAG="FIREFOX_6_0_2_RELEASE" -VERSION="6.0.2" +RELEASE_TAG="FIREFOX_7_0_RELEASE" +VERSION="7.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla diff --git a/firefox-6.0.2-source.tar.bz2 b/firefox-6.0.2-source.tar.bz2 deleted file mode 100644 index c4f82a1..0000000 --- a/firefox-6.0.2-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7137a5f520df28da470ddc4a6be90a32cc80a0ccbd60327400a3b26cc748cf8a -size 67549629 diff --git a/firefox-7.0-source.tar.bz2 b/firefox-7.0-source.tar.bz2 new file mode 100644 index 0000000..37f3546 --- /dev/null +++ b/firefox-7.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f7356206395e3745211684effe24973c4e34d826d2aa33b81ba8c9b4fded14f +size 68813405 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index eeace9c..620d2c3 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,15 +1,15 @@ # HG changeset patch -# Parent 0a9fd1d7099ccdff12205e23f0d9bf4d93a328ee +# Parent 6948d58326d5c2e46936e186079421e7d76445e2 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -221,16 +221,21 @@ endif +@@ -199,16 +199,21 @@ DEFINES += -DMOZILLA_OFFICIAL + endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons - $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default @@ -29,7 +29,7 @@ diff --git a/browser/app/Makefile.in b/browser/app/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 = \ +@@ -69,18 +69,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ document.icns \ @@ -43,7 +43,6 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M default32.png \ default48.png \ + default256.png \ - document.png \ mozicon128.png \ $(NULL) @@ -51,10 +50,11 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M 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 @@ +@@ -421,18 +421,21 @@ #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif diff --git a/firefox-kde.patch b/firefox-kde.patch index 767823a..2e0653e 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -2,7 +2,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,1076 @@ +@@ -0,0 +1,1038 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -229,15 +229,6 @@ new file mode 100644 + + + -+