From 6f2059ff99edb6b06723370ba4e661a7e426f84c270aa91e1abd976b94ea174e Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 9 Oct 2012 11:14:08 +0000 Subject: [PATCH 1/3] - update to Firefox 16.0 (bnc#783533) - requires NSPR 4.9.2 - improve GStreamer integration (bmo#760140) - removed upstreamed mozilla-crashreporter-restart-args.patch - webapprt now included - use kmozillahelper's new REVEAL command (bnc#777415) (requires mozilla-kde4-integration >= 0.6.4) - updated translations-other with new languages OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=295 --- MozillaFirefox.changes | 12 + MozillaFirefox.spec | 18 +- compare-locales.tar.bz2 | 4 +- create-tar.sh | 4 +- firefox-15.0.1-source.tar.bz2 | 3 - firefox-16.0-source.tar.bz2 | 3 + firefox-kde-114.patch | 8 +- firefox-kde.patch | 173 +++++-- firefox-multilocale-chrome.patch | 6 +- firefox.js | 1 + l10n-15.0.1.tar.bz2 | 3 - l10n-16.0.tar.bz2 | 3 + mozilla-crashreporter-restart-args.patch | 46 -- mozilla-gstreamer-760140.patch | 566 +++++++++++++++++++++++ mozilla-gstreamer.patch | 30 +- mozilla-kde.patch | 90 ++-- mozilla-ntlm-full-path.patch | 10 +- mozilla-ppc.patch | 8 +- mozilla-repo.patch | 8 +- mozilla-shared-nss-db.patch | 24 +- source-stamp.txt | 2 +- 21 files changed, 813 insertions(+), 209 deletions(-) delete mode 100644 firefox-15.0.1-source.tar.bz2 create mode 100644 firefox-16.0-source.tar.bz2 create mode 100644 firefox.js delete mode 100644 l10n-15.0.1.tar.bz2 create mode 100644 l10n-16.0.tar.bz2 delete mode 100644 mozilla-crashreporter-restart-args.patch create mode 100644 mozilla-gstreamer-760140.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 3ce5c82..7a8e98b 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Oct 7 21:40:14 UTC 2012 - wr@rosenauer.org + +- update to Firefox 16.0 (bnc#783533) +- requires NSPR 4.9.2 +- improve GStreamer integration (bmo#760140) +- removed upstreamed mozilla-crashreporter-restart-args.patch +- webapprt now included +- use kmozillahelper's new REVEAL command (bnc#777415) + (requires mozilla-kde4-integration >= 0.6.4) +- updated translations-other with new languages + ------------------------------------------------------------------- Mon Sep 10 19:37:56 UTC 2012 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 6b7edf9..3d02587 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,8 +17,8 @@ # -%define major 15 -%define mainver %major.0.1 +%define major 16 +%define mainver %major.0 %define update_channel release Name: MozillaFirefox @@ -44,7 +44,7 @@ BuildRequires: libproxy-devel %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.9.1 +BuildRequires: mozilla-nspr-devel >= 4.9.2 BuildRequires: mozilla-nss-devel >= 3.13.6 BuildRequires: nss-shared-helper-devel %if %suse_version > 1140 @@ -54,7 +54,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) %endif Version: %{mainver} Release: 0 -%define releasedate 2012090600 +%define releasedate 2012100700 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -76,6 +76,7 @@ Source5: source-stamp.txt Source6: kde.js Source7: l10n-%{version}.tar.bz2 Source8: firefox-mimeinfo.xml +Source9: firefox.js Source10: compare-locales.tar.bz2 Source11: firefox.1 Source12: mozilla-get-app-id @@ -94,9 +95,9 @@ Patch9: mozilla-repo.patch Patch10: mozilla-sle11.patch Patch11: mozilla-disable-neon-option.patch Patch13: mozilla-arm-disable-edsp.patch -Patch14: mozilla-crashreporter-restart-args.patch Patch15: mozilla-gstreamer.patch Patch16: mozilla-ppc.patch +Patch17: mozilla-gstreamer-760140.patch # Firefox/browser Patch30: firefox-browser-css.patch Patch31: firefox-kde.patch @@ -166,7 +167,7 @@ of MozillaFirefox. %package translations-other Summary: Extra translations for MozillaFirefox Group: System/Localization -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -223,9 +224,9 @@ cd $RPM_BUILD_DIR/mozilla %endif #%patch11 -p1 %patch13 -p1 -%patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 # %patch30 -p1 %if %suse_version >= 1110 @@ -340,6 +341,7 @@ mkdir -p $RPM_BUILD_ROOT%{progdir}/defaults/preferences/ # install kde.js %if %suse_version >= 1110 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/kde.js +install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox.js %endif # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ @@ -551,6 +553,8 @@ exit 0 %{progdir}/omni.ja %{progdir}/platform.ini %{progdir}/plugin-container +%{progdir}/webapprt-stub +%{progdir}/webapprt/ %if %crashreporter %{progdir}/crashreporter-override.ini %{progdir}/crashreporter diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 8fad68f..6240f2b 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:af28abf28728f5e44f04b74735f305f22ea05496d627d6c31dfec8c2b613f0c8 -size 29300 +oid sha256:fbf6da8dd1ad0d08340f84e4a1128487bfe3979bdc2bfd6ddfe9d2814d333e1d +size 29920 diff --git a/create-tar.sh b/create-tar.sh index bb3793e..0c08e2b 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_15_0_1_RELEASE" -VERSION="15.0.1" +RELEASE_TAG="FIREFOX_16_0_RELEASE" +VERSION="16.0" # mozilla echo "cloning $BRANCH..." diff --git a/firefox-15.0.1-source.tar.bz2 b/firefox-15.0.1-source.tar.bz2 deleted file mode 100644 index 7d35246..0000000 --- a/firefox-15.0.1-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2b898c3e56d3c825f4a378f8a3903b1040c9d0eb385b4a2c646ec83d679ff0c -size 83657418 diff --git a/firefox-16.0-source.tar.bz2 b/firefox-16.0-source.tar.bz2 new file mode 100644 index 0000000..02c9bf1 --- /dev/null +++ b/firefox-16.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:622e8f233f1f08eb464e52296ccfe050223fa8317bf3c78eaa86125caa27fbff +size 90705047 diff --git a/firefox-kde-114.patch b/firefox-kde-114.patch index 3986bce..766de6e 100644 --- a/firefox-kde-114.patch +++ b/firefox-kde-114.patch @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer -# Parent 0db25ab919ad61d91a46d7700d3f06e2b66f9feb +# Parent 5a741476f1d87380057f9fa02c6a580aed6e81ff With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js -@@ -719,15 +719,15 @@ var gAdvancedPane = { +@@ -751,17 +751,17 @@ var gAdvancedPane = { if (kde_session == 1) { var shellObj = Components.classes["@mozilla.org/file/local;1"] .createInstance(Components.interfaces.nsILocalFile); @@ -19,7 +19,9 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre + "BrowserApplication", "firefox"]; process.run(false, args, args.length); } - document.getElementById("setDefaultPane").selectedIndex = 1; + let selectedIndex = + shellSvc.isDefaultBrowser(false, true) ? 1 : 0; + document.getElementById("setDefaultPane").selectedIndex = selectedIndex; } #endif }; diff --git a/firefox-kde.patch b/firefox-kde.patch index 0d9fb08..3044e16 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,1126 @@ +@@ -0,0 +1,1210 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -29,7 +29,7 @@ new file mode 100644 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" -+ onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();" ++ onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();" + title="&mainWindow.title;@PRE_RELEASE_SUFFIX@" + title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@" +#ifdef XP_MACOSX @@ -142,6 +142,7 @@ new file mode 100644 + footertype="promobox" + orient="vertical" + ignorekeys="true" ++ consumeoutsideclicks="true" + hidden="true" + onpopupshown="StarUI.panelShown(event);" + aria-labelledby="editBookmarkPanelTitle"> @@ -186,6 +187,49 @@ new file mode 100644 + + + ++