Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31555
Modified Files:
pymol-py.patch
Log Message:
update to 1.6.0
Index: pymol-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/pymol-py.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pymol-py.patch 8 Mar 2013 17:04:03 -0000 1.7
+++ pymol-py.patch 23 Aug 2013 17:53:04 -0000 1.8
@@ -56,18 +56,6 @@
win.deactivate()
else: # autocenter, deiconify, and run mainloop
win.destroy()
-diff -uNr pymol-1.5/modules/pmg_tk/startup/apbs_tools.py
pymol-1.5.fink/modules/pmg_tk/startup/apbs_tools.py
---- pymol-1.5/modules/pmg_tk/startup/apbs_tools.py 2013-02-25
22:21:16.000000000 -0500
-+++ pymol-1.5.fink/modules/pmg_tk/startup/apbs_tools.py 2013-03-08
10:29:35.000000000 -0500
-@@ -141,7 +141,7 @@
- # APBS_BINARY_LOCATION = '/opt/bin/apbs'
- #
- APBS_BINARY_LOCATION = None
--APBS_PSIZE_LOCATION = None
-+APBS_PSIZE_LOCATION = '@FINKPREFIX@/share/apbs/tools/manip'
- APBS_PDB2PQR_LOCATION = None
- TEMPORARY_FILE_DIR = None
-
diff -uNr pymol-1.5/modules/pymol/__init__.py
pymol-1.5.fink/modules/pymol/__init__.py
--- pymol-1.5/modules/pymol/__init__.py 2013-02-25 22:21:15.000000000
-0500
+++ pymol-1.5.fink/modules/pymol/__init__.py 2013-03-08 10:31:16.000000000
-0500
@@ -100,15 +88,66 @@
+else
+ exec @FINKPREFIX@/bin/python2.X
@FINKPREFIX@/lib/python2.X/site-packages/pymol/__init__.py -d "_ set
stereo_double_pump_mono,quiet=1" -M "$@"
+fi
-diff -uNr pymol-1.5/setup.py pymol-1.5.fink/setup.py
---- pymol-1.5/setup.py 2013-02-25 22:22:12.000000000 -0500
-+++ pymol-1.5.fink/setup.py 2013-03-08 10:29:35.000000000 -0500
-@@ -216,7 +216,7 @@
+--- pymol-1.6.0/modules/pmg_tk/startup/apbs_tools.py.orig 2013-08-22
16:13:42.000000000 -0400
++++ pymol-1.6.0/modules/pmg_tk/startup/apbs_tools.py 2013-08-22
16:27:00.000000000 -0400
+@@ -160,7 +160,7 @@
+ #
+ APBS_BINARY_LOCATION = None # corresponding environment variable:
APBS_BINARY_DIR
+ APBS_WEB_LOCATION = None # corresponding environment variable: APBS_WEB_DIR
+-APBS_PSIZE_LOCATION = None # corresponding environment variable:
APBS_PSIZE_DIR
++APBS_PSIZE_LOCATION = '@FINKPREFIX@/share/apbs/tools/manip' # corresponding
environment variable: APBS_PSIZE_DIR
+ APBS_PDB2PQR_LOCATION = None # corresponding environment variable:
APBS_PDB2PQR_DIR
+ TEMPORARY_FILE_DIR = tempfile.gettempdir() # corresponding environment
variable: TEMP
- libs += ["png", "freetype"]
+--- pymol-1.6.0/setup.py.orig 2013-08-22 16:13:55.000000000 -0400
++++ pymol-1.6.0/setup.py 2013-08-22 16:31:39.000000000 -0400
+@@ -246,7 +246,7 @@
+ try:
+ prefix_path = os.environ['PREFIX_PATH'].split(os.pathsep)
+ except KeyError:
+- prefix_path = ["/usr", "/usr/X11", "/opt/local", "/sw"]
++ prefix_path = ["@FINKPREFIX@", "/usr", "/usr/X11"]
-- for prefix in ["/usr", "/usr/X11", "/opt/local", "/sw"]:
-+ for prefix in ["@FINKPREFIX@", "/usr", "/usr/X11"]:
+ for prefix in prefix_path:
inc_dirs += filter(os.path.isdir, [prefix + s for s in ["/include",
"/include/freetype2"]])
- lib_dirs += filter(os.path.isdir, [prefix + s for s in ["/lib"]])
+--- pymol-1.6.0/setup.py.orig 2013-08-22 17:15:04.000000000 -0400
++++ pymol-1.6.0/setup.py 2013-08-22 17:14:47.000000000 -0400
+@@ -47,18 +47,6 @@
+ pmap(_single_compile, objects)
+ return objects
+
+-# handle extra arguments
+-class options:
+- osx_frameworks = False
+-
+-try:
+- import argparse
+- parser = argparse.ArgumentParser()
+- parser.add_argument('--osx-frameworks', action="store_true")
+- options, sys.argv = parser.parse_known_args(namespace=options)
+-except ImportError:
+- print "argparse not available"
+-
+ jobs = int(os.getenv('JOBS', 0))
+ pmap = map if jobs == 1 else multiprocessing.pool.ThreadPool(jobs or None).map
+@@ -252,16 +240,11 @@
+ inc_dirs += filter(os.path.isdir, [prefix + s for s in ["/include",
"/include/freetype2"]])
+ lib_dirs += filter(os.path.isdir, [prefix + s for s in ["/lib64",
"/lib"]])
+
+- if sys.platform == 'darwin' and options.osx_frameworks:
+- ext_link_args += [
+- "-framework", "OpenGL",
+- "-framework", "GLUT",
+- ]
+- else:
+- glut = posix_find_lib(['glut', 'freeglut'], lib_dirs)
+- pyogl_libs += ["GL", "GLU", glut]
++ glut = posix_find_lib(['glut', 'freeglut'], lib_dirs)
+
+ libs += ["GLEW"]
++ pyogl_libs += ["GL", "GLU", glut]
++
+ libs += pyogl_libs
+
+ ext_comp_args += ["-ffast-math", "-funroll-loops", "-O3", "-fcommon"]
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
