From b5acd11036361ba951ada3f936beece307656d675cc3f80506030a48cfd6fa72 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 10 Nov 2014 15:49:04 +0000 Subject: [PATCH 1/2] - update to Firefox 33.1 * Adding DuckDuckGo as a search option (upstream) * Forget Button added * Enhanced Tiles * Privacy tour introduced - fix typo in GStreamer Recommends - use proper macros for ARM OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=413 --- MozillaFirefox.changes | 12 +++++++++++- MozillaFirefox.spec | 6 +++--- _constraints | 2 +- compare-locales.tar.xz | 4 ++-- create-tar.sh | 4 ++-- firefox-33.0.2-source.tar.xz | 3 --- firefox-33.1-source.tar.xz | 3 +++ firefox-multilocale-chrome.patch | 12 ++++++------ l10n-33.0.2.tar.xz | 3 --- l10n-33.1.tar.xz | 3 +++ source-stamp.txt | 2 +- 11 files changed, 32 insertions(+), 22 deletions(-) delete mode 100644 firefox-33.0.2-source.tar.xz create mode 100644 firefox-33.1-source.tar.xz delete mode 100644 l10n-33.0.2.tar.xz create mode 100644 l10n-33.1.tar.xz diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 10af83a..fcda8d0 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Nov 7 20:14:32 UTC 2014 - wr@rosenauer.org + +- update to Firefox 33.1 + * Adding DuckDuckGo as a search option (upstream) + * Forget Button added + * Enhanced Tiles + * Privacy tour introduced +- fix typo in GStreamer Recommends + ------------------------------------------------------------------- Tue Nov 4 18:00:35 UTC 2014 - guillaume@opensuse.org @@ -9,7 +19,7 @@ Tue Nov 4 18:00:35 UTC 2014 - guillaume@opensuse.org ------------------------------------------------------------------- Mon Nov 3 11:36:04 UTC 2014 - dmueller@suse.com -- use proper macros for ARM +- use proper macros for ARM ------------------------------------------------------------------- Mon Nov 3 11:26:23 UTC 2014 - josua.mayer97@gmail.com diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 31d3182..5868bdf 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -19,9 +19,9 @@ # changed with every update %define major 33 -%define mainver %major.0.2 +%define mainver %major.1 %define update_channel release -%define releasedate 2014102800 +%define releasedate 2014110600 # general build definitions %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -100,7 +100,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %if 0%{?gstreamer} == 1 Requires: libgstreamer-1_0-0 Recommends: gstreamer-fluendo-mp3 -Recommends: gstreamer-plugin-libav +Recommends: gstreamer-plugins-libav %else Requires: libgstreamer-0_10-0 Recommends: gstreamer-0_10-fluendo-mp3 diff --git a/_constraints b/_constraints index df0fca5..971b7af 100644 --- a/_constraints +++ b/_constraints @@ -5,7 +5,7 @@ 9 - 4500 + 5000 diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index b85c307..b234102 100644 --- a/compare-locales.tar.xz +++ b/compare-locales.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9da5fc2933ef4241a6b311ea34d3e45a20c8db862b55f554b4cea24faadb7751 -size 28468 +oid sha256:d2e6d8c186ebcd6b6ee1122305c439cbdb90e06a9ecb66567739ff470e00530b +size 28416 diff --git a/create-tar.sh b/create-tar.sh index 7984847..671f18a 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_33_0_2_RELEASE" -VERSION="33.0.2" +RELEASE_TAG="FIREFOX_33_1_RELEASE" +VERSION="33.1" # mozilla if [ -d mozilla ]; then diff --git a/firefox-33.0.2-source.tar.xz b/firefox-33.0.2-source.tar.xz deleted file mode 100644 index 0634653..0000000 --- a/firefox-33.0.2-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:994e72dc778f50a0c850f4623c07fd91ad6702b3b6c8bf1a61cabd39630cdd8f -size 131636868 diff --git a/firefox-33.1-source.tar.xz b/firefox-33.1-source.tar.xz new file mode 100644 index 0000000..f27b26d --- /dev/null +++ b/firefox-33.1-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b1364cb142052a8c00143dd15c7192ba47ae5648f4380f14a2e2d8b8f22c9a2 +size 132110996 diff --git a/firefox-multilocale-chrome.patch b/firefox-multilocale-chrome.patch index 6738e3c..305f397 100644 --- a/firefox-multilocale-chrome.patch +++ b/firefox-multilocale-chrome.patch @@ -1,12 +1,12 @@ # HG changeset patch -# Parent 9e20873aca55242f18dd1b93e863eded6d1d08bd +# Parent 78b2c4af37108b3a2b6a856da7544335001cd444 # User Wolfgang Rosenauer Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -375,16 +375,20 @@ pref("browser.helperApps.deleteTempFileO +@@ -381,16 +381,20 @@ pref("browser.helperApps.deleteTempFileO #endif // search engines URL @@ -39,10 +39,10 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) else --SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) +-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg +SEARCHPLUGINS_NAMES = $(shell cat \ -+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ -+ @srcdir@/en-US/searchplugins/list.txt ) ) ++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ ++ @srcdir@/en-US/searchplugins/list.txt ) ) ddg endif SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) @@ -128,7 +128,7 @@ diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -133,14 +133,15 @@ +@@ -135,14 +135,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ diff --git a/l10n-33.0.2.tar.xz b/l10n-33.0.2.tar.xz deleted file mode 100644 index 30b8e76..0000000 --- a/l10n-33.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cb9f895fef103f8eb6a1ce1452163214977f543c26dde39f5d1a83f877619cf -size 41126140 diff --git a/l10n-33.1.tar.xz b/l10n-33.1.tar.xz new file mode 100644 index 0000000..718f74a --- /dev/null +++ b/l10n-33.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca376a0e3c18fcdb04952db50a56c6afa346f0a0da1341ab8ec4edb1f5909c54 +size 41139352 diff --git a/source-stamp.txt b/source-stamp.txt index 3edae2d..e60b7a1 100644 --- a/source-stamp.txt +++ b/source-stamp.txt @@ -1,2 +1,2 @@ -REV=7dc4a9d1b3e6 +REV=a4d51da32fe7 REPO=http://hg.mozilla.org/releases/mozilla-release From 140e4a12ee0047527870ce385b6d00ccf1711b43a61ab53df5a822cc31ee3ac6 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 10 Nov 2014 16:05:57 +0000 Subject: [PATCH 2/2] - requires NSS 3.17.2 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=414 --- MozillaFirefox.changes | 1 + MozillaFirefox.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index fcda8d0..2434dc7 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -7,6 +7,7 @@ Fri Nov 7 20:14:32 UTC 2014 - wr@rosenauer.org * Enhanced Tiles * Privacy tour introduced - fix typo in GStreamer Recommends +- requires NSS 3.17.2 ------------------------------------------------------------------- Tue Nov 4 18:00:35 UTC 2014 - guillaume@opensuse.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 5868bdf..4121d2b 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -90,7 +90,7 @@ BuildRequires: libproxy-devel BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.10.7 -BuildRequires: mozilla-nss-devel >= 3.17.1 +BuildRequires: mozilla-nss-devel >= 3.17.2 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if 0%{?suse_version} > 1210