[packages/iceweasel] - partial update
arekm
arekm at pld-linux.org
Wed Feb 20 17:26:47 CET 2013
commit 23c292acdc7034af53f1158939766e613089193a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Feb 20 17:26:45 2013 +0100
- partial update
iceweasel-branding.patch | 6 ++---
iceweasel-install.patch | 2 +-
iceweasel.spec | 14 +++++------
system-virtualenv.patch | 65 ++++++++++++++++++++++++++++++++++--------------
4 files changed, 58 insertions(+), 29 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 65a5c6d..3349105 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -14,27 +14,27 @@
%endif
# convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define xulrunner_main 18.0
-%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#18.0})
+%define xulrunner_main 19.0
+%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#19.0})
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
%endif
-%define nspr_ver 4.9.3
-%define nss_ver 3.14.1
+%define nspr_ver 4.9.5
+%define nss_ver 3.14.3
Summary: Iceweasel web browser
Summary(hu.UTF-8): Iceweasel web böngésző
Summary(pl.UTF-8): Iceweasel - przeglądarka WWW
Name: iceweasel
-Version: 18.0.1
-Release: 1
+Version: 19.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: 8b400555fc7063163e3b99472d0c92a1
+# Source0-md5: 3dc732b6ce177792b43324f4bc7164d8
Source1: %{name}-branding.tar.bz2
# Source1-md5: 816d926bd2c76a5bba5108979ba776ac
Source2: %{name}-rm_nonfree.sh
diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index a04842e..6d6842a 100644
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -68,10 +68,10 @@ index 8585a34..3aceb9f 100644
+endif
+
include $(topsrcdir)/config/rules.mk
-diff --git a/browser/components/safebrowsing/SafeBrowsing.jsm b/browser/components/safebrowsing/SafeBrowsing.jsm
+diff --git a/toolkit/components/url-classifier/SafeBrowsing.jsm b/toolkit/components/url-classifier/SafeBrowsing.jsm
index 313ac48..ba9b6f4 100644
---- a/browser/components/safebrowsing/SafeBrowsing.jsm
-+++ b/browser/components/safebrowsing/SafeBrowsing.jsm
+--- a/toolkit/components/url-classifier/SafeBrowsing.jsm
++++ b/toolkit/components/url-classifier/SafeBrowsing.jsm
@@ -10,7 +10,11 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
diff --git a/iceweasel-install.patch b/iceweasel-install.patch
index a0335ee..3265748 100644
--- a/iceweasel-install.patch
+++ b/iceweasel-install.patch
@@ -32,7 +32,7 @@
@@ -708,41 +708,41 @@
endif
- stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
+ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
- @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
+ @rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
ifndef MOZ_FAST_PACKAGE
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index a69cd1a..3c73184 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,24 +1,53 @@
Restore --system-site-packages when system virtualenv gets 1.7 upgrade
---- xulrunner-15.0/mozilla/configure.in~ 2012-08-29 11:06:34.517985819 +0200
-+++ xulrunner-15.0/mozilla/configure.in 2012-08-29 11:23:47.234616054 +0200
-@@ -9069,7 +9069,7 @@
- AC_MSG_RESULT([Creating Python virtualenv])
- rm -rf _virtualenv
- mkdir -p _virtualenv
--MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
-+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+--- a/mozilla/configure.in~ 2013-02-15 22:14:45.000000000 +0100
++++ a/mozilla/configure.in 2013-02-20 17:05:55.258742791 +0100
+@@ -141,7 +141,7 @@
+ PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
+ ;;
+ *)
+- PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python
++ PYTHON=/usr/bin/virtualenv
+ ;;
+ esac
+
+--- a/mozilla/configure~ 2013-02-15 22:15:48.000000000 +0100
++++ a/mozilla/configure 2013-02-20 17:06:11.479134735 +0100
+@@ -1344,7 +1344,7 @@
+ PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
+ ;;
+ *)
+- PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python
++ PYTHON=/usr/bin/virtualenv
+ ;;
+ esac
+
+--- iceweasel-19.0/mozilla/configure.in~ 2013-02-20 17:11:35.849980531 +0100
++++ iceweasel-19.0/mozilla/configure.in 2013-02-20 17:18:24.806617099 +0100
+@@ -128,13 +128,6 @@
+ AC_MSG_ERROR([python was not found in \$PATH])
+ fi
+
+-AC_MSG_RESULT([Creating Python environment])
+-dnl This verifies our Python version is sane and ensures the Python
+-dnl virtualenv is present and up to date. It sanitizes the environment
+-dnl for us, so we don't need to clean anything out.
+-$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
+- $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
+-
+ dnl Create a virtualenv where we can install local Python packages
case "$host_os" in
mingw*)
- PYTHON=`pwd`/_virtualenv/Scripts/python.exe
---- xulrunner-15.0/mozilla/configure~ 2012-08-29 11:25:28.121279162 +0200
-+++ xulrunner-15.0/mozilla/configure 2012-08-29 11:27:27.981274936 +0200
-@@ -25468,7 +25468,7 @@
- echo "$ac_t""Creating Python virtualenv" 1>&6
- rm -rf _virtualenv
- mkdir -p _virtualenv
--MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
-+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+--- iceweasel-19.0/mozilla/configure~ 2013-02-20 17:11:35.853313949 +0100
++++ iceweasel-19.0/mozilla/configure 2013-02-20 17:17:59.639339399 +0100
+@@ -1335,10 +1335,6 @@
+ { echo "configure: error: python was not found in \$PATH" 1>&2; exit 1; }
+ fi
+
+-echo "$ac_t""Creating Python environment" 1>&6
+-$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
+- $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
+-
case "$host_os" in
mingw*)
- PYTHON=`pwd`/_virtualenv/Scripts/python.exe
+ PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/23c292acdc7034af53f1158939766e613089193a
More information about the pld-cvs-commit
mailing list