From: Jan Rękorajski Date: Thu, 28 Jan 2016 07:33:14 +0000 (+0100) Subject: - up to 44.0 X-Git-Tag: auto/th/iceweasel-44.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=510bf2b56fbcab3dd908db585f75218e9d961569;p=packages%2Ficeweasel.git - up to 44.0 - don't disable logging, option broken upstream --- diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch index 8547ce4..151cae8 100644 --- a/iceweasel-branding.patch +++ b/iceweasel-branding.patch @@ -71,7 +71,7 @@ diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/overrides/appstrings contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. externalProtocolTitle=External Protocol Request -@@ -34,6 +34,6 @@ +@@ -34,8 +34,8 @@ phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information. cspBlocked=This page has a content security policy that prevents it from being loaded in this way. corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected. @@ -80,17 +80,9 @@ diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/overrides/appstrings ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S". -sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. +#expand sslv3Used=__MOZ_APP_DISPLAYNAME__ cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. -diff -ruN mozilla-release.orig/browser/locales/en-US/searchplugins/answers.xml mozilla-release/browser/locales/en-US/searchplugins/answers.xml ---- mozilla-release.orig/browser/locales/en-US/searchplugins/answers.xml 2015-08-07 17:54:09.000000000 +0200 -+++ mozilla-release/browser/locales/en-US/searchplugins/answers.xml 2015-08-11 20:16:54.725923180 +0200 -@@ -12,6 +12,6 @@ - - - -+#expand template="http://www.answers.com/main/startswith?output=json&client=__MOZ_APP_NAME__&s={searchTerms}"/> - http://www.answers.com/ - + ## LOCALIZATION NOTE (weakCryptoUsed) - Do not translate "%S". +-weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Firefox has not connected to this website. ++#expand weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, __MOZ_APP_DISPLAYNAME__ has not connected to this website. diff -ruN mozilla-release.orig/browser/locales/en-US/searchplugins/google.xml mozilla-release/browser/locales/en-US/searchplugins/google.xml --- mozilla-release.orig/browser/locales/en-US/searchplugins/google.xml 2015-08-07 17:54:09.000000000 +0200 +++ mozilla-release/browser/locales/en-US/searchplugins/google.xml 2015-08-11 20:16:54.726923177 +0200 diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch index db249ed..f9d6f6d 100644 --- a/iceweasel-packaging.patch +++ b/iceweasel-packaging.patch @@ -27,8 +27,8 @@ diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-rel +#ifndef LIBXUL_SDK @RESPATH@/dependentlibs.list +#endif - #ifdef GKMEDIAS_SHARED_LIBRARY - @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ + #ifdef MOZ_SHARED_MOZGLUE + @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #endif @@ -70,8 +76,10 @@ @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ @@ -150,9 +150,9 @@ diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-rel @RESPATH@/components/FeedProcessor.manifest @RESPATH@/components/FeedProcessor.js +#endif + @RESPATH@/components/PackagedAppUtils.js + @RESPATH@/components/PackagedAppUtils.manifest @RESPATH@/browser/components/BrowserFeeds.manifest - @RESPATH@/browser/components/FeedConverter.js - @RESPATH@/browser/components/FeedWriter.js @@ -391,6 +421,7 @@ @RESPATH@/browser/components/webideComponents.manifest @RESPATH@/browser/components/Experiments.manifest @@ -246,15 +246,6 @@ diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-rel @RESPATH@/browser/defaults/profile/prefs.js #ifndef LIBXUL_SDK -@@ -710,7 +756,7 @@ - @RESPATH@/defaults/pref/channel-prefs.js - #else - ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) --@RESPATH@/@PREF_DIR@/channel-prefs.js -+@RESPATH@/browser/@PREF_DIR@/channel-prefs.js - #endif - - ; Services (gre) prefs @@ -718,11 +764,14 @@ @RESPATH@/defaults/pref/services-notifications.js #endif diff --git a/iceweasel.spec b/iceweasel.spec index 1d66b4d..bfeefb9 100644 --- a/iceweasel.spec +++ b/iceweasel.spec @@ -22,12 +22,12 @@ Summary: Iceweasel web browser Summary(hu.UTF-8): Iceweasel web böngésző Summary(pl.UTF-8): Iceweasel - przeglądarka WWW Name: iceweasel -Version: 43.0.4 +Version: 44.0 Release: 1 License: MPL v2.0 Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz -# Source0-md5: a4a5f0d069cf5414ab53afaffc9d1580 +# Source0-md5: 9d940e72f9eaff767fafcfbcc387594d Source1: %{name}-branding.tar.xz # Source1-md5: 8f25cec142ee276cb516940db12076db Source2: %{name}-rm_nonfree.sh @@ -261,7 +261,6 @@ ac_add_options --enable-crash-on-assert %else ac_add_options --disable-debug ac_add_options --disable-debug-modules -ac_add_options --disable-logging ac_add_options --enable-optimize="%{rpmcflags} -Os" %endif ac_add_options --disable-strip