- started update to 2.53.4

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

diff --git a/seamonkey-system-virtualenv.patch b/seamonkey-system-virtualenv.patch
index e3f7b2cd0e5f3d38b179589e8de94d125dc14f8a..9709787e50125df737c4fe09b70fd5d1330a6541 100644 (file)
--- a/seamonkey-system-virtualenv.patch
+++ b/seamonkey-system-virtualenv.patch
@@ -1,23 +1,12 @@
---- xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~     2013-05-11 21:19:23.000000000 +0200
-+++ xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py      2013-05-14 22:51:32.136719267 +0200
-@@ -37,8 +37,7 @@
+--- seamonkey-2.53.4/mozilla/python/mozbuild/mozbuild/virtualenv.py.orig       2020-10-09 08:14:38.869199627 +0200
++++ seamonkey-2.53.4/mozilla/python/mozbuild/mozbuild/virtualenv.py    2020-10-09 08:30:19.570770076 +0200
+@@ -66,8 +66,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'
+-        return os.path.join(self.topsrcdir, 'third_party', 'python',
+-            'virtualenv', 'virtualenv.py')
++        return '/usr/bin/virtualenv-2'
  
      @property
-     def python_path(self):
---- comm-release/mail/test/resources/installmozmill.py.orig    2014-10-14 08:26:59.000000000 +0200
-+++ comm-release/mail/test/resources/installmozmill.py 2014-12-02 17:52:03.074177834 +0100
-@@ -79,7 +79,7 @@
-   env = os.environ.copy()
-   env.pop('PYTHONHOME', None)
-   # The --no-site-packages is because of https://github.com/pypa/virtualenv/issues/165
--  returncode = call([sys.executable, os.path.join('virtualenv', 'virtualenv.py'),
-+  returncode = call([sys.executable, '/usr/bin/virtualenv',
-                      destination], env=env)
-   if returncode:
-     print 'Failure to install virtualenv'
+     def bin_path(self):