From ec6fc4ae7a11a930d0f677578eb70d27e860437dda51eda39f94ce6c74546491 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 7 Jan 2013 20:49:28 +0000 Subject: [PATCH] - update to Firefox 18.0 (bnc#796895) * requires NSS 3.14.1 * removed obsolete SLE11 patches (mozilla-gcc43*) - ported patches - reenable WebRTC OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=308 --- MozillaFirefox.changes | 9 + MozillaFirefox.spec | 43 ++- compare-locales.tar.bz2 | 4 +- create-tar.sh | 4 +- firefox-17.0.1-source.tar.bz2 | 3 - firefox-18.0-source.tar.bz2 | 3 + firefox-branded-icons.patch | 24 +- firefox-kde.patch | 38 +-- l10n-17.0.1.tar.bz2 | 3 - l10n-18.0.tar.bz2 | 3 + mozilla-gcc43-enums.patch | 93 ------- mozilla-gcc43-template_hacks.patch | 26 -- mozilla-gcc43-templates_instantiation.patch | 20 -- mozilla-gstreamer-760140.patch | 265 +++++++++--------- mozilla-gstreamer-803287.patch | 293 ++++++++++++++++++++ mozilla-gstreamer.patch | 52 ---- mozilla-kde.patch | 125 +++++---- mozilla-language.patch | 8 +- mozilla-nongnome-proxies.patch | 10 +- mozilla-prefer_plugin_pref.patch | 4 +- mozilla-shared-nss-db.patch | 26 +- mozilla-sle11.patch | 4 +- mozilla-webrtc.patch | 103 +++++++ source-stamp.txt | 2 +- 24 files changed, 696 insertions(+), 469 deletions(-) delete mode 100644 firefox-17.0.1-source.tar.bz2 create mode 100644 firefox-18.0-source.tar.bz2 delete mode 100644 l10n-17.0.1.tar.bz2 create mode 100644 l10n-18.0.tar.bz2 delete mode 100644 mozilla-gcc43-enums.patch delete mode 100644 mozilla-gcc43-template_hacks.patch delete mode 100644 mozilla-gcc43-templates_instantiation.patch create mode 100644 mozilla-gstreamer-803287.patch delete mode 100644 mozilla-gstreamer.patch create mode 100644 mozilla-webrtc.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 9dc9363c..15889047 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jan 6 21:54:18 UTC 2013 - wr@rosenauer.org + +- update to Firefox 18.0 (bnc#796895) + * requires NSS 3.14.1 + * removed obsolete SLE11 patches (mozilla-gcc43*) +- ported patches +- reenable WebRTC + ------------------------------------------------------------------- Thu Nov 29 19:56:51 UTC 2012 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 547621d1..12fc0392 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,7 +1,7 @@ # # spec file for package MozillaFirefox # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2012 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -17,8 +17,8 @@ # -%define major 17 -%define mainver %major.0.1 +%define major 18 +%define mainver %major.0 %define update_channel release Name: MozillaFirefox @@ -44,8 +44,8 @@ BuildRequires: libproxy-devel %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.9.2 -BuildRequires: mozilla-nss-devel >= 3.13.6 +BuildRequires: mozilla-nspr-devel >= 4.9.4 +BuildRequires: mozilla-nss-devel >= 3.14.1 BuildRequires: nss-shared-helper-devel %if %suse_version > 1140 BuildRequires: pkgconfig(gstreamer-0.10) @@ -54,7 +54,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) %endif Version: %{mainver} Release: 0 -%define releasedate 2012112800 +%define releasedate 2013010500 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -95,13 +95,10 @@ Patch9: mozilla-repo.patch Patch10: mozilla-sle11.patch Patch11: mozilla-disable-neon-option.patch Patch12: mozilla-arm-disable-edsp.patch -Patch13: mozilla-gstreamer.patch +Patch13: mozilla-gstreamer-803287.patch Patch14: mozilla-ppc.patch Patch15: mozilla-gstreamer-760140.patch -# SLE11 patches -Patch20: mozilla-gcc43-enums.patch -Patch21: mozilla-gcc43-template_hacks.patch -Patch22: mozilla-gcc43-templates_instantiation.patch +Patch16: mozilla-webrtc.patch # Firefox/browser Patch30: firefox-browser-css.patch Patch31: firefox-kde.patch @@ -116,6 +113,10 @@ Requires: %{name}-branding > 4.0 Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Recommends: libcanberra0 +# libproxy's mozjs pacrunner crashes FF (bnc#759123) +%if %suse_version < 1220 +Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 +%endif %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} @@ -158,7 +159,7 @@ Development files for Firefox to make packaging of addons easier. %if %localize %package translations-common -Summary: Common translations for MozillaFirefox +Summary: Common translations for Firefox Group: System/Localization Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) Requires: %{name} = %{version} @@ -166,10 +167,10 @@ Obsoletes: %{name}-translations < %{version}-%{release} %description translations-common This package contains several common languages for the user interface -of MozillaFirefox. +of Firefox. %package translations-other -Summary: Extra translations for MozillaFirefox +Summary: Extra translations for Firefox Group: System/Localization 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} @@ -177,11 +178,11 @@ Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other This package contains rarely used languages for the user interface -of MozillaFirefox. +of Firefox. %endif %package branding-upstream -Summary: Upstream branding for MozillaFirefox +Summary: Upstream branding for Firefox Group: Productivity/Networking/Web/Browsers Provides: %{name}-branding = 5.0 Conflicts: otherproviders(%{name}-branding) @@ -197,7 +198,7 @@ Supplements: packageand(%{name}:branding-upstream) #BRAND: It's also possible to drop files in /usr/lib/firefox/searchplugins %description branding-upstream -This package provides upstream look and feel for MozillaFirefox. +This package provides upstream look and feel for Firefox. %if %crashreporter @@ -231,12 +232,7 @@ cd $RPM_BUILD_DIR/mozilla %patch13 -p1 %patch14 -p1 %patch15 -p1 -# SLE patches -%if %suse_version <= 1110 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%endif +%patch16 -p1 # %patch30 -p1 %if %suse_version >= 1110 @@ -299,7 +295,6 @@ ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar ac_add_options --enable-update-channel=%{update_channel} -ac_add_options --disable-webrtc # webrtc build is broken for system NSPR EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index c37d917a..ad2ebecb 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:9d2e8dad6293d8ff53c6d4a2577f8b018d49475bd77088185ba32d99705992ff -size 29966 +oid sha256:bc2fcd2cdbe11b51361f888f50b80837ae01c06a3916ad1f7fff1f922fcf21e0 +size 29924 diff --git a/create-tar.sh b/create-tar.sh index 438219fd..0f7fafae 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_17_0_1_RELEASE" -VERSION="17.0.1" +RELEASE_TAG="FIREFOX_18_0_RELEASE" +VERSION="18.0" # mozilla echo "cloning $BRANCH..." diff --git a/firefox-17.0.1-source.tar.bz2 b/firefox-17.0.1-source.tar.bz2 deleted file mode 100644 index 9f7b6710..00000000 --- a/firefox-17.0.1-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36d4eab5d653332e0814d2c6a9cad8ac5f5c69aece2f11abef440adda5874f50 -size 92101778 diff --git a/firefox-18.0-source.tar.bz2 b/firefox-18.0-source.tar.bz2 new file mode 100644 index 00000000..2c82268b --- /dev/null +++ b/firefox-18.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d9421b89267bf10d5975794d54dd07924d7b55110cd49a7b5b84dad8751e4be +size 97931811 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index b8daf6fe..4f48eb0c 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,27 +1,27 @@ # HG changeset patch -# Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb +# Parent ab9210b3779914924d12de5a3952d4cc52cd9d78 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -127,16 +127,21 @@ endif +@@ -133,16 +133,21 @@ endif endif #} LIBXUL_SDK ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: - $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.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 + $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default +ifdef MOZ_OFFICIAL_BRANDING -+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default -+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default -+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default ++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default ++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default ++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default +endif endif libs:: $(srcdir)/profile/prefs.js - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile + $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile ifndef LIBXUL_SDK # channel-prefs.js is handled separate from other prefs due to bug 756325 @@ -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 -@@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \ +@@ -42,18 +42,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ document.icns \ @@ -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 -@@ -496,18 +496,21 @@ +@@ -541,18 +541,21 @@ @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi diff --git a/firefox-kde.patch b/firefox-kde.patch index 81594dc9..9788901c 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,1272 @@ +@@ -0,0 +1,1274 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -76,11 +76,11 @@ new file mode 100644 + + -+ -+