commit baf9bfaced12cecd2fae2596df6156887c35f934
Author: Jan Rękorajski <[email protected]>
Date: Mon Nov 26 23:20:42 2012 +0100
- updated to 17.0
- temp disabled packaging patch
iceweasel-branding.patch | 52 +++++++++++++++++++++++-------------------------
iceweasel-install.patch | 8 +++++++-
iceweasel.spec | 12 +++++------
system-virtualenv.patch | 4 ++--
4 files changed, 40 insertions(+), 36 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index a249ec8..273d026 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -14,8 +14,8 @@
%endif
# convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define xulrunner_main 15.0
-%define xulrunner_ver %(v=%{version}; echo
%{xulrunner_main}${v#15.0})
+%define xulrunner_main 17.0
+%define xulrunner_ver %(v=%{version}; echo
%{xulrunner_main}${v#16.0})
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -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: 15.0
-Release: 1
+Version: 17.0
+Release: 0.1
License: MPL 1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Networking
Source0:
ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 64220887a349515f16e5aa990acb4db3
+# Source0-md5: 3d9d2f6420344ff47a8af3a35ac4bdd6
Source1: %{name}-branding.tar.bz2
# Source1-md5: 816d926bd2c76a5bba5108979ba776ac
Source2: %{name}-rm_nonfree.sh
@@ -166,7 +166,7 @@ cd mozilla
%patch9 -p2
%patch10 -p2
%patch11 -p2
-%patch12 -p2
+#%patch12 -p2
%patch13 -p2
# config/rules.mk is patched by us and js/src/config/rules.mk
diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index e8b73f8..a04842e 100644
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -18,17 +18,17 @@ Subject: Determine which phishing shavar to use depending on
MOZ_OFFICIAL_BRANDING
---
- browser/app/Makefile.in | 4 ++++
- browser/app/profile/firefox.js | 4 ++++
- browser/components/safebrowsing/Makefile.in | 4 ++++
- browser/components/safebrowsing/content/application.js | 4 ++++
+ browser/app/Makefile.in | 4 ++++
+ browser/app/profile/firefox.js | 4 ++++
+ browser/components/safebrowsing/Makefile.in | 4 ++++
+ browser/components/safebrowsing/SafeBrowsing.jsm | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
-index 33728ad..b9be2ef 100644
+index 5f891ca..e337ef4 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
-@@ -161,6 +161,10 @@ endif
+@@ -132,6 +132,10 @@ endif
endif #} LIBXUL_SDK
@@ -40,11 +40,11 @@ index 33728ad..b9be2ef 100644
libs::
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 6ef79ef..e00195a 100644
+index d02a1b1..2b0b9fd 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -777,7 +777,11 @@ pref("urlclassifier.alternate_error_page", "blocked");
- pref("urlclassifier.gethashnoise", 4);
+@@ -742,7 +742,11 @@ pref("urlclassifier.gethashnoise", 4);
+ pref("urlclassifier.randomizeclient", false);
// The list of tables that use the gethash request to confirm partial results.
+#ifdef MOZ_OFFICIAL_BRANDING
@@ -56,36 +56,34 @@ index 6ef79ef..e00195a 100644
// If an urlclassifier table has not been updated in this number of seconds,
// a gethash request will be forced to check that the result is still in
diff --git a/browser/components/safebrowsing/Makefile.in
b/browser/components/safebrowsing/Makefile.in
-index 3833814..51b55df 100644
+index 8585a34..3aceb9f 100644
--- a/browser/components/safebrowsing/Makefile.in
+++ b/browser/components/safebrowsing/Makefile.in
-@@ -49,6 +49,10 @@ ifdef MOZILLA_OFFICIAL
- DEFINES += -DOFFICIAL_BUILD=1
- endif
+@@ -24,4 +24,8 @@ EXTRA_PP_JS_MODULES = \
+ SafeBrowsing.jsm \
+ $(NULL)
+ifdef MOZ_OFFICIAL_BRANDING
+DEFINES += -DMOZ_OFFICIAL_BRANDING
+endif
+
- EXTRA_COMPONENTS = \
- src/nsSafebrowsingApplication.manifest \
- $(NULL)
-diff --git a/browser/components/safebrowsing/content/application.js
b/browser/components/safebrowsing/content/application.js
-index d353cbc..ec32c92 100644
---- a/browser/components/safebrowsing/content/application.js
-+++ b/browser/components/safebrowsing/content/application.js
-@@ -109,7 +109,11 @@ PROT_Application.prototype.initialize = function() {
- this.malwareWarden.maybeToggleUpdateChecking();
+ include $(topsrcdir)/config/rules.mk
+diff --git a/browser/components/safebrowsing/SafeBrowsing.jsm
b/browser/components/safebrowsing/SafeBrowsing.jsm
+index 313ac48..ba9b6f4 100644
+--- a/browser/components/safebrowsing/SafeBrowsing.jsm
++++ b/browser/components/safebrowsing/SafeBrowsing.jsm
+@@ -10,7 +10,11 @@ const Cu = Components.utils;
+
+ Cu.import("resource://gre/modules/Services.jsm");
- this.phishWarden = new PROT_PhishingWarden();
+#ifdef MOZ_OFFICIAL_BRANDING
- this.phishWarden.registerBlackTable("goog-phish-shavar");
+ const phishingList = "goog-phish-shavar";
+#else
-+ this.phishWarden.registerBlackTable("googpub-phish-shavar");
++const phishingList = "googpub-phish-shavar";
+#endif
- this.phishWarden.maybeToggleUpdateChecking();
- }
+ const malwareList = "goog-malware-shavar";
+ var debug = false;
From: Mike Hommey <[email protected]>
Date: Sat, 19 Feb 2011 11:04:53 +0100
Subject: Modify search plugins depending on MOZ_APP_NAME
diff --git a/iceweasel-install.patch b/iceweasel-install.patch
index ba04a82..cedf58e 100644
--- a/iceweasel-install.patch
+++ b/iceweasel-install.patch
@@ -29,7 +29,7 @@
endif #} LIBXUL_SDK
--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19
00:34:12.000000000 +0100
+++ mozilla/toolkit/mozapps/installer/packager.mk 2011-03-22
23:53:43.877485659 +0100
-@@ -708,37 +708,37 @@
+@@ -708,41 +708,41 @@
endif
stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
@@ -72,6 +72,12 @@
- $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
+ $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
$(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+ ifdef MOZ_WEBAPP_RUNTIME
+- mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest
$(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
+- sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest >
$(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
++ mv
$(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest
$(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
++ sed 's/$(AB_CD)/localized/' $(DESTDIR)/bin/webapprt/chrome.manifest >
$(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
+ endif
- printf "manifest components/interfaces.manifest\nmanifest
components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest
chrome/localized.manifest\n" >
$(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
+ printf "manifest components/interfaces.manifest\nmanifest
components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest
chrome/localized.manifest\n" >
$(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
else # !MOZ_PKG_MANIFEST
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index bc76d83..a69cd1a 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -6,7 +6,7 @@ Restore --system-site-packages when system virtualenv gets 1.7
upgrade
AC_MSG_RESULT([Creating Python virtualenv])
rm -rf _virtualenv
mkdir -p _virtualenv
--MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON
$_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages
./_virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON
$_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv
./_virtualenv
case "$host_os" in
mingw*)
@@ -17,7 +17,7 @@ Restore --system-site-packages when system virtualenv gets
1.7 upgrade
echo "$ac_t""Creating Python virtualenv" 1>&6
rm -rf _virtualenv
mkdir -p _virtualenv
--MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON
$_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages
./_virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON
$_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv
./_virtualenv
case "$host_os" in
mingw*)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/baf9bfaced12cecd2fae2596df6156887c35f934
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
