From 1bda786938f4200426920b07d22d3b022dc8977a357b946c33d62a2c0372d29d Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 14 Jan 2015 18:32:16 +0000 Subject: [PATCH 1/2] - update to Firefox 35.0 (bnc#910669) notable features: * Firefox Hello with new rooms-based conversations model * Implemented HTTP Public Key Pinning Extension (for enhanced authentication of encrypted connections) - rebased patches - dropped explicit support for everything older than 12.3 (including SLES11) * merge firefox-kde.patch and firefox-kde-114.patch * dropped mozilla-sle11.patch - reworked specfile to build conditionally based on release channel either Firefox or Firefox Developer Edition - added mozilla-openaes-decl.patch to fix implicit declarations - obsolete tracker-miner-firefox < 0.15 because it leads to startup crashes (bnc#908892) - rebased patches OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=419 --- MozillaFirefox.changes | 20 ++++ MozillaFirefox.desktop | 8 +- MozillaFirefox.spec | 153 +++++++++++++----------------- compare-locales.tar.xz | 4 +- create-tar.sh | 4 +- firefox-34.0.5-source.tar.xz | 3 - firefox-35.0-source.tar.xz | 3 + firefox-kde-114.patch | 27 ------ firefox-kde.patch | 50 +++++----- firefox-multilocale-chrome.patch | 25 +++-- firefox-no-default-ualocale.patch | 6 +- l10n-34.0.5.tar.xz | 3 - l10n-35.0.tar.xz | 3 + mozilla-kde.patch | 70 +++++++------- mozilla-openaes-decl.patch | 25 +++++ mozilla-repo.patch | 4 +- mozilla-shared-nss-db.patch | 50 +++++----- mozilla-sle11.patch | 88 ----------------- source-stamp.txt | 2 +- 19 files changed, 234 insertions(+), 314 deletions(-) delete mode 100644 firefox-34.0.5-source.tar.xz create mode 100644 firefox-35.0-source.tar.xz delete mode 100644 firefox-kde-114.patch delete mode 100644 l10n-34.0.5.tar.xz create mode 100644 l10n-35.0.tar.xz create mode 100644 mozilla-openaes-decl.patch delete mode 100644 mozilla-sle11.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 24281c6..290ddf1 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Jan 10 18:36:37 UTC 2015 - wr@rosenauer.org + +- update to Firefox 35.0 (bnc#910669) + notable features: + * Firefox Hello with new rooms-based conversations model + * Implemented HTTP Public Key Pinning Extension (for enhanced + authentication of encrypted connections) +- rebased patches +- dropped explicit support for everything older than 12.3 + (including SLES11) + * merge firefox-kde.patch and firefox-kde-114.patch + * dropped mozilla-sle11.patch +- reworked specfile to build conditionally based on release channel + either Firefox or Firefox Developer Edition +- added mozilla-openaes-decl.patch to fix implicit declarations +- obsolete tracker-miner-firefox < 0.15 because it leads to startup + crashes (bnc#908892) + ------------------------------------------------------------------- Sat Dec 13 22:13:00 UTC 2014 - Led @@ -31,6 +50,7 @@ Sat Nov 29 21:23:03 UTC 2014 - wr@rosenauer.org Bad casting from the BasicThebesLayer to BasicContainerLayer - rebased patches - limit linker memory usage for %ix86 +- rebased patches ------------------------------------------------------------------- Fri Nov 7 20:14:32 UTC 2014 - wr@rosenauer.org diff --git a/MozillaFirefox.desktop b/MozillaFirefox.desktop index e9fb0a5..440ee8a 100644 --- a/MozillaFirefox.desktop +++ b/MozillaFirefox.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Encoding=UTF-8 -Name=Firefox +Name=%NAME GenericName=Web Browser Comment=Web Browser -TryExec=firefox -Exec=firefox %u -Icon=firefox +TryExec=%EXEC +Exec=%EXEC %u +Icon=%ICON Terminal=false StartupNotify=true MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 5098dd7..6491e14 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,8 +1,8 @@ # # spec file for package MozillaFirefox # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2014 Wolfgang Rosenauer +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2015 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,38 +18,44 @@ # changed with every update -%define major 34 -%define mainver %major.0.5 +%define major 35 +%define mainver %major.0 %define update_channel release -%define releasedate 2014112600 +%define releasedate 2015010900 # general build definitions +%if "%{update_channel}" != "aurora" +%define progname firefox +%define pkgname MozillaFirefox +%define appname Firefox +%else +%define progname firefox-dev +%define pkgname firefox-dev-edition +%define appname Firefox Developer Edition +%endif +%define progdir %{_prefix}/%_lib/%{progname} +%define gnome_dir %{_prefix} +%define desktop_file_name %{progname} %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind -%define progname firefox -%define progdir %{_prefix}/%_lib/%{progname} -%define gnome_dir %{_prefix} -%if 0%{?suse_version} > 1130 -%define desktop_file_name firefox -%else -%define desktop_file_name %{name} -%endif -%if 0%{?suse_version} > 1210 %if 0%{?suse_version} > 1310 %define gstreamer_ver 1.0 %define gstreamer 1 %else %define gstreamer_ver 0.10 %endif -%endif # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys # Note: these are for the openSUSE Firefox builds ONLY. For your own distribution, # please get your own set of keys. %define _google_api_key AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q +%if %update_channel == "aurora" +%define branding 0 +%else %define branding 1 +%endif %define localize 1 %ifarch aarch64 ppc ppc64 ppc64le s390 s390x ia64 %arm %define crashreporter 0 @@ -57,7 +63,7 @@ %define crashreporter 1 %endif -Name: MozillaFirefox +Name: %{pkgname} BuildRequires: Mesa-devel BuildRequires: autoconf213 BuildRequires: dbus-1-glib-devel @@ -66,8 +72,13 @@ BuildRequires: gcc-c++ BuildRequires: libcurl-devel BuildRequires: libgnomeui-devel BuildRequires: libidl-devel +BuildRequires: libiw-devel BuildRequires: libnotify-devel +BuildRequires: libproxy-devel BuildRequires: makeinfo +BuildRequires: mozilla-nspr-devel >= 4.10.7 +BuildRequires: mozilla-nss-devel >= 3.17.2 +BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: startup-notification-devel BuildRequires: unzip @@ -75,20 +86,10 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip -%if 0%{?suse_version} > 1110 -BuildRequires: libiw-devel -BuildRequires: libproxy-devel -%else -BuildRequires: wireless-tools -%endif -BuildRequires: mozilla-nspr-devel >= 4.10.7 -BuildRequires: mozilla-nss-devel >= 3.17.2 -BuildRequires: nss-shared-helper-devel -BuildRequires: pkgconfig(libpulse) -%if 0%{?suse_version} > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) +BuildRequires: pkgconfig(libpulse) %if 0%{?gstreamer} == 1 Requires: libgstreamer-1_0-0 Recommends: gstreamer-fluendo-mp3 @@ -98,18 +99,19 @@ Requires: libgstreamer-0_10-0 Recommends: gstreamer-0_10-fluendo-mp3 Recommends: gstreamer-0_10-plugins-ffmpeg %endif -%endif Version: %{mainver} Release: 0 +%if "%{name}" == "MozillaFirefox" Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} +%endif Provides: web_browser Provides: browser(npapi) # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package %define kde_helper_version 6 Provides: mozilla-kde4-version = %{kde_helper_version} -Summary: Mozilla Firefox Web Browser +Summary: Mozilla %{appname} Web Browser License: MPL-2.0 Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ @@ -139,24 +141,27 @@ Patch6: mozilla-preferences.patch Patch7: mozilla-language.patch Patch8: mozilla-ntlm-full-path.patch Patch9: mozilla-repo.patch -Patch10: mozilla-sle11.patch -Patch11: mozilla-icu-strncat.patch -Patch12: mozilla-arm-disable-edsp.patch -Patch13: mozilla-bmo1088588.patch +Patch10: mozilla-icu-strncat.patch +Patch11: mozilla-arm-disable-edsp.patch +Patch12: mozilla-bmo1088588.patch +Patch13: mozilla-openaes-decl.patch # Firefox/browser Patch101: firefox-kde.patch -Patch102: firefox-kde-114.patch -Patch103: firefox-no-default-ualocale.patch -Patch104: firefox-multilocale-chrome.patch -Patch105: firefox-branded-icons.patch +Patch102: firefox-no-default-ualocale.patch +Patch103: firefox-multilocale-chrome.patch +Patch104: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils +%if %branding Requires: %{name}-branding > 20.0 +%endif Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Recommends: libcanberra0 Recommends: libpulse0 +# addon leads to startup crash (bnc#908892) +Obsoletes: tracker-miner-firefox < 0.15 # libproxy's mozjs pacrunner crashes FF (bnc#759123) %if 0%{?suse_version} < 1220 Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 @@ -168,7 +173,7 @@ compliance and performance. Its functionality can be enhanced via a plethora of extensions. %package devel -Summary: Devel package for Firefox +Summary: Devel package for %{appname} Group: Development/Tools/Other Provides: firefox-devel = %{version}-%{release} Requires: %{name} = %{version} @@ -176,11 +181,11 @@ Requires: perl(Archive::Zip) Requires: perl(XML::Simple) %description devel -Development files for Firefox to make packaging of addons easier. +Development files for %{appname} to make packaging of addons easier. %if %localize %package translations-common -Summary: Common translations for Firefox +Summary: Common translations for %{appname} Group: System/Localization Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;el;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} @@ -188,10 +193,10 @@ Obsoletes: %{name}-translations < %{version}-%{release} %description translations-common This package contains several common languages for the user interface -of Firefox. +of %{appname}. %package translations-other -Summary: Extra translations for Firefox +Summary: Extra translations for %{appname} Group: System/Localization Provides: locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;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} @@ -199,11 +204,12 @@ Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other This package contains rarely used languages for the user interface -of Firefox. +of %{appname}. %endif +%if %branding %package branding-upstream -Summary: Upstream branding for Firefox +Summary: Upstream branding for %{appname} Group: Productivity/Networking/Web/Browsers Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) @@ -219,13 +225,12 @@ 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 Firefox. - +This package provides upstream look and feel for %{appname}. +%endif %if %crashreporter - %package buildsymbols -Summary: Breakpad buildsymbols for %{name} +Summary: Breakpad buildsymbols for %{appname} Group: Development/Debug %description buildsymbols @@ -249,24 +254,19 @@ cd $RPM_BUILD_DIR/mozilla %patch7 -p1 %patch8 -p1 %patch9 -p1 -%if 0%{?suse_version} < 1120 %patch10 -p1 -%endif %patch11 -p1 %patch12 -p1 %patch13 -p1 # Firefox %patch101 -p1 -%if 0%{?suse_version} >= 1140 %patch102 -p1 -%endif %patch103 -p1 %patch104 -p1 -%patch105 -p1 %build # no need to add build time to binaries -modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/MozillaFirefox.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + @@ -338,19 +338,12 @@ ac_add_options --enable-update-channel=%{update_channel} %if 0%{?gstreamer} == 1 ac_add_options --enable-gstreamer=1.0 %endif -%if 0%{?suse_version} > 1130 ac_add_options --disable-gnomevfs ac_add_options --enable-gio -%endif -%if 0%{?suse_version} < 1220 -ac_add_options --disable-gstreamer -%endif %if %branding ac_add_options --enable-official-branding %endif -%if 0%{?suse_version} > 1110 ac_add_options --enable-libproxy -%endif %if ! %crashreporter ac_add_options --disable-crashreporter %endif @@ -444,16 +437,21 @@ s:%%PROFILE:.mozilla/firefox:g" \ %{SOURCE3} > %{buildroot}%{progdir}/%{progname}.sh chmod 755 %{buildroot}%{progdir}/%{progname}.sh ln -sf ../..%{progdir}/%{progname}.sh %{buildroot}%{_bindir}/%{progname} -# desktop definition +# desktop file mkdir -p %{buildroot}%{_datadir}/applications -install -m 644 %{SOURCE1} \ - %{buildroot}%{_datadir}/applications/%{desktop_file_name}.desktop +sed "s:%%NAME:%{appname}:g +s:%%EXEC:%{progname}:g +s:%%ICON:%{progname}:g" \ + %{SOURCE1} > %{buildroot}%{_datadir}/applications/%{desktop_file_name}.desktop +%suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK # additional mime-types mkdir -p %{buildroot}%{_datadir}/mime/packages cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata +%if "%{update_channel}" != "aurora" mkdir -p %{buildroot}%{_datadir}/appdata cp %{SOURCE15} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml +%endif # install man-page mkdir -p %{buildroot}%{_mandir}/man1/ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 @@ -474,7 +472,6 @@ for size in 16 32 48; do ln -sf %{progdir}/browser/chrome/icons/default/default$size.png \ %{buildroot}%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png done -%suse_update_desktop_file %{desktop_file_name} Network WebBrowser GTK # excludes rm -f %{buildroot}%{progdir}/updater.ini rm -f %{buildroot}%{progdir}/removed-files @@ -536,33 +533,15 @@ rm -rf %{_tmppath}/translations.* %post # update mime and desktop database -%if 0%{?suse_version} > 1130 %mime_database_post %desktop_database_post %icon_theme_cache_post -%else -if [ -f usr/bin/update-mime-database ] ; then - usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : -fi -if [ -f usr/bin/update-desktop-database ] ; then - usr/bin/update-desktop-database > /dev/null || : -fi -%endif exit 0 %postun -%if 0%{?suse_version} > 1130 %icon_theme_cache_postun %desktop_database_postun %mime_database_postun -%else -if [ -f usr/bin/update-mime-database ] ; then - usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : -fi -if [ -f usr/bin/update-desktop-database ] ; then - usr/bin/update-desktop-database > /dev/null || : -fi -%endif exit 0 %files @@ -607,7 +586,6 @@ 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} @@ -617,6 +595,9 @@ exit 0 %{gnome_dir}/share/icons/hicolor/ %{_bindir}/%{progname} %doc %{_mandir}/man1/%{progname}.1.gz +%if "%{update_channel}" != "aurora" +%{_datadir}/appdata/ +%endif %files devel %defattr(-,root,root) @@ -638,13 +619,13 @@ exit 0 # this package does not need to provide files but is needed to fulfill # requirements if no other branding package is to be installed - +%if %branding %files branding-upstream %defattr(-,root,root) %dir %{progdir} +%endif %if %crashreporter - %files buildsymbols %defattr(-,root,root) %{_datadir}/mozilla/*.zip diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index e799976..b0cd041 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:63c9dc89cf88f95f3c12ade272ab7658426be5941f2475d039ec25e60642624e -size 28420 +oid sha256:1eae7210e211dfa3eeb9b4037a3d518650d3ac11f32a0df56e2d79a6dab74d90 +size 28464 diff --git a/create-tar.sh b/create-tar.sh index 07bb390..fc56834 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_34_0_5_RELEASE" -VERSION="34.0.5" +RELEASE_TAG="FIREFOX_35_0_RELEASE" +VERSION="35.0" # mozilla if [ -d mozilla ]; then diff --git a/firefox-34.0.5-source.tar.xz b/firefox-34.0.5-source.tar.xz deleted file mode 100644 index 9146d5c..0000000 --- a/firefox-34.0.5-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f5848e377636af4e66c6fa738e61bd9623f0e4b60a94d4d8ee3d54b4976d24b -size 139718892 diff --git a/firefox-35.0-source.tar.xz b/firefox-35.0-source.tar.xz new file mode 100644 index 0000000..4cfe238 --- /dev/null +++ b/firefox-35.0-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b1b35b88e595f60283412d9ffa8a335964991110dca68680a1f3e77925be321 +size 150089884 diff --git a/firefox-kde-114.patch b/firefox-kde-114.patch deleted file mode 100644 index cafbd21..0000000 --- a/firefox-kde-114.patch +++ /dev/null @@ -1,27 +0,0 @@ -# HG changeset patch -# User Wolfgang Rosenauer -# Parent a5921092e6fb2dc39b1426139eb8406f5fd3cfa9 -With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox - -diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js ---- a/browser/components/preferences/main.js -+++ b/browser/components/preferences/main.js -@@ -511,17 +511,17 @@ var gMainPane = { - if (kde_session == 1) { - var shellObj = Components.classes["@mozilla.org/file/local;1"] - .createInstance(Components.interfaces.nsILocalFile); - shellObj.initWithPath("/usr/bin/kwriteconfig"); - var process = Components.classes["@mozilla.org/process/util;1"] - .createInstance(Components.interfaces.nsIProcess); - process.init(shellObj); - var args = ["--file", "kdeglobals", "--group", "General", "--key", -- "BrowserApplication", "MozillaFirefox"]; -+ "BrowserApplication", "firefox"]; - process.run(false, args, args.length); - } - } catch (ex) { - Components.utils.reportError(ex); - return; - } - let selectedIndex = - shellSvc.isDefaultBrowser(false, true) ? 1 : 0; diff --git a/firefox-kde.patch b/firefox-kde.patch index 0890199..ea49e86 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,8 +1,11 @@ +# HG changeset patch +# Parent 6697591ddc0a1b18171c31a7bf18d99be9825aab + diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1269 @@ +@@ -0,0 +1,1272 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -282,7 +285,7 @@ new file mode 100644 + + + + @@ -546,6 +553,11 @@ new file mode 100644 +#endif + + ++ ++ ++ +#include popup-notifications.inc + +#include ../../components/customizableui/content/panelUI.inc.xul @@ -719,7 +731,11 @@ new file mode 100644 + aria-label="&navbarCmd.label;" + fullscreentoolbar="true" mode="icons" customizable="true" + iconsize="small" -+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item" ++#ifdef MOZ_DEV_EDITION ++ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button" ++#else ++ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button" ++#endif + customizationtarget="nav-bar-customization-target" + overflowable="true" + overflowbutton="nav-bar-overflow-button" @@ -773,7 +789,6 @@ new file mode 100644 + + + -+ + + + @@ -806,7 +821,7 @@ new file mode 100644 + + + -+ + + -+ -+ + + + + -+ ++