[packages/iceweasel] - up to 33.0
baggins
baggins at pld-linux.org
Tue Oct 14 23:55:53 CEST 2014
commit 34b9ad88b87343baf8447742b344808e3486d583
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Oct 14 23:55:46 2014 +0200
- up to 33.0
Disable-Firefox-Health-Report.patch | 2 +-
iceweasel-branding.patch | 6 +++---
iceweasel.spec | 8 +++++---
3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 91ee4c6..a0ebbd1 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -26,12 +26,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: 32.0.3
-Release: 3
+Version: 33.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.bz2
-# Source0-md5: 618bf992a5cb80f8879435262bdfcee0
+# Source0-md5: b0e793898bddf4f2bc46e42a331f3383
Source1: %{name}-branding.tar.xz
# Source1-md5: 6e3c10921c5b243f33241646b7941ce9
Source2: %{name}-rm_nonfree.sh
@@ -87,9 +87,11 @@ BuildRequires: pixman-devel >= 0.19.2
BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libffi) >= 3.0.9
+BuildRequires: pulseaudio-devel
BuildRequires: python-modules
%{?with_pgo:BuildRequires: python-modules-sqlite}
BuildRequires: python-virtualenv
+BuildRequires: readline-devel
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
BuildRequires: sqlite3-devel >= 3.8.3.1
diff --git a/Disable-Firefox-Health-Report.patch b/Disable-Firefox-Health-Report.patch
index bf66b3a..081a9b2 100644
--- a/Disable-Firefox-Health-Report.patch
+++ b/Disable-Firefox-Health-Report.patch
@@ -11,9 +11,9 @@ index 35cbdac..906de7a 100644
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -27,7 +27,7 @@ MOZ_CHROME_FILE_FORMAT=omni
+ MOZ_SAFE_BROWSING=1
MOZ_SERVICES_COMMON=1
MOZ_SERVICES_CRYPTO=1
- MOZ_SERVICES_FXACCOUNTS=1
-MOZ_SERVICES_HEALTHREPORT=1
+MOZ_SERVICES_HEALTHREPORT=
MOZ_SERVICES_METRICS=1
diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index afe29e2..b3d6506 100644
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -44,11 +44,11 @@ index 24f1574..9c98f3e 100644
@@ -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,test-malware-simple");
+ pref("urlclassifier.malwareTable", "goog-malware-shavar,test-malware-simple");
+#ifdef MOZ_OFFICIAL_BRANDING
- pref("urlclassifier.phish_table", "goog-phish-shavar,test-phish-simple");
+ pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple");
+#else
-+pref("urlclassifier.phish_table", "googpub-phish-shavar,test-phish-simple");
++pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple");
+#endif
pref("urlclassifier.downloadBlockTable", "");
pref("urlclassifier.downloadAllowTable", "");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/34b9ad88b87343baf8447742b344808e3486d583
More information about the pld-cvs-commit
mailing list