| 1 |
je_fro 09/08/02 14:58:31 |
| 2 |
|
| 3 |
Added: pymol-1.2.1-data-path.patch |
| 4 |
pymol-1.2.1-shaders.patch |
| 5 |
Log: |
| 6 |
New version, works with python 2.6, closes bug #269119. Many thanks to Justin Lecher for doing the work, and fauli for a kick in the pants :) |
| 7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/pymol/files/1.2.1/pymol-1.2.1-data-path.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/1.2.1/pymol-1.2.1-data-path.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/1.2.1/pymol-1.2.1-data-path.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pymol-1.2.1-data-path.patch |
| 16 |
=================================================================== |
| 17 |
diff -arNu -uarN pymol/modules/pymol/commanding.py pymol.new/modules/pymol/commanding.py |
| 18 |
--- pymol/modules/pymol/commanding.py 2009-03-31 12:43:14.585834066 +0200 |
| 19 |
+++ pymol.new/modules/pymol/commanding.py 2009-03-31 12:44:26.436354330 +0200 |
| 20 |
@@ -219,11 +219,11 @@ |
| 21 |
_self.unlock(0,_self) |
| 22 |
r = DEFAULT_SUCCESS |
| 23 |
if show_splash==1: # generic / open-source |
| 24 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/splash.png") |
| 25 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/splash.png") |
| 26 |
elif show_splash==2: # evaluation builds |
| 27 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/epymol.png") |
| 28 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/epymol.png") |
| 29 |
else: # incentive builds |
| 30 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/ipymol.png") |
| 31 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/ipymol.png") |
| 32 |
if os.path.exists(png_path): |
| 33 |
_self.do("_ cmd.load_png('%s',0,quiet=1)"%png_path) |
| 34 |
else: |
| 35 |
diff -arNu -uarN pymol/modules/pymol/importing.py pymol.new/modules/pymol/importing.py |
| 36 |
--- pymol/modules/pymol/importing.py 2009-03-31 12:43:14.546250540 +0200 |
| 37 |
+++ pymol.new/modules/pymol/importing.py 2009-03-31 12:44:48.876657949 +0200 |
| 38 |
@@ -191,7 +191,7 @@ |
| 39 |
''' |
| 40 |
r = DEFAULT_ERROR |
| 41 |
|
| 42 |
- tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png", |
| 43 |
+ tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png", |
| 44 |
'pymol' : 'pymol', |
| 45 |
'rgb' : 'rgb' } |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 sci-chemistry/pymol/files/1.2.1/pymol-1.2.1-shaders.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/1.2.1/pymol-1.2.1-shaders.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/1.2.1/pymol-1.2.1-shaders.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: pymol-1.2.1-shaders.patch |
| 56 |
=================================================================== |
| 57 |
--- pymol-1.2_rc1/setup.py.old 2009-07-17 00:05:10.339203020 -0500 |
| 58 |
+++ pymol-1.2_rc1/setup.py 2009-07-17 00:09:03.375274561 -0500 |
| 59 |
@@ -138,6 +138,7 @@ |
| 60 |
("_PYMOL_INLINE",None), |
| 61 |
("_PYMOL_FREETYPE",None), |
| 62 |
("_PYMOL_LIBPNG",None), |
| 63 |
+ ("_PYMOL_OPENGL_SHADERS",None), |
| 64 |
# Numeric Python support |
| 65 |
# ("_PYMOL_NUMPY",None), |
| 66 |
# VMD plugin support |
Archives