From d2200a49cd867fba22a853e4038473b7c4fead1fb425e8ef1778f320a633cbe7 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 16 Sep 2013 07:57:05 +0000 Subject: [PATCH] - update to Firefox 24.0 (bnc#840485) - enable gstreamer via pref (gecko.js) - require NSS 3.15.1 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=349 --- MozillaFirefox.changes | 7 ++ MozillaFirefox.spec | 16 +-- compare-locales.tar.bz2 | 4 +- create-tar.sh | 5 +- firefox-23.0.1-source.tar.bz2 | 3 - firefox-24.0-source.tar.bz2 | 3 + firefox-branded-icons.patch | 10 +- firefox-kde.patch | 181 +++++++++------------------------- gecko.js | 1 + l10n-23.0.1.tar.bz2 | 3 - l10n-24.0.tar.bz2 | 3 + mozilla-kde.patch | 148 ++++++++++++++------------- mozilla-ppc.patch | 17 ++-- mozilla-shared-nss-db.patch | 18 ++-- source-stamp.txt | 2 +- 15 files changed, 180 insertions(+), 241 deletions(-) delete mode 100644 firefox-23.0.1-source.tar.bz2 create mode 100644 firefox-24.0-source.tar.bz2 create mode 100644 gecko.js delete mode 100644 l10n-23.0.1.tar.bz2 create mode 100644 l10n-24.0.tar.bz2 diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index fbacf5aa..6bafd66e 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 14 14:39:58 UTC 2013 - wr@rosenauer.org + +- update to Firefox 24.0 (bnc#840485) +- enable gstreamer via pref (gecko.js) +- require NSS 3.15.1 + ------------------------------------------------------------------- Mon Aug 26 07:35:36 UTC 2013 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index a23878dc..57768624 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,8 +17,8 @@ # -%define major 23 -%define mainver %major.0.1 +%define major 24 +%define mainver %major.0 %define update_channel release %if %suse_version > 1220 @@ -51,7 +51,7 @@ BuildRequires: libproxy-devel BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.10 -BuildRequires: mozilla-nss-devel >= 3.15 +BuildRequires: mozilla-nss-devel >= 3.15.1 BuildRequires: nss-shared-helper-devel %if %suse_version > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) @@ -60,7 +60,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %endif Version: %{mainver} Release: 0 -%define releasedate 2013082400 +%define releasedate 2013091200 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -88,6 +88,7 @@ Source11: firefox.1 Source12: mozilla-get-app-id Source13: add-plugins.sh.in Source14: create-tar.sh +Source15: gecko.js # Gecko/Toolkit Patch1: toolkit-download-folder.patch Patch2: mozilla-nongnome-proxies.patch @@ -306,9 +307,9 @@ ac_add_options --disable-gnomevfs ac_add_options --enable-gio EOF %endif -%if %suse_version > 1210 +%if %suse_version < 1220 cat << EOF >> $MOZCONFIG -ac_add_options --enable-gstreamer +ac_add_options --disable-gstreamer EOF %endif %if %branding @@ -358,6 +359,9 @@ mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/kde.js install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/firefox.js %endif +# core configuration (e.g. temporary gstreamer pref) +# this is expected to be just temporary and therefore not handled in openSUSE branding +install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{progdir}/defaults/pref/gecko.js # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 96d5de95..d4885106 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:79295d236b36d97af1d769e536e7e85121bcd1894ea574a185c13a7a331c2e02 -size 29883 +oid sha256:4c8e6c204cd5aed68fc6a290f26f44980c5d9cece37eba8f5c0f8ce971f10068 +size 29932 diff --git a/create-tar.sh b/create-tar.sh index 28a03bec..9153a65f 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_23_0_1_RELEASE" -VERSION="23.0.1" +RELEASE_TAG="FIREFOX_24_0_RELEASE" +VERSION="24.0" # mozilla if [ -d mozilla ]; then @@ -27,6 +27,7 @@ if [ ! -d mozilla ]; then hg clone http://hg.mozilla.org/$BRANCH mozilla fi pushd mozilla +hg update --check [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG # get repo and source stamp echo -n "REV=" > ../source-stamp.txt diff --git a/firefox-23.0.1-source.tar.bz2 b/firefox-23.0.1-source.tar.bz2 deleted file mode 100644 index e42c2e4d..00000000 --- a/firefox-23.0.1-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1088857360fbfc0b2021d367ad0472d922b157378372856c6682b6b04ffd460d -size 116963536 diff --git a/firefox-24.0-source.tar.bz2 b/firefox-24.0-source.tar.bz2 new file mode 100644 index 00000000..6c4db1e5 --- /dev/null +++ b/firefox-24.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a174f14e75774211548510c9e91f40b74c25ca3a013cd64e62138fef96688a15 +size 121150373 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index 8931d6a8..19780933 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,13 +1,13 @@ # HG changeset patch -# Parent a5cc092ab98bc6d4c1b09b5cc86791bae1313c73 +# Parent 5defe7bd2f041c227fe4a65f8a90e6cc42a9a339 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -136,16 +136,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -133,16 +133,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + ifdef MOZ_WIDGET_GTK libs:: $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default @@ -54,14 +54,14 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M 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 -@@ -574,18 +574,21 @@ +@@ -571,18 +571,21 @@ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest @BINPATH@/chrome/recording.manifest @BINPATH@/chrome/recording/* - #ifdef MOZ_GTK2 + #ifdef MOZ_GTK @BINPATH@/browser/chrome/icons/default/default16.png +@BINPATH@/browser/chrome/icons/default/default22.png +@BINPATH@/browser/chrome/icons/default/default24.png diff --git a/firefox-kde.patch b/firefox-kde.patch index 6b7a0aad..d2485de6 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,1196 @@ +@@ -0,0 +1,1097 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -102,6 +102,8 @@ new file mode 100644 + label="&bookmarkAllTabs.label;" + accesskey="&bookmarkAllTabs.accesskey;" + command="Browser:BookmarkAllTabs"/> ++ + + @@ -235,6 +237,7 @@ new file mode 100644 + side="right" + type="arrow" + hidden="true" ++ flip="slide" + rolluponmousewheel="true" + consumeoutsideclicks="false" + noautofocus="true" @@ -289,59 +292,6 @@ new file mode 100644 + + + -+