From 2f0227007369d6ac33e96abc7b819f084f9bc090291f2196ed0771d1837ad95c Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 13 Oct 2014 18:00:43 +0000 Subject: [PATCH] - update to Firefox 33.0 (bnc#900941) New features: * OpenH264 support (sandboxed) * Enhanced Tiles * Improved search experience through the location bar * Slimmer and faster JavaScript strings * New CSP (Content Security Policy) backend * Support for connecting to HTTP proxy over HTTPS * Improved reliability of the session restoration * Proprietary window.crypto properties/functions removed - requires NSPR 4.10.7 - requires NSS 3.17.1 - removed obsolete patches: * mozilla-ppc.patch * mozilla-libproxy-compat.patch - added basic appdata information OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=399 --- MozillaFirefox.changes | 20 +++++ MozillaFirefox.spec | 21 +++-- compare-locales.tar.xz | 2 +- create-tar.sh | 4 +- firefox-32.0.2-source.tar.xz | 3 - firefox-33.0-source.tar.xz | 3 + firefox-appdata.xml | 31 +++++++ firefox-branded-icons.patch | 8 +- firefox-kde.patch | 137 +++++++++++++++++++++++------- firefox-no-default-ualocale.patch | 6 +- l10n-32.0.2.tar.xz | 3 - l10n-33.0.tar.xz | 3 + mozilla-kde.patch | 29 ++++--- mozilla-libproxy-compat.patch | 28 ------ mozilla-ppc.patch | 90 -------------------- mozilla-shared-nss-db.patch | 10 +-- source-stamp.txt | 2 +- 17 files changed, 207 insertions(+), 193 deletions(-) delete mode 100644 firefox-32.0.2-source.tar.xz create mode 100644 firefox-33.0-source.tar.xz create mode 100644 firefox-appdata.xml delete mode 100644 l10n-32.0.2.tar.xz create mode 100644 l10n-33.0.tar.xz delete mode 100644 mozilla-libproxy-compat.patch delete mode 100644 mozilla-ppc.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 9643260..055d129 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Oct 11 08:48:24 UTC 2014 - wr@rosenauer.org + +- update to Firefox 33.0 (bnc#900941) + New features: + * OpenH264 support (sandboxed) + * Enhanced Tiles + * Improved search experience through the location bar + * Slimmer and faster JavaScript strings + * New CSP (Content Security Policy) backend + * Support for connecting to HTTP proxy over HTTPS + * Improved reliability of the session restoration + * Proprietary window.crypto properties/functions removed +- requires NSPR 4.10.7 +- requires NSS 3.17.1 +- removed obsolete patches: + * mozilla-ppc.patch + * mozilla-libproxy-compat.patch +- added basic appdata information + ------------------------------------------------------------------- Sat Sep 20 13:33:51 UTC 2014 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index a928ab1..7fcf1e0 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,8 +17,8 @@ # -%define major 32 -%define mainver %major.0.2 +%define major 33 +%define mainver %major.0 %define update_channel release %if %suse_version > 1210 @@ -54,8 +54,8 @@ BuildRequires: libproxy-devel %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.10.6 -BuildRequires: mozilla-nss-devel >= 3.16.4 +BuildRequires: mozilla-nspr-devel >= 4.10.7 +BuildRequires: mozilla-nss-devel >= 3.17.1 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -74,7 +74,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg %endif Version: %{mainver} Release: 0 -%define releasedate 2014092000 +%define releasedate 2014101000 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -102,6 +102,7 @@ Source11: firefox.1 Source12: mozilla-get-app-id Source13: add-plugins.sh.in Source14: create-tar.sh +Source15: firefox-appdata.xml # Gecko/Toolkit Patch1: toolkit-download-folder.patch Patch2: mozilla-nongnome-proxies.patch @@ -115,9 +116,6 @@ Patch9: mozilla-repo.patch Patch10: mozilla-sle11.patch Patch11: mozilla-icu-strncat.patch Patch12: mozilla-arm-disable-edsp.patch -Patch13: mozilla-ppc.patch -Patch14: mozilla-libproxy-compat.patch - # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-kde-114.patch @@ -255,9 +253,6 @@ cd $RPM_BUILD_DIR/mozilla %endif %patch11 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 - # Firefox %patch101 -p1 %if %suse_version >= 1140 @@ -450,6 +445,9 @@ install -m 644 %{SOURCE1} \ # additional mime-types mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml +# appdata +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cp %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/appdata/%{desktop_file_name}.appdata.xml # install man-page mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ cp %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1 @@ -614,6 +612,7 @@ exit 0 %{_datadir}/applications/%{desktop_file_name}.desktop %{_datadir}/mime/packages/%{progname}.xml %{_datadir}/pixmaps/firefox* +%{_datadir}/appdata/ %dir %{_datadir}/mozilla %dir %{_datadir}/mozilla/extensions %dir %{_datadir}/mozilla/extensions/%{firefox_appid} diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index ee6916c..4f07e26 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:4f2b695fb8fdc9ab44ec1187eb30726c0689b4fffbddafb49f2edcb706a6a0b3 +oid sha256:d3cccc117bcca233b9a17da85b479c57f6aceeb080ac17d8c9b300f8ea272318 size 28432 diff --git a/create-tar.sh b/create-tar.sh index 2ccfac5..f0a9a6e 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_32_0_2_RELEASE" -VERSION="32.0.2" +RELEASE_TAG="FIREFOX_33_0_RELEASE" +VERSION="33.0" # mozilla if [ -d mozilla ]; then diff --git a/firefox-32.0.2-source.tar.xz b/firefox-32.0.2-source.tar.xz deleted file mode 100644 index dd645e2..0000000 --- a/firefox-32.0.2-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42a568ca3517cfc1bb934a2acc9fcf8d087941f44b580708ace46348aead6256 -size 127358108 diff --git a/firefox-33.0-source.tar.xz b/firefox-33.0-source.tar.xz new file mode 100644 index 0000000..15171ad --- /dev/null +++ b/firefox-33.0-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63c904a680581793a3c071bb1d81586a8102709d5d377bd0864727a11e2b9079 +size 131614988 diff --git a/firefox-appdata.xml b/firefox-appdata.xml new file mode 100644 index 0000000..ecad906 --- /dev/null +++ b/firefox-appdata.xml @@ -0,0 +1,31 @@ + + + + + + + firefox.desktop + CC0-1.0 + +

+ Bringing together all kinds of awesomeness to make browsing better for you. + Get to your favorite sites quickly – even if you don’t remember the URLs. + Type your term into the location bar (aka the Awesome Bar) and the autocomplete + function will include possible matches from your browsing history, bookmarked + sites and open tabs. +

+ + + http://www.mozilla.org/en-US/ + + + https://wiki.mozilla.org/images/e/e1/Bon_Echo_Beta_2_Screen_Shot_1.PNG + + + + diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index 589be61..8bf4927 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 17ccae9100af86bc65f924b87545184af2f4ada9 +# Parent 8f03aa18c51f9c014f32aba7750f6b7927f9256e diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -54,7 +54,7 @@ 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 -@@ -629,18 +629,21 @@ +@@ -623,18 +623,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@ @@ -71,8 +71,8 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m #endif ; [Webide Files] - #ifdef MOZ_DEVTOOLS_WEBIDE @BINPATH@/browser/chrome/webide@JAREXT@ @BINPATH@/browser/chrome/webide.manifest @BINPATH@/browser/@PREF_DIR@/webide-prefs.js - #endif + + ; shell icons diff --git a/firefox-kde.patch b/firefox-kde.patch index 82ad85e..3545943 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,1206 @@ +@@ -0,0 +1,1238 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -181,7 +181,7 @@ new file mode 100644 + +