diff options
Diffstat (limited to 'science/py-pymol/files')
-rw-r--r-- | science/py-pymol/files/patch-create__shadertext.py | 34 | ||||
-rw-r--r-- | science/py-pymol/files/patch-setup.py | 22 |
2 files changed, 56 insertions, 0 deletions
diff --git a/science/py-pymol/files/patch-create__shadertext.py b/science/py-pymol/files/patch-create__shadertext.py new file mode 100644 index 000000000000..20bf5c027e0e --- /dev/null +++ b/science/py-pymol/files/patch-create__shadertext.py @@ -0,0 +1,34 @@ +--- create_shadertext.py.orig 2017-03-09 18:16:07 UTC ++++ create_shadertext.py +@@ -93,19 +93,20 @@ def create_shadertext(shaderdir, shaderd + + def create_buildinfo(outputdir, pymoldir='.'): + +- try: +- sha = Popen(['git', 'rev-parse', 'HEAD'], cwd=pymoldir, +- stdout=PIPE).stdout.read().strip().decode() +- except OSError: +- sha = '' ++ #try: ++ # sha = Popen(['git', 'rev-parse', 'HEAD'], cwd=pymoldir, ++ # stdout=PIPE).stdout.read().strip().decode() ++ #except OSError: ++ # sha = '' ++ sha = 'n/a' + + rev = 0 +- try: +- for line in Popen(['svn', 'info'], cwd=pymoldir, stdout=PIPE).stdout: +- if line.startswith(b'Last Changed Rev'): +- rev = int(line.split()[3]) +- except OSError: +- pass ++ #try: ++ # for line in Popen(['svn', 'info'], cwd=pymoldir, stdout=PIPE).stdout: ++ # if line.startswith(b'Last Changed Rev'): ++ # rev = int(line.split()[3]) ++ #except OSError: ++ # pass + + with openw(os.path.join(outputdir, 'PyMOLBuildInfo.h')) as out: + print(''' diff --git a/science/py-pymol/files/patch-setup.py b/science/py-pymol/files/patch-setup.py new file mode 100644 index 000000000000..9c43d171c4cb --- /dev/null +++ b/science/py-pymol/files/patch-setup.py @@ -0,0 +1,22 @@ +--- setup.py.orig 2017-03-09 18:16:07 UTC ++++ setup.py +@@ -52,6 +52,8 @@ try: + "keyword support.") + parser.add_argument('--help-distutils', action="store_true", + help="show help for distutils options and exit") ++ parser.add_argument('--single-version-externally-managed', action="store_true", ++ help="single-version-externally-managed") + options, sys.argv[1:] = parser.parse_known_args(namespace=options) + except ImportError: + print("argparse not available") +@@ -318,8 +320,8 @@ else: # unix style (linux, mac, ...) + + # optimization currently causes a clang segfault on OS X 10.9 when + # compiling layer2/RepCylBond.cpp +- if sys.platform != 'darwin': +- ext_comp_args += ["-O3"] ++ #if sys.platform != 'darwin': ++ # ext_comp_args += ["-O3"] + + def get_pymol_version(): + return re.findall(r'_PyMOL_VERSION "(.*)"', open('layer0/Version.h').read())[0] |