- updated to 24.2.0

[packages/thunderbird.git] / system-virtualenv.patch

diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index a69cd1a28f7a10c860756adc5130bced67a80432..a2d150ff8ac26a4d3defa301da506f462b755971 100644 (file)
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,24 +1,12 @@
-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
- 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
- case "$host_os" in
- mingw*)
-     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
+--- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~    2013-05-11 21:19:23.000000000 +0200
++++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py     2013-05-14 22:51:32.136719267 +0200
+@@ -37,8 +37,7 @@
+     @property
+     def virtualenv_script_path(self):
+         """Path to virtualenv's own populator script."""
+-        return os.path.join(self.topsrcdir, 'python', 'virtualenv',
+-            'virtualenv.py')
++        return '/usr/bin/virtualenv'
+ 
+     @property
+     def python_path(self):