[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Monday, December 28, 2020 @ 18:39:37
Author: ffy00
Revision: 795802
upgpkg: pymol 2.4.0-1
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-28 18:39:31 UTC (rev 795801)
+++ PKGBUILD2020-12-28 18:39:37 UTC (rev 795802)
@@ -3,13 +3,13 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=2.3.0
-pkgrel=4
+pkgver=2.4.0
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
url="https://pymol.org/;
license=('custom')
-depends=('freetype2' 'glew' 'glm' 'glut' 'python-numpy' 'tcsh')
+depends=('freetype2' 'glew' 'glm' 'glut' 'netcdf' 'netcdf-cxx' 'python-numpy'
'tcsh')
makedepends=('desktop-file-utils' 'gendesk' 'libmmtf' 'msgpack-c')
optdepends=('python-pmw: pmw based UI'
'python-pyqt5: Qt5 based UI')
@@ -16,7 +16,7 @@
source=("https://github.com/schrodinger/pymol-open-source/archive/v${pkgver}.tar.gz;
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon;
"apbstools_tcltk8.6.patch")
-sha512sums=('e1dcea1c97bcd9045d3543e92902f240e6affbf61a38e8d2a0be04309e3dbabfe1a869847d1423b3151008978d4c305bbf3ce994fc9d453c0063ce020100c133'
+sha512sums=('2b19294197d58a808bf7bb7fa9f829c2ec582ba47a4380783a2b1eedda2ce4118cd398e01885db8c449e7fd5e4c08a1c40508e679ef42d8e183a6a52b031c02a'
'39917c1dc80cd6a59e8f6b3ea49a59491eaf23d14e32ac264f6d71f33007f686deb6a66e50e7f20ef9df5337038e3572b018633c361460d5ee0c1d8f0a8259d1'
'90fce6d3c4364cd775b44bdd9013a08f26392339bec40ecd749220b3d11391381f5b159734bdb2e2ac675fbc016a6a1b9c4cec2fa8c9c0226609a5f09b610b9c')
changelog=ChangeLog
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Saturday, April 25, 2020 @ 16:57:36
Author: foutrelis
Revision: 620990
glew 2.2.0 rebuild
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-25 16:56:10 UTC (rev 620989)
+++ PKGBUILD2020-04-25 16:57:36 UTC (rev 620990)
@@ -4,7 +4,7 @@
pkgname=pymol
pkgver=2.3.0
-pkgrel=2
+pkgrel=3
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
url="https://pymol.org/;
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Monday, November 4, 2019 @ 06:25:55
Author: felixonmars
Revision: 523392
Python 3.8 rebuild
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 06:25:48 UTC (rev 523391)
+++ PKGBUILD2019-11-04 06:25:55 UTC (rev 523392)
@@ -4,7 +4,7 @@
pkgname=pymol
pkgver=2.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
url="https://pymol.org/;
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Wednesday, March 20, 2019 @ 12:45:37
Author: arcanis
Revision: 442954
use https instead of http in url field
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-20 12:40:41 UTC (rev 442953)
+++ PKGBUILD2019-03-20 12:45:37 UTC (rev 442954)
@@ -7,7 +7,7 @@
pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
-url="http://pymol.org/;
+url="https://pymol.org/;
license=('custom')
depends=('freetype2' 'glew' 'glm' 'glut' 'python-numpy' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk' 'libmmtf' 'msgpack-c')
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Tuesday, August 21, 2018 @ 11:00:50
Author: arojas
Revision: 373097
Drop qt4 optdepends
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-21 10:58:37 UTC (rev 373096)
+++ PKGBUILD2018-08-21 11:00:50 UTC (rev 373097)
@@ -6,7 +6,7 @@
pkgname=pymol
pkgver=2.1.0
_majorver=2
-pkgrel=3
+pkgrel=4
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
url="http://pymol.org/;
@@ -14,7 +14,6 @@
depends=('freetype2' 'glew' 'glut' 'python-numpy' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk' 'msgpack-c')
optdepends=('python-pmw: pmw based UI'
-'python-pyqt4: Qt4 based UI'
'python-pyqt5: Qt5 based UI')
source=("https://downloads.sourceforge.net/project/pymol/pymol/${_majorver}/pymol-v${pkgver}.tar.bz2;
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon;
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Monday, July 23, 2018 @ 16:16:38
Author: foutrelis
Revision: 363136
Python 3.7 rebuild
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-07-23 16:16:29 UTC (rev 363135)
+++ PKGBUILD2018-07-23 16:16:38 UTC (rev 363136)
@@ -6,7 +6,7 @@
pkgname=pymol
pkgver=2.1.0
_majorver=2
-pkgrel=2
+pkgrel=3
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
url="http://pymol.org/;
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Saturday, May 12, 2018 @ 01:04:51
Author: zorun
Revision: 320927
upgpkg: pymol 2.1.0-2
Msgpack 3.0.0 rebuild
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-12 01:03:27 UTC (rev 320926)
+++ PKGBUILD2018-05-12 01:04:51 UTC (rev 320927)
@@ -6,7 +6,7 @@
pkgname=pymol
pkgver=2.1.0
_majorver=2
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
url="http://pymol.org/;
@@ -20,7 +20,7 @@
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon;
"apbstools_tcltk8.6.patch")
sha512sums=('67175c0668a13826febcb73f7c62a43cfa03a7f86bb80113d52fb337e7d29008684c03163fc06338c4d68edd9246ffcf63aec1ee3110ae91c8a71ef24ab7b605'
-
'4ceb8123b21becac7f2f1e7c3521b8fbaa22038d76b4749d07d286eed1646025dccd1962e58c0923357261006deb589aaf1fe4f6f53fd2327475d8db3adca5c4'
+
'39917c1dc80cd6a59e8f6b3ea49a59491eaf23d14e32ac264f6d71f33007f686deb6a66e50e7f20ef9df5337038e3572b018633c361460d5ee0c1d8f0a8259d1'
'90fce6d3c4364cd775b44bdd9013a08f26392339bec40ecd749220b3d11391381f5b159734bdb2e2ac675fbc016a6a1b9c4cec2fa8c9c0226609a5f09b610b9c')
changelog=ChangeLog
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Thursday, August 3, 2017 @ 19:48:49
Author: felixonmars
Revision: 247906
GLEW 2.1.0 rebuild
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-08-03 19:47:37 UTC (rev 247905)
+++ PKGBUILD2017-08-03 19:48:49 UTC (rev 247906)
@@ -5,7 +5,7 @@
pkgname=pymol
pkgver=1.8.6.0
-pkgrel=2
+pkgrel=3
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/;
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 22:54:41
Author: bpiotrowski
Revision: 149269
C++11 ABI rebuild
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 21:54:41 UTC (rev 149268)
+++ PKGBUILD2015-12-06 21:54:41 UTC (rev 149269)
@@ -6,7 +6,7 @@
pkgname=pymol
pkgver=1.8.0.0.r4144
_pkgver=1.8.0.0-r4144
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/;
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Monday, September 28, 2015 @ 22:25:17
Author: foutrelis
Revision: 142140
poppler 0.36.0 / glew 1.13.0 rebuild
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-09-28 20:17:44 UTC (rev 142139)
+++ PKGBUILD2015-09-28 20:25:17 UTC (rev 142140)
@@ -5,7 +5,7 @@
pkgname=pymol
pkgver=1.7.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/;
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Tuesday, August 19, 2014 @ 00:44:29
Author: kkeen
Revision: 117564
upgpkg: pymol 1.7.2.0-2 glew rebuild
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-18 22:43:21 UTC (rev 117563)
+++ PKGBUILD2014-08-18 22:44:29 UTC (rev 117564)
@@ -5,7 +5,7 @@
pkgname=pymol
pkgver=1.7.2.0
-pkgrel=1
+pkgrel=2
pkgdesc=Molecular visualization system on an Open Source foundation
arch=('i686' 'x86_64')
url=http://pymol.org/;
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Tuesday, August 5, 2014 @ 07:37:06
Author: arcanis
Revision: 116878
upgpkg: pymol 1.7.2.0-1
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-05 00:20:04 UTC (rev 116877)
+++ PKGBUILD2014-08-05 05:37:06 UTC (rev 116878)
@@ -4,7 +4,7 @@
# Contributor: Tomasz Żok tomasz dot zok at gmail dot com
pkgname=pymol
-pkgver=1.7.1.3
+pkgver=1.7.2.0
pkgrel=1
pkgdesc=Molecular visualization system on an Open Source foundation
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
${pkgname}-38899.patch
apbstools_tcltk8.6.patch)
install=${pkgname}.install
-md5sums=('414e57a76d8e6e58540b743c1c2fb5ee'
+md5sums=('921b26d20f82d383ba5622baea946527'
'1f8152c4604ba2939b24e25a022937ca'
'c48bf253e59ff97c14114cd285a4f1e1')
@@ -36,7 +36,7 @@
mv ${srcdir}/${pkgname}/modules/web ${srcdir}/${pkgname}/modules/pymolweb
# fix FS#39526
cd ${srcdir}/${pkgname}
- #patch -p0 -i ${srcdir}/apbstools_tcltk8.6.patch
+ patch -p0 -i ${srcdir}/apbstools_tcltk8.6.patch
}
build() {
[arch-commits] Commit in pymol/trunk (PKGBUILD apbstools_tcltk8.6.patch)
Date: Tuesday, May 13, 2014 @ 23:32:07
Author: arcanis
Revision: 06
upgpkg: pymol 1.7.1.3-1
Modified:
pymol/trunk/PKGBUILD
pymol/trunk/apbstools_tcltk8.6.patch
--+
PKGBUILD | 14 +++-
apbstools_tcltk8.6.patch | 72 ++---
2 files changed, 42 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-13 21:19:52 UTC (rev 05)
+++ PKGBUILD2014-05-13 21:32:07 UTC (rev 06)
@@ -4,8 +4,8 @@
# Contributor: Tomasz Żok tomasz dot zok at gmail dot com
pkgname=pymol
-pkgver=1.7.0.0
-pkgrel=3
+pkgver=1.7.1.3
+pkgrel=1
pkgdesc=Molecular visualization system on an Open Source foundation
arch=('i686' 'x86_64')
url=http://pymol.org/;
@@ -16,14 +16,14 @@
${pkgname}-38899.patch
apbstools_tcltk8.6.patch)
install=${pkgname}.install
-md5sums=('36fc735f6104e59802f109d0d25b6676'
+md5sums=('414e57a76d8e6e58540b743c1c2fb5ee'
'1f8152c4604ba2939b24e25a022937ca'
- 'a3c1544017762613bebc3f5763a434a9')
+ 'c48bf253e59ff97c14114cd285a4f1e1')
prepare() {
# create desktop file
gendesk -f --pkgname ${pkgname} --pkgdesc ${pkgdesc} --name=PyMOL
--categories=Science;Chemistry
-
+
# suppress non-zero exit code that breaks makepkg
sed -i '/sys.exit/ s,2,0,' ${srcdir}/pymol/setup.py
# change python to python2
@@ -31,14 +31,12 @@
sed -i s|python|python2|g ${srcdir}/pymol/test/run
sed -i s|python|python2|g ${srcdir}/pymol/test/show
sed -i s|python|python2|g
${srcdir}/pymol/modules/pmg_tk/startup/apbs_tools.py
-
# fix FS#38899
patch -p0 -i ${pkgname}-38899.patch
mv ${srcdir}/${pkgname}/modules/web ${srcdir}/${pkgname}/modules/pymolweb
-
# fix FS#39526
cd ${srcdir}/${pkgname}
- patch -p0 -i ${srcdir}/apbstools_tcltk8.6.patch
+ #patch -p0 -i ${srcdir}/apbstools_tcltk8.6.patch
}
build() {
Modified: apbstools_tcltk8.6.patch
===
--- apbstools_tcltk8.6.patch2014-05-13 21:19:52 UTC (rev 05)
+++ apbstools_tcltk8.6.patch2014-05-13 21:32:07 UTC (rev 06)
@@ -1,112 +1,112 @@
modules/pmg_tk/startup/apbs_tools.py.orig 2013-08-16 20:29:27.0
-0400
-+++ modules/pmg_tk/startup/apbs_tools.py 2013-08-16 20:31:35.0
-0400
-@@ -560,7 +560,8 @@
+--- modules/pmg_tk/startup/apbs_tools.py.orig 2014-05-14 01:07:32.0
+0400
modules/pmg_tk/startup/apbs_tools.py 2014-05-14 01:15:35.090032827
+0400
+@@ -612,7 +612,8 @@
# Set up the Main page
page = self.notebook.add('Main')
group = Pmw.Group(page,tag_text='Main options')
-group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
+#group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
++group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
self.selection = Pmw.EntryField(group.interior(),
labelpos='w',
label_text='Selection to use: ',
-@@ -606,7 +607,8 @@
+@@ -658,7 +659,8 @@
page = self.notebook.add('Configuration')
group = Pmw.Group(page,tag_text='Dielectric Constants')
-group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
+#group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
group.grid(column=0, row=0)
self.interior_dielectric =
Pmw.EntryField(group.interior(),labelpos='w',
label_text = 'Protein Dielectric:',
-@@ -625,7 +627,8 @@
+@@ -677,7 +679,8 @@
#entry.pack(side='left',fill='both',expand=1,padx=4) #
side-by-side
entry.pack(fill='x',expand=1,padx=4,pady=1) # vertical
group = Pmw.Group(page,tag_text='Other')
-group.pack(fill='both',expand=1, padx=4, pady=5)
+#group.pack(fill='both',expand=1, padx=4, pady=5)
-+ group.grid(padx=4, pady=5, sticky=(N, S, E, W))
++group.grid(padx=4, pady=5, sticky=(N, S, E, W))
group.grid(column=1, row=1,columnspan=4)
self.max_mem_allowed = Pmw.EntryField(group.interior(),labelpos='w',
label_text = 'Maximum Memory
Allowed (MB):',
-@@ -683,7 +686,8 @@
+@@ -735,7 +738,8 @@
group = Pmw.Group(page,tag_text='Ions')
-group.pack(fill='both',expand=1, padx=4, pady=5)
+#group.pack(fill='both',expand=1, padx=4, pady=5)
-+ group.grid(padx=4, pady=5, sticky=(N, S, E, W))
++group.grid(padx=4, pady=5, sticky=(N, S, E, W))
group.grid(column=0, row=1, )
self.ion_plus_one_conc = Pmw.EntryField(group.interior(),
[arch-commits] Commit in pymol/trunk (PKGBUILD apbstools_tcltk8.6.patch)
Date: Tuesday, March 18, 2014 @ 19:03:09
Author: arcanis
Revision: 107718
upgpkg: pymol 1.7.0.0-3
fix FS#39526
Added:
pymol/trunk/apbstools_tcltk8.6.patch
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD | 14 ++-
apbstools_tcltk8.6.patch | 176 +
2 files changed, 186 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-18 17:59:58 UTC (rev 107717)
+++ PKGBUILD2014-03-18 18:03:09 UTC (rev 107718)
@@ -1,11 +1,11 @@
# $Id$
-# Maintainer: Evgeniy Alekseev arcanis.arch at gmail dot com
+# Maintainer: Evgeniy Alekseev arcanis dot arch at gmail dot com
# Contributor: graysky
# Contributor: Tomasz Żok tomasz dot zok at gmail dot com
pkgname=pymol
pkgver=1.7.0.0
-pkgrel=2
+pkgrel=3
pkgdesc=Molecular visualization system on an Open Source foundation
arch=('i686' 'x86_64')
url=http://pymol.org/;
@@ -13,10 +13,12 @@
depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk')
source=(http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2;
-${pkgname}-38899.patch)
+${pkgname}-38899.patch
+apbstools_tcltk8.6.patch)
install=${pkgname}.install
md5sums=('36fc735f6104e59802f109d0d25b6676'
- '1f8152c4604ba2939b24e25a022937ca')
+ '1f8152c4604ba2939b24e25a022937ca'
+ 'a3c1544017762613bebc3f5763a434a9')
prepare() {
# create desktop file
@@ -33,6 +35,10 @@
# fix FS#38899
patch -p0 -i ${pkgname}-38899.patch
mv ${srcdir}/${pkgname}/modules/web ${srcdir}/${pkgname}/modules/pymolweb
+
+ # fix FS#39526
+ cd ${srcdir}/${pkgname}
+ patch -p0 -i ${srcdir}/apbstools_tcltk8.6.patch
}
build() {
Added: apbstools_tcltk8.6.patch
===
--- apbstools_tcltk8.6.patch(rev 0)
+++ apbstools_tcltk8.6.patch2014-03-18 18:03:09 UTC (rev 107718)
@@ -0,0 +1,176 @@
+--- modules/pmg_tk/startup/apbs_tools.py.orig 2013-08-16 20:29:27.0
-0400
modules/pmg_tk/startup/apbs_tools.py 2013-08-16 20:31:35.0
-0400
+@@ -560,7 +560,8 @@
+ # Set up the Main page
+ page = self.notebook.add('Main')
+ group = Pmw.Group(page,tag_text='Main options')
+-group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
++#group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
++ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
+ self.selection = Pmw.EntryField(group.interior(),
+ labelpos='w',
+ label_text='Selection to use: ',
+@@ -606,7 +607,8 @@
+ page = self.notebook.add('Configuration')
+
+ group = Pmw.Group(page,tag_text='Dielectric Constants')
+-group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
++#group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
++ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
+ group.grid(column=0, row=0)
+ self.interior_dielectric =
Pmw.EntryField(group.interior(),labelpos='w',
+label_text = 'Protein Dielectric:',
+@@ -625,7 +627,8 @@
+ #entry.pack(side='left',fill='both',expand=1,padx=4) #
side-by-side
+ entry.pack(fill='x',expand=1,padx=4,pady=1) # vertical
+ group = Pmw.Group(page,tag_text='Other')
+-group.pack(fill='both',expand=1, padx=4, pady=5)
++#group.pack(fill='both',expand=1, padx=4, pady=5)
++ group.grid(padx=4, pady=5, sticky=(N, S, E, W))
+ group.grid(column=1, row=1,columnspan=4)
+ self.max_mem_allowed = Pmw.EntryField(group.interior(),labelpos='w',
+ label_text = 'Maximum Memory
Allowed (MB):',
+@@ -683,7 +686,8 @@
+
+
+ group = Pmw.Group(page,tag_text='Ions')
+-group.pack(fill='both',expand=1, padx=4, pady=5)
++#group.pack(fill='both',expand=1, padx=4, pady=5)
++ group.grid(padx=4, pady=5, sticky=(N, S, E, W))
+ group.grid(column=0, row=1, )
+ self.ion_plus_one_conc = Pmw.EntryField(group.interior(),
+ labelpos='w',
+@@ -742,7 +746,8 @@
+ entry.pack(fill='x',expand=1,padx=4)
+
+ group = Pmw.Group(page,tag_text = 'Coarse Mesh Length')
+-group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
++#group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
++ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
+ group.grid(column = 1, row = 0)
+ for coord in 'x y z'.split():
+
setattr(self,'grid_coarse_%s'%coord,Pmw.EntryField(group.interior(),
+@@ -757,7 +762,8 @@
+
+
+ group = Pmw.Group(page,tag_text = 'Fine Mesh Length')
+-
[arch-commits] Commit in pymol/trunk (PKGBUILD pymol-38899.patch)
Date: Friday, February 14, 2014 @ 16:39:10
Author: arcanis
Revision: 105731
upgpkg: pymol 1.7.0.0-2
fix FS#38899
Added:
pymol/trunk/pymol-38899.patch
Modified:
pymol/trunk/PKGBUILD
---+
PKGBUILD | 16 ++-
pymol-38899.patch | 251
2 files changed, 262 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-14 15:33:41 UTC (rev 105730)
+++ PKGBUILD2014-02-14 15:39:10 UTC (rev 105731)
@@ -1,11 +1,11 @@
# $Id$
-# Maintainer: Evgeniy Alekseev arcanis dot arch at gmail dot com
+# Maintainer: Evgeniy Alekseev arcanis.arch at gmail dot com
# Contributor: graysky
# Contributor: Tomasz Żok tomasz dot zok at gmail dot com
pkgname=pymol
pkgver=1.7.0.0
-pkgrel=1
+pkgrel=2
pkgdesc=Molecular visualization system on an Open Source foundation
arch=('i686' 'x86_64')
url=http://pymol.org/;
@@ -12,13 +12,15 @@
license=('custom')
depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk')
-source=(http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2;)
+source=(http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2;
+${pkgname}-38899.patch)
install=${pkgname}.install
-md5sums=('36fc735f6104e59802f109d0d25b6676')
+md5sums=('36fc735f6104e59802f109d0d25b6676'
+ '1f8152c4604ba2939b24e25a022937ca')
prepare() {
# create desktop file
- gendesk --pkgname ${pkgname} --pkgdesc ${pkgdesc} --name=PyMOL
--categories=Science;Chemistry
+ gendesk -f --pkgname ${pkgname} --pkgdesc ${pkgdesc} --name=PyMOL
--categories=Science;Chemistry
# suppress non-zero exit code that breaks makepkg
sed -i '/sys.exit/ s,2,0,' ${srcdir}/pymol/setup.py
@@ -27,6 +29,10 @@
sed -i s|python|python2|g ${srcdir}/pymol/test/run
sed -i s|python|python2|g ${srcdir}/pymol/test/show
sed -i s|python|python2|g
${srcdir}/pymol/modules/pmg_tk/startup/apbs_tools.py
+
+ # fix FS#38899
+ patch -p0 -i ${pkgname}-38899.patch
+ mv ${srcdir}/${pkgname}/modules/web ${srcdir}/${pkgname}/modules/pymolweb
}
build() {
Added: pymol-38899.patch
===
--- pymol-38899.patch (rev 0)
+++ pymol-38899.patch 2014-02-14 15:39:10 UTC (rev 105731)
@@ -0,0 +1,251 @@
+diff -ruN pymol.orig/modules/pymol/importing.py
pymol/modules/pymol/importing.py
+--- pymol.orig/modules/pymol/importing.py 2014-01-15 00:02:55.0
+0400
pymol/modules/pymol/importing.py 2014-02-14 10:19:11.275591741 +0400
+@@ -473,7 +473,7 @@
+ def _processPWG(fname,_self=cmd):
+ r = DEFAULT_ERROR
+ try:
+-from web.pymolhttpd import PymolHttpd
++from pymolweb.pymolhttpd import PymolHttpd
+ browser_flag = 0
+ launch_flag = 0
+ report_url = None
+diff -ruN pymol.orig/modules/web/examples/content/SOP.html
pymol/modules/web/examples/content/SOP.html
+--- pymol.orig/modules/web/examples/content/SOP.html 2014-01-15
00:02:58.0 +0400
pymol/modules/web/examples/content/SOP.html2014-02-14
10:19:11.275591741 +0400
+@@ -49,7 +49,7 @@
+ The first seven
+ a href=../index.html#sample01 target=_blank sample applications/a
+ are implemented like this, residing in folders at
+-code$PYMOL_PATH/modules/web/examples/sample[0-7]/code There
++code$PYMOL_PATH/modules/pymolweb/examples/sample[0-7]/code There
+ may be future PyMOL web applications delivered with new versions of
+ PyMOL. Of course, you are free to write your own PyMOL web
+ applications and store them on each user's machine, or perhaps on a
+diff -ruN pymol.orig/modules/web/examples/content/pwg.html
pymol/modules/web/examples/content/pwg.html
+--- pymol.orig/modules/web/examples/content/pwg.html 2014-01-15
00:02:58.0 +0400
pymol/modules/web/examples/content/pwg.html2014-02-14
10:19:11.275591741 +0400
+@@ -58,13 +58,13 @@
+
+ pIn contrast, the PWG file which launches the Sample 01 application is:/p
+ pre
+-root $PYMOL_PATH/modules/web/examples/sample01/htdocs
++root $PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs
+ browser
+ /pre
+
+ pwhich tells PyMOL to (1) launch its internal web server on a
+ dynamically assigned port with a root content directory of
+-$PYMOL_PATH/modules/web/examples/sample01/htdocs and (2) open
++$PYMOL_PATH/modules/pymolweb/examples/sample01/htdocs and (2) open
+ up a local browser window pointing at that server instance. The
+ assumption in this scenario is that this newly-opened web page will be
+ responsible for sending requests to the PyMOL server (and thus, will
+diff -ruN pymol.orig/modules/web/examples/content/running.html
pymol/modules/web/examples/content/running.html
+--- pymol.orig/modules/web/examples/content/running.html 2014-01-15
[arch-commits] Commit in pymol/trunk (PKGBUILD pymol.install)
Date: Saturday, February 1, 2014 @ 21:45:17
Author: arcanis
Revision: 105150
upgpkg: pymol 1.7.0.0-1
Added:
pymol/trunk/pymol.install
Modified:
pymol/trunk/PKGBUILD
---+
PKGBUILD | 27 +--
pymol.install | 11 +++
2 files changed, 28 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-01 19:59:28 UTC (rev 105149)
+++ PKGBUILD2014-02-01 20:45:17 UTC (rev 105150)
@@ -4,17 +4,22 @@
# Contributor: Tomasz Żok tomasz dot zok at gmail dot com
pkgname=pymol
-pkgver=1.6.0.0
-pkgrel=3
-pkgdesc=A USER-SPONSORED molecular visualization system on an OPEN-SOURCE
foundation
+pkgver=1.7.0.0
+pkgrel=1
+pkgdesc=Molecular visualization system on an Open Source foundation
arch=('i686' 'x86_64')
url=http://pymol.org/;
license=('custom')
-depends=('glut' 'glew' 'mesa' 'python-pmw' 'tcl' 'tcsh' 'tk')
-source=(http://downloads.sourceforge.net/project/pymol/pymol/1.6/pymol-v${pkgver}.tar.bz2;)
-md5sums=('6f5db5beea7497f5a414c8e0cf1ae53d')
+depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh')
+makedepends=('desktop-file-utils' 'gendesk')
+source=(http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2;)
+install=${pkgname}.install
+md5sums=('36fc735f6104e59802f109d0d25b6676')
prepare() {
+ # create desktop file
+ gendesk --pkgname ${pkgname} --pkgdesc ${pkgdesc} --name=PyMOL
--categories=Science;Chemistry
+
# suppress non-zero exit code that breaks makepkg
sed -i '/sys.exit/ s,2,0,' ${srcdir}/pymol/setup.py
# change python to python2
@@ -31,10 +36,12 @@
package() {
cd ${srcdir}/${pkgname}
- python2 setup.py install --prefix=usr/ --root=${pkgdir}
- sed -i s|${pkgdir}||g pymol
- install -D -m755 pymol ${pkgdir}/usr/bin/pymol
- install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ python2 setup.py install --prefix=/usr --root=${pkgdir}
+ sed -i s|${pkgdir}||g pymol
+ install -Dm755 pymol ${pkgdir}/usr/bin/pymol
+ install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -Dm644 ${srcdir}/pymol.desktop
${pkgdir}/usr/share/applications/pymol.desktop
+ install -Dm644 ${srcdir}/pymol.png ${pkgdir}/usr/share/pixmaps/pymol.png
}
# vim:set ts=2 sw=2 et:
Added: pymol.install
===
--- pymol.install (rev 0)
+++ pymol.install 2014-02-01 20:45:17 UTC (rev 105150)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Thursday, January 2, 2014 @ 01:33:14
Author: arcanis
Revision: 103270
upgpkg: pymol 1.6.0.0-3
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-02 00:18:57 UTC (rev 103269)
+++ PKGBUILD2014-01-02 00:33:14 UTC (rev 103270)
@@ -1,3 +1,4 @@
+# $Id$
# Maintainer: Evgeniy Alekseev arcanis dot arch at gmail dot com
# Contributor: graysky
# Contributor: Tomasz Żok tomasz dot zok at gmail dot com
@@ -4,7 +5,7 @@
pkgname=pymol
pkgver=1.6.0.0
-pkgrel=2
+pkgrel=3
pkgdesc=A USER-SPONSORED molecular visualization system on an OPEN-SOURCE
foundation
arch=('i686' 'x86_64')
url=http://pymol.org/;
@@ -15,7 +16,12 @@
prepare() {
# suppress non-zero exit code that breaks makepkg
- sed -i '/sys.exit/ s,2,0,' ${srcdir}/${pkgname}/setup.py
+ sed -i '/sys.exit/ s,2,0,' ${srcdir}/pymol/setup.py
+ # change python to python2
+ sed -i s|python|python2|g ${srcdir}/pymol/test/cyg
+ sed -i s|python|python2|g ${srcdir}/pymol/test/run
+ sed -i s|python|python2|g ${srcdir}/pymol/test/show
+ sed -i s|python|python2|g
${srcdir}/pymol/modules/pmg_tk/startup/apbs_tools.py
}
build() {
@@ -26,16 +32,8 @@
package() {
cd ${srcdir}/${pkgname}
python2 setup.py install --prefix=usr/ --root=${pkgdir}
-
sed -i s|${pkgdir}||g pymol
install -D -m755 pymol ${pkgdir}/usr/bin/pymol
-
- # change python to python2
- sed -i s|python|python2|g
${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/run
- sed -i s|python|python2|g
${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/cyg
- sed -i s|python|python2|g
${pkgdir}/usr/lib/python2.7/site-packages/pmg_tk/startup/apbs_tools.py
- sed -i s|python|python2|g
${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/show
-
install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
[arch-commits] Commit in pymol/trunk (PKGBUILD)
Date: Tuesday, November 12, 2013 @ 23:39:12
Author: arcanis
Revision: 100895
upgpkg: pymol 1.6.0.0-2
Modified:
pymol/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-12 22:35:10 UTC (rev 100894)
+++ PKGBUILD2013-11-12 22:39:12 UTC (rev 100895)
@@ -4,12 +4,12 @@
pkgname=pymol
pkgver=1.6.0.0
-pkgrel=1
+pkgrel=2
pkgdesc=A USER-SPONSORED molecular visualization system on an OPEN-SOURCE
foundation
arch=('i686' 'x86_64')
url=http://pymol.org/;
license=('custom')
-depends=('glut' 'glew' 'mesa' 'python2-pmw' 'tcl' 'tcsh' 'tk')
+depends=('glut' 'glew' 'mesa' 'python-pmw' 'tcl' 'tcsh' 'tk')
source=(http://downloads.sourceforge.net/project/pymol/pymol/1.6/pymol-v${pkgver}.tar.bz2;)
md5sums=('6f5db5beea7497f5a414c8e0cf1ae53d')
