[packages/xulrunner] - probably safer method to force system virtualenv usage

baggins baggins at pld-linux.org
Tue May 14 22:58:20 CEST 2013


commit 42132c5859685c79270043fc43ee201c80e87ab8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 14 22:57:54 2013 +0200

    - probably safer method to force system virtualenv usage

 system-virtualenv.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index 6ce0dd7..a2d150f 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,12 +1,12 @@
---- xulrunner-19.0/mozilla/configure~	2013-02-20 12:39:40.270435866 +0100
-+++ xulrunner-19.0/mozilla/configure	2013-02-20 12:39:58.623768601 +0100
-@@ -1336,8 +1336,7 @@
+--- 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'
  
- if test -z $DONT_POPULATE_VIRTUALENV; then
-   echo "$ac_t""Creating Python environment" 1>&6
--        $PYTHON $_virtualenv_populate_path \
--    $_virtualenv_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
- 
- case "$host_os" in
- mingw*)
+     @property
+     def python_path(self):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/42132c5859685c79270043fc43ee201c80e87ab8



More information about the pld-cvs-commit mailing list