File skia-pathops-py3.patch of Package python-skia-pathops
Index: skia-pathops-0.7.4/src/cpp/skia-builder/build_skia.py
===================================================================
--- skia-pathops-0.7.4.orig/src/cpp/skia-builder/build_skia.py
+++ skia-pathops-0.7.4/src/cpp/skia-builder/build_skia.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import sys
import argparse
@@ -60,41 +60,44 @@ def make_virtualenv(venv_dir):
from contextlib import closing
import io
- try:
- from urllib2 import urlopen # PY2
- except ImportError:
- from urllib.request import urlopen # PY3
+# try:
+# from urllib2 import urlopen # PY2
+# except ImportError:
+# from urllib.request import urlopen # PY3
+ from urllib.request import urlopen # PY3
bin_dir = "Scripts" if sys.platform == "win32" else "bin"
venv_bin_dir = os.path.join(venv_dir, bin_dir)
- python_exe = os.path.join(venv_bin_dir, "python" + EXE_EXT)
+ python_exe = os.path.join(venv_bin_dir, "python3" + EXE_EXT)
# bootstrap virtualenv if not already present
if not os.path.exists(python_exe):
if not os.path.isdir(venv_bin_dir):
os.makedirs(venv_bin_dir)
- virtualenv_pyz = os.path.join(venv_bin_dir, "virtualenv.pyz")
- with open(virtualenv_pyz, "wb") as f:
- with closing(urlopen(GET_VIRTUALENV_URL)) as response:
- f.write(response.read())
- returncode = subprocess.Popen(
- [sys.executable, virtualenv_pyz, "--no-download", venv_dir]
- ).wait()
- if returncode != 0:
- sys.exit("failed to create virtualenv")
+ #virtualenv_pyz = os.path.join(venv_bin_dir, "virtualenv.pyz")
+ #with open(virtualenv_pyz, "wb") as f:
+ # with closing(urlopen(GET_VIRTUALENV_URL)) as response:
+ # f.write(response.read())
+ #returncode = subprocess.Popen(
+ # [sys.executable, virtualenv_pyz, "--no-download", venv_dir]
+ #).wait()
+ #if returncode != 0:
+ # sys.exit("failed to create virtualenv")
+ os.symlink("/usr/bin/python3."+str(sys.version_info.minor), python_exe)
assert os.path.exists(python_exe)
# pip install ninja
ninja_exe = os.path.join(venv_bin_dir, "ninja" + EXE_EXT)
if not os.path.exists(ninja_exe):
- subprocess.check_call(
- [
- os.path.join(venv_bin_dir, "pip" + EXE_EXT),
- "install",
- "--only-binary=ninja",
- "ninja",
- ]
- )
+ os.symlink("/usr/bin/ninja", ninja_exe)
+ #subprocess.check_call(
+ # [
+ # os.path.join(venv_bin_dir, "pip" + EXE_EXT),
+ # "install",
+ # "--only-binary=ninja",
+ # "ninja",
+ # ]
+ #)
# place virtualenv bin in front of $PATH, like 'source venv/bin/activate'
env = os.environ.copy()
@@ -212,13 +215,13 @@ if __name__ == "__main__":
if args.sync_deps:
subprocess.check_call(
- ["python", os.path.join("tools", "git-sync-deps")],
+ ["python3", os.path.join("tools", "git-sync-deps")],
env=env,
cwd=SKIA_SRC_DIR,
)
elif args.fetch_gn:
subprocess.check_call(
- ["python", os.path.join("bin", "fetch-gn")],
+ ["python3", os.path.join("bin", "fetch-gn")],
env=env,
cwd=SKIA_SRC_DIR,
)