[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD apbstools_tcltk8.6.patch)
Evgeniy Alekseev
arcanis at archlinux.org
Mon Dec 8 02:06:39 UTC 2014
Date: Monday, December 8, 2014 @ 03:06:38
Author: arcanis
Revision: 123613
upgpkg: pymol 1.7.4.0-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
pymol/trunk/apbstools_tcltk8.6.patch
--------------------------+
ChangeLog | 3 +
PKGBUILD | 10 ++--
apbstools_tcltk8.6.patch | 92 +++++----------------------------------------
3 files changed, 19 insertions(+), 86 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2014-12-08 00:51:59 UTC (rev 123612)
+++ ChangeLog 2014-12-08 02:06:38 UTC (rev 123613)
@@ -1,3 +1,6 @@
+1.7.4.0-1:
+upstream update
+
1.7.2.1-2:
fix dep list
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-08 00:51:59 UTC (rev 123612)
+++ PKGBUILD 2014-12-08 02:06:38 UTC (rev 123613)
@@ -1,11 +1,11 @@
# $Id$
-# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com>
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
# Contributor: graysky
# Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
pkgname=pymol
-pkgver=1.7.2.1
-pkgrel=2
+pkgver=1.7.4.0
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/"
@@ -17,10 +17,10 @@
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
install="${pkgname}.install"
-md5sums=('a3349139f8c70739be524cb08e438b82'
+md5sums=('296045ae49b58651f4abe21604996db2'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
- 'c48bf253e59ff97c14114cd285a4f1e1')
+ '138550367b74fd62a7c7bc48d339eb2d')
changelog=ChangeLog
prepare() {
Modified: apbstools_tcltk8.6.patch
===================================================================
--- apbstools_tcltk8.6.patch 2014-12-08 00:51:59 UTC (rev 123612)
+++ apbstools_tcltk8.6.patch 2014-12-08 02:06:38 UTC (rev 123613)
@@ -10,76 +10,6 @@
self.selection = Pmw.EntryField(group.interior(),
labelpos='w',
label_text='Selection to use: ',
-@@ -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(column=0, row=0)
- self.interior_dielectric = Pmw.EntryField(group.interior(),labelpos='w',
- label_text = 'Protein Dielectric:',
-@@ -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(column=1, row=1,columnspan=4)
- self.max_mem_allowed = Pmw.EntryField(group.interior(),labelpos='w',
- label_text = 'Maximum Memory Allowed (MB):',
-@@ -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(column=0, row=1, )
- self.ion_plus_one_conc = Pmw.EntryField(group.interior(),
- labelpos='w',
-@@ -794,7 +798,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(),
-@@ -809,7 +814,8 @@
-
-
- group = Pmw.Group(page,tag_text = 'Fine 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 = 2, row = 0)
- for coord in 'x y z'.split():
- setattr(self,'grid_fine_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -824,7 +830,8 @@
-
-
- group = Pmw.Group(page,tag_text = 'Grid Center')
-- 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 = 3, row = 0)
- for coord in 'x y z'.split():
- setattr(self,'grid_center_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -838,7 +845,8 @@
- getattr(self,'grid_center_%s'%coord).pack(fill='x', expand=1, padx=4, pady=1)
-
- group = Pmw.Group(page,tag_text = 'Grid Points')
-- 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 = 4, row = 0)
- for coord in 'x y z'.split():
- setattr(self,'grid_points_%s'%coord,Pmw.EntryField(group.interior(),
@@ -856,7 +864,8 @@
page.grid_columnconfigure(5,weight=1)
page = self.notebook.add('Program Locations')
@@ -91,7 +21,7 @@
if s == '': return Pmw.PARTIAL
elif os.path.isfile(s): return Pmw.OK
@@ -955,7 +964,8 @@
-
+
page = self.notebook.add('Temp File Locations')
group = Pmw.Group(page,tag_text='Locations')
- group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
@@ -107,7 +37,7 @@
- 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))
-
+
page = self.notebook.add('Visualization (2)')
group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=2)
self.visualization_group_2 = group
@@ -114,7 +44,7 @@
- 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))
-
+
# Create a couple of other empty pages
page = self.notebook.add('About')
group = Pmw.Group(page, tag_text='About PyMOL APBS Tools')
@@ -122,7 +52,7 @@
+ #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
+ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
text = """This plugin integrates PyMOL (http://PyMOL.org/) with APBS (http://www.poissonboltzmann.org/apbs/).
-
+
Documentation may be found at
@@ -2271,7 +2284,8 @@
self.update_buttonbox = Pmw.ButtonBox(self.mm_group.interior(), padx=0)
@@ -131,7 +61,7 @@
- self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
+ #self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
+ self.mm_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-
+
self.ms_group = Pmw.Group(self.interior(),tag_text='Molecular Surface')
self.ms_buttonbox = Pmw.ButtonBox(self.ms_group.interior(), padx=0)
@@ -2322,7 +2336,8 @@
@@ -141,7 +71,7 @@
- self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ #self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ self.ms_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-
+
self.fl_group = Pmw.Group(self.interior(),tag_text='Field Lines')
self.fl_buttonbox = Pmw.ButtonBox(self.fl_group.interior(), padx=0)
@@ -2337,7 +2352,8 @@
@@ -151,7 +81,7 @@
- self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
+ #self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
+ self.fl_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-
+
self.pi_group = Pmw.Group(self.interior(),tag_text='Positive Isosurface')
self.pi_buttonbox = Pmw.ButtonBox(self.pi_group.interior(), padx=0)
@@ -2356,7 +2372,8 @@
@@ -161,7 +91,7 @@
- self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ #self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ self.pi_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-
+
self.ni_group = Pmw.Group(self.interior(),tag_text='Negative Isosurface')
self.ni_buttonbox = Pmw.ButtonBox(self.ni_group.interior(), padx=0)
@@ -2375,7 +2392,8 @@
@@ -171,6 +101,6 @@
- self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ #self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ self.ni_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-
-
-
+
+
+
More information about the arch-commits
mailing list