[packages/iceweasel] - partial 31.0 update
arekm
arekm at pld-linux.org
Thu Jul 24 14:24:45 CEST 2014
commit a1c185815c170176ba3c7fcd6af6578077fef64a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Jul 24 14:24:43 2014 +0200
- partial 31.0 update
iceweasel-branding.patch | 23 +++++++++++++++--------
iceweasel-middle_click_paste.patch | 6 +++---
iceweasel.spec | 12 ++++++------
3 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index b337c74..6c6b374 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -9,8 +9,8 @@
%bcond_with pgo # PGO-enabled build (requires working $DISPLAY == :100)
# convert firefox release number to platform version: 29.0.x -> 29.0.x
-%define xulrunner_main 29.0
-%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#29.0})
+%define xulrunner_main 31.0
+%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#31.0})
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -24,14 +24,14 @@ Summary: Iceweasel web browser
Summary(hu.UTF-8): Iceweasel web böngésző
Summary(pl.UTF-8): Iceweasel - przeglądarka WWW
Name: iceweasel
-Version: 29.0.1
-Release: 2
+Version: 31.0
+Release: 0.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.bz2
-# Source0-md5: ca37addc3a69ef30247e00375dd93cd0
+# Source0-md5: 499b70a9f08a2291d528e87eaf8804a3
Source1: %{name}-branding.tar.bz2
-# Source1-md5: 26e1aa664d0196552792104fa5f8a1e0
+# Source1-md5: 513af080c920d916362b607a872adf00
Source2: %{name}-rm_nonfree.sh
Source3: %{name}.desktop
Source4: %{name}.sh
diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index d158601..afe29e2 100644
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -41,17 +41,18 @@ diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 24f1574..9c98f3e 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
-@@ -4538,7 +4538,11 @@ pref("dom.inter-app-communication-api.enabled", false);
+@@ -4432,7 +4432,11 @@ pref("dom.inter-app-communication-api.en
// The tables used for Safebrowsing phishing and malware checks.
- pref("urlclassifier.malware_table", "goog-malware-shavar");
+ pref("urlclassifier.malware_table", "goog-malware-shavar,test-malware-simple");
+#ifdef MOZ_OFFICIAL_BRANDING
- pref("urlclassifier.phish_table", "goog-phish-shavar");
+ pref("urlclassifier.phish_table", "goog-phish-shavar,test-phish-simple");
+#else
-+pref("urlclassifier.phish_table", "googpub-phish-shavar");
++pref("urlclassifier.phish_table", "googpub-phish-shavar,test-phish-simple");
+#endif
- pref("urlclassifier.download_block_table", "");
- pref("urlclassifier.download_allow_table", "");
+ pref("urlclassifier.downloadBlockTable", "");
+ pref("urlclassifier.downloadAllowTable", "");
+ pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,goog-downloadwhite-digest256");
From: Mike Hommey <mh at glandium.org>
Date: Sat, 19 Feb 2011 11:04:53 +0100
@@ -150,11 +151,11 @@ index 1de0093..8c77825 100644
malformedURI=The URL is not valid and cannot be loaded.
-fileNotFound=Firefox can't find the file at %S.
-dnsNotFound=Firefox can't find the server at %S.
--protocolNotFound=Firefox doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
+-unknownProtocolFound=Firefox doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context.
-connectionFailure=Firefox can't establish a connection to the server at %S.
+#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can't find the file at %S.
+#expand dnsNotFound=__MOZ_APP_DISPLAYNAME__ can't find the server at %S.
-+#expand protocolNotFound=__MOZ_APP_DISPLAYNAME__ doesn't know how to open this address, because the protocol (%S) isn't associated with any program.
++#expand unknownProtocolFound=__MOZ_APP_DISPLAYNAME__ doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context.
+#expand connectionFailure=__MOZ_APP_DISPLAYNAME__ can't establish a connection to the server at %S.
netInterrupt=The connection to %S was interrupted while the page was loading.
netTimeout=The server at %S is taking too long to respond.
@@ -179,3 +180,9 @@ index 1de0093..8c77825 100644
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
+@@ -33,4 +33,4 @@
+ phishingBlocked=The website at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
+ cspFrameAncestorBlocked=This page has a content security policy that prevents it from being embedded in this way.
+ corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
+-remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
++#expand remoteXUL=This page uses an unsupported technology that is no longer available by default in __MOZ_APP_DISPLAYNAME__.
diff --git a/iceweasel-middle_click_paste.patch b/iceweasel-middle_click_paste.patch
index b325338..14fc91a 100644
--- a/iceweasel-middle_click_paste.patch
+++ b/iceweasel-middle_click_paste.patch
@@ -1,9 +1,9 @@
--- iceweasel-13.0/mozilla/browser/base/content/browser.js.orig 2012-06-06 11:12:17.021562264 +0200
+++ iceweasel-13.0/mozilla/browser/base/content/browser.js 2012-06-06 11:21:37.000000000 +0200
-@@ -5231,12 +5231,9 @@
+@@ -5110,12 +5110,9 @@ function middleMousePaste(event) {
+ }
- Task.spawn(function() {
- let data = yield getShortcutOrURIAndPostData(clipboard);
+ getShortcutOrURIAndPostData(clipboard, data => {
- try {
- makeURI(data.url);
- } catch (ex) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/a1c185815c170176ba3c7fcd6af6578077fef64a
More information about the pld-cvs-commit
mailing list