[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Wednesday, March 20, 2019 @ 12:28:43
Author: arcanis
Revision: 442949
upgpkg: pymol 2.3.0-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |4
PKGBUILD |6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2019-03-20 12:23:49 UTC (rev 442948)
+++ ChangeLog 2019-03-20 12:28:43 UTC (rev 442949)
@@ -1,3 +1,7 @@
+2.3.0-1:
+* upstream update
+* use libmmtf as makedependency
+
2.2.0-1:
* upstream update
* use github sources
Modified: PKGBUILD
===
--- PKGBUILD2019-03-20 12:23:49 UTC (rev 442948)
+++ PKGBUILD2019-03-20 12:28:43 UTC (rev 442949)
@@ -3,7 +3,7 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=2.2.0
+pkgver=2.3.0
pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
@@ -10,13 +10,13 @@
url="http://pymol.org/";
license=('custom')
depends=('freetype2' 'glew' 'glm' 'glut' 'python-numpy' 'tcsh')
-makedepends=('desktop-file-utils' 'gendesk' 'msgpack-c')
+makedepends=('desktop-file-utils' 'gendesk' 'libmmtf' 'msgpack-c')
optdepends=('python-pmw: pmw based UI'
'python-pyqt5: Qt5 based UI')
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=('56776586276208d42cc4bd4c3cb7d6b9a08e7239186b8f398c75cb57f85e05ebf51aaa8cdec5672e56beeda26f1cd9d14c6de7fba1a741f9c8ec22c1292b9c63'
+sha512sums=('e1dcea1c97bcd9045d3543e92902f240e6affbf61a38e8d2a0be04309e3dbabfe1a869847d1423b3151008978d4c305bbf3ce994fc9d453c0063ce020100c133'
'39917c1dc80cd6a59e8f6b3ea49a59491eaf23d14e32ac264f6d71f33007f686deb6a66e50e7f20ef9df5337038e3572b018633c361460d5ee0c1d8f0a8259d1'
'90fce6d3c4364cd775b44bdd9013a08f26392339bec40ecd749220b3d11391381f5b159734bdb2e2ac675fbc016a6a1b9c4cec2fa8c9c0226609a5f09b610b9c')
changelog=ChangeLog
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Wednesday, October 24, 2018 @ 21:40:53
Author: arcanis
Revision: 398887
upgpkg: pymol 2.2.0-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |4
PKGBUILD | 19 +--
2 files changed, 13 insertions(+), 10 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2018-10-24 21:21:53 UTC (rev 398886)
+++ ChangeLog 2018-10-24 21:40:53 UTC (rev 398887)
@@ -1,3 +1,7 @@
+2.2.0-1:
+* upstream update
+* use github sources
+
2.1.0-1:
* upstream update
* use python3 instead of python2
Modified: PKGBUILD
===
--- PKGBUILD2018-10-24 21:21:53 UTC (rev 398886)
+++ PKGBUILD2018-10-24 21:40:53 UTC (rev 398887)
@@ -3,21 +3,20 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=2.1.0
-_majorver=2
-pkgrel=4
+pkgver=2.2.0
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
url="http://pymol.org/";
license=('custom')
-depends=('freetype2' 'glew' 'glut' 'python-numpy' 'tcsh')
+depends=('freetype2' 'glew' 'glm' 'glut' 'python-numpy' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk' 'msgpack-c')
optdepends=('python-pmw: pmw based UI'
'python-pyqt5: Qt5 based UI')
-source=("https://downloads.sourceforge.net/project/pymol/pymol/${_majorver}/pymol-v${pkgver}.tar.bz2";
+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=('67175c0668a13826febcb73f7c62a43cfa03a7f86bb80113d52fb337e7d29008684c03163fc06338c4d68edd9246ffcf63aec1ee3110ae91c8a71ef24ab7b605'
+sha512sums=('56776586276208d42cc4bd4c3cb7d6b9a08e7239186b8f398c75cb57f85e05ebf51aaa8cdec5672e56beeda26f1cd9d14c6de7fba1a741f9c8ec22c1292b9c63'
'39917c1dc80cd6a59e8f6b3ea49a59491eaf23d14e32ac264f6d71f33007f686deb6a66e50e7f20ef9df5337038e3572b018633c361460d5ee0c1d8f0a8259d1'
'90fce6d3c4364cd775b44bdd9013a08f26392339bec40ecd749220b3d11391381f5b159734bdb2e2ac675fbc016a6a1b9c4cec2fa8c9c0226609a5f09b610b9c')
changelog=ChangeLog
@@ -29,19 +28,19 @@
--categories="Science;Chemistry"
# suppress non-zero exit code that breaks makepkg
- sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
+ sed -i '/sys.exit/ s,2,0,'
"${srcdir}/${pkgname}-open-source-${pkgver}/setup.py"
# fix FS#39526
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${pkgname}-open-source-${pkgver}"
patch -p0 -i "${srcdir}/apbstools_tcltk8.6.patch"
}
build() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${pkgname}-open-source-${pkgver}"
python setup.py build
}
package() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/${pkgname}-open-source-${pkgver}"
python setup.py install --prefix=/usr --root="${pkgdir}"
install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -Dm644 "${srcdir}/pymol.desktop"
"${pkgdir}/usr/share/applications/pymol.desktop"
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD pymol-38899.patch)
Date: Monday, March 19, 2018 @ 13:39:26
Author: arcanis
Revision: 309158
upgpkg: pymol 2.1.0-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
Deleted:
pymol/trunk/pymol-38899.patch
---+
ChangeLog |8 +
PKGBUILD | 35 ++-
pymol-38899.patch | 251
3 files changed, 22 insertions(+), 272 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2018-03-19 10:19:59 UTC (rev 309157)
+++ ChangeLog 2018-03-19 13:39:26 UTC (rev 309158)
@@ -1,3 +1,11 @@
+2.1.0-1:
+* upstream update
+* use python3 instead of python2
+* move pmw to optdep list
+
+1.8.6.2-1:
+upstream update
+
1.8.6.0-2:
rollback to python2 (see FS#53654)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-19 10:19:59 UTC (rev 309157)
+++ PKGBUILD2018-03-19 13:39:26 UTC (rev 309158)
@@ -4,22 +4,24 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.8.6.0
-pkgrel=3
+pkgver=2.1.0
+_majorver=2
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('x86_64')
url="http://pymol.org/";
license=('custom')
-depends=('glew' 'glut' 'libgl' 'libxml2' 'python2-numpy' 'python2-pmw' 'tcsh')
+depends=('freetype2' 'glew' 'glut' 'python-numpy' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk' 'msgpack-c')
-source=("http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v${pkgver}.tar.bz2";
+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";
-"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
-md5sums=('dc317a4046d653417ac6d4a984176e26'
- '0e9df23150d39cbcb8f79c38ce2a52e5'
- '1f8152c4604ba2939b24e25a022937ca'
- '138550367b74fd62a7c7bc48d339eb2d')
+sha512sums=('67175c0668a13826febcb73f7c62a43cfa03a7f86bb80113d52fb337e7d29008684c03163fc06338c4d68edd9246ffcf63aec1ee3110ae91c8a71ef24ab7b605'
+
'4ceb8123b21becac7f2f1e7c3521b8fbaa22038d76b4749d07d286eed1646025dccd1962e58c0923357261006deb589aaf1fe4f6f53fd2327475d8db3adca5c4'
+
'90fce6d3c4364cd775b44bdd9013a08f26392339bec40ecd749220b3d11391381f5b159734bdb2e2ac675fbc016a6a1b9c4cec2fa8c9c0226609a5f09b610b9c')
changelog=ChangeLog
prepare() {
@@ -30,14 +32,6 @@
# suppress non-zero exit code that breaks makepkg
sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
- # change python to python2
- find "${pkgname}" -name '*.py' -type f -exec \
- sed -i 's|env python|env python2|g' {} \;
- find "${pkgname}/test" -type f -exec \
- sed -i 's|bin/python|bin/python2|g' {} \;
- # 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"
@@ -45,14 +39,12 @@
build() {
cd "${srcdir}/${pkgname}"
- # required c++11
- export CPPFLAGS="$CPPFLAGS -std=c++11"
- python2 setup.py build
+ python setup.py build
}
package() {
cd "${srcdir}/${pkgname}"
- python2 setup.py install --prefix=/usr --root="${pkgdir}"
+ python setup.py install --prefix=/usr --root="${pkgdir}"
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"
@@ -59,3 +51,4 @@
}
# vim:set ts=2 sw=2 et:
+
Deleted: pymol-38899.patch
===
--- pymol-38899.patch 2018-03-19 10:19:59 UTC (rev 309157)
+++ pymol-38899.patch 2018-03-19 13:39:26 UTC (rev 309158)
@@ -1,251 +0,0 @@
-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
- sample applications
- are implemented like this, residing in folders at
--$PY
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Friday, April 14, 2017 @ 18:46:38
Author: arcanis
Revision: 223030
upgpkg: pymol 1.8.6.0-2
rollback python3, because some functions became unavailable (see FS#53654)
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |3 +++
PKGBUILD | 13 +
2 files changed, 12 insertions(+), 4 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2017-04-14 18:27:43 UTC (rev 223029)
+++ ChangeLog 2017-04-14 18:46:38 UTC (rev 223030)
@@ -1,3 +1,6 @@
+1.8.6.0-2:
+rollback to python2 (see FS#53654)
+
1.8.6.0-1:
* upstream update
* use python3 instead of python2
Modified: PKGBUILD
===
--- PKGBUILD2017-04-14 18:27:43 UTC (rev 223029)
+++ PKGBUILD2017-04-14 18:46:38 UTC (rev 223030)
@@ -5,12 +5,12 @@
pkgname=pymol
pkgver=1.8.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
license=('custom')
-depends=('glew' 'glut' 'libgl' 'libxml2' 'python-numpy' 'python-pmw' 'tcsh')
+depends=('glew' 'glut' 'libgl' 'libxml2' 'python2-numpy' 'python2-pmw' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk' 'msgpack-c')
source=("http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v${pkgver}.tar.bz2";
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
@@ -30,6 +30,11 @@
# suppress non-zero exit code that breaks makepkg
sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
+ # change python to python2
+ find "${pkgname}" -name '*.py' -type f -exec \
+ sed -i 's|env python|env python2|g' {} \;
+ find "${pkgname}/test" -type f -exec \
+ sed -i 's|bin/python|bin/python2|g' {} \;
# fix FS#38899
patch -p0 -i "${pkgname}-38899.patch"
mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
@@ -42,12 +47,12 @@
cd "${srcdir}/${pkgname}"
# required c++11
export CPPFLAGS="$CPPFLAGS -std=c++11"
- python setup.py build
+ python2 setup.py build
}
package() {
cd "${srcdir}/${pkgname}"
- python setup.py install --prefix=/usr --root="${pkgdir}"
+ python2 setup.py install --prefix=/usr --root="${pkgdir}"
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"
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Monday, March 20, 2017 @ 15:19:16
Author: arcanis
Revision: 217643
upgpkg: pymol 1.8.6.0-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |4
PKGBUILD | 17 ++---
2 files changed, 10 insertions(+), 11 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2017-03-20 15:19:07 UTC (rev 217642)
+++ ChangeLog 2017-03-20 15:19:16 UTC (rev 217643)
@@ -1,3 +1,7 @@
+1.8.6.0-1:
+* upstream update
+* use python3 instead of python2
+
1.8.4.0-1:
upstream update
Modified: PKGBUILD
===
--- PKGBUILD2017-03-20 15:19:07 UTC (rev 217642)
+++ PKGBUILD2017-03-20 15:19:16 UTC (rev 217643)
@@ -4,19 +4,19 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.8.4.0
+pkgver=1.8.6.0
pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
license=('custom')
-depends=('glew' 'glut' 'libgl' 'libxml2' 'python2-numpy' 'python2-pmw' 'tcsh')
-makedepends=('desktop-file-utils' 'gendesk')
+depends=('glew' 'glut' 'libgl' 'libxml2' 'python-numpy' 'python-pmw' 'tcsh')
+makedepends=('desktop-file-utils' 'gendesk' 'msgpack-c')
source=("http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v${pkgver}.tar.bz2";
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
-md5sums=('85451c40abc0a359a5ed91abd363b2c2'
+md5sums=('dc317a4046d653417ac6d4a984176e26'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
'138550367b74fd62a7c7bc48d339eb2d')
@@ -30,11 +30,6 @@
# suppress non-zero exit code that breaks makepkg
sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
- # change python to python2
- find "${pkgname}" -name '*.py' -type f -exec \
- sed -i 's|env python|env python2|g' {} \;
- find "${pkgname}/test" -type f -exec \
- sed -i 's|bin/python|bin/python2|g' {} \;
# fix FS#38899
patch -p0 -i "${pkgname}-38899.patch"
mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
@@ -47,12 +42,12 @@
cd "${srcdir}/${pkgname}"
# required c++11
export CPPFLAGS="$CPPFLAGS -std=c++11"
- python2 setup.py build
+ python setup.py build
}
package() {
cd "${srcdir}/${pkgname}"
- python2 setup.py install --prefix=/usr --root="${pkgdir}"
+ python setup.py install --prefix=/usr --root="${pkgdir}"
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"
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Monday, October 10, 2016 @ 11:09:14
Author: arcanis
Revision: 191855
upgpkg: pymol 1.8.4.0-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |3 +++
PKGBUILD |6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2016-10-10 10:49:00 UTC (rev 191854)
+++ ChangeLog 2016-10-10 11:09:14 UTC (rev 191855)
@@ -1,3 +1,6 @@
+1.8.4.0-1:
+upstream update
+
1.8.2.1-2
glew-2.0 rebuild
Modified: PKGBUILD
===
--- PKGBUILD2016-10-10 10:49:00 UTC (rev 191854)
+++ PKGBUILD2016-10-10 11:09:14 UTC (rev 191855)
@@ -4,8 +4,8 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.8.2.1
-pkgrel=2
+pkgver=1.8.4.0
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
@@ -16,7 +16,7 @@
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
-md5sums=('7b6b61f8b314a9ad204f9df6212bf505'
+md5sums=('85451c40abc0a359a5ed91abd363b2c2'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
'138550367b74fd62a7c7bc48d339eb2d')
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Monday, August 1, 2016 @ 11:48:33
Author: arcanis
Revision: 184746
upgpkg: pymol 1.8.2.1-2
glew-2.0 rebuild
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |3 +++
PKGBUILD |2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
Modified: ChangeLog
===
--- ChangeLog 2016-08-01 10:47:01 UTC (rev 184745)
+++ ChangeLog 2016-08-01 11:48:33 UTC (rev 184746)
@@ -1,3 +1,6 @@
+1.8.2.1-2
+glew-2.0 rebuild
+
1.8.2.1-1:
upstream update
Modified: PKGBUILD
===
--- PKGBUILD2016-08-01 10:47:01 UTC (rev 184745)
+++ PKGBUILD2016-08-01 11:48:33 UTC (rev 184746)
@@ -5,7 +5,7 @@
pkgname=pymol
pkgver=1.8.2.1
-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 (ChangeLog PKGBUILD)
Date: Saturday, May 28, 2016 @ 01:37:01
Author: arcanis
Revision: 177337
upgpkg: pymol 1.8.2.1-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |3 +++
PKGBUILD |6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2016-05-27 23:36:19 UTC (rev 177336)
+++ ChangeLog 2016-05-27 23:37:01 UTC (rev 177337)
@@ -1,3 +1,6 @@
+1.8.2.1-1:
+upstream update
+
1.8.2.0-2:
drop install file, use pacman hooks instead
Modified: PKGBUILD
===
--- PKGBUILD2016-05-27 23:36:19 UTC (rev 177336)
+++ PKGBUILD2016-05-27 23:37:01 UTC (rev 177337)
@@ -4,8 +4,8 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.8.2.0
-pkgrel=2
+pkgver=1.8.2.1
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
@@ -16,7 +16,7 @@
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
-md5sums=('68dca95bc60f5979f7a0cb22839d95ae'
+md5sums=('7b6b61f8b314a9ad204f9df6212bf505'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
'138550367b74fd62a7c7bc48d339eb2d')
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD pymol.install)
Date: Friday, April 29, 2016 @ 02:24:17
Author: arcanis
Revision: 172477
upgpkg: pymol 1.8.2.0-2
rebuild against pacman hooks
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
Deleted:
pymol/trunk/pymol.install
---+
ChangeLog |3 +++
PKGBUILD |3 +--
pymol.install | 11 ---
3 files changed, 4 insertions(+), 13 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2016-04-29 00:23:22 UTC (rev 172476)
+++ ChangeLog 2016-04-29 00:24:17 UTC (rev 172477)
@@ -1,3 +1,6 @@
+1.8.2.0-2:
+drop install file, use pacman hooks instead
+
1.8.2.0-1:
upstream update
Modified: PKGBUILD
===
--- PKGBUILD2016-04-29 00:23:22 UTC (rev 172476)
+++ PKGBUILD2016-04-29 00:24:17 UTC (rev 172477)
@@ -5,7 +5,7 @@
pkgname=pymol
pkgver=1.8.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
@@ -16,7 +16,6 @@
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
-install="${pkgname}.install"
md5sums=('68dca95bc60f5979f7a0cb22839d95ae'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
Deleted: pymol.install
===
--- pymol.install 2016-04-29 00:23:22 UTC (rev 172476)
+++ pymol.install 2016-04-29 00:24:17 UTC (rev 172477)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Thursday, April 21, 2016 @ 16:19:31
Author: arcanis
Revision: 171515
upgpkg: pymol 1.8.2.0-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |3 +++
PKGBUILD |9 -
2 files changed, 7 insertions(+), 5 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2016-04-21 13:41:57 UTC (rev 171514)
+++ ChangeLog 2016-04-21 14:19:31 UTC (rev 171515)
@@ -1,3 +1,6 @@
+1.8.2.0-1:
+upstream update
+
1.8.0.0.r4144-1:
upstream update
Modified: PKGBUILD
===
--- PKGBUILD2016-04-21 13:41:57 UTC (rev 171514)
+++ PKGBUILD2016-04-21 14:19:31 UTC (rev 171515)
@@ -4,9 +4,8 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.8.0.0.r4144
-_pkgver=1.8.0.0-r4144
-pkgrel=2
+pkgver=1.8.2.0
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
@@ -13,12 +12,12 @@
license=('custom')
depends=('glew' 'glut' 'libgl' 'libxml2' 'python2-numpy' 'python2-pmw' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk')
-source=("http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v${_pkgver}.tar.bz2";
+source=("http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v${pkgver}.tar.bz2";
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
install="${pkgname}.install"
-md5sums=('c3be2ef9e7114b2fe2c02524c380b63b'
+md5sums=('68dca95bc60f5979f7a0cb22839d95ae'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
'138550367b74fd62a7c7bc48d339eb2d')
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Sunday, November 29, 2015 @ 18:56:37
Author: arcanis
Revision: 147925
upgpkg: pymol 1.8.0.0.r4144-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |3 +++
PKGBUILD |7 ---
2 files changed, 7 insertions(+), 3 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2015-11-29 16:04:47 UTC (rev 147924)
+++ ChangeLog 2015-11-29 17:56:37 UTC (rev 147925)
@@ -1,3 +1,6 @@
+1.8.0.0.r4144-1:
+upstream update
+
1.8.0.0-1:
upstream update
Modified: PKGBUILD
===
--- PKGBUILD2015-11-29 16:04:47 UTC (rev 147924)
+++ PKGBUILD2015-11-29 17:56:37 UTC (rev 147925)
@@ -4,7 +4,8 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.8.0.0
+pkgver=1.8.0.0.r4144
+_pkgver=1.8.0.0-r4144
pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
@@ -12,12 +13,12 @@
license=('custom')
depends=('glew' 'glut' 'libgl' 'libxml2' 'python2-numpy' 'python2-pmw' 'tcsh')
makedepends=('desktop-file-utils' 'gendesk')
-source=("http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v${pkgver}.tar.bz2";
+source=("http://downloads.sourceforge.net/project/pymol/pymol/1.8/pymol-v${_pkgver}.tar.bz2";
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
install="${pkgname}.install"
-md5sums=('59d6e74377427aab5c5a5b7c9d53a4e9'
+md5sums=('c3be2ef9e7114b2fe2c02524c380b63b'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
'138550367b74fd62a7c7bc48d339eb2d')
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Thursday, November 19, 2015 @ 11:04:55
Author: arcanis
Revision: 147142
upgpkg: pymol 1.8.0.0-1
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |3 +++
PKGBUILD |9 -
2 files changed, 7 insertions(+), 5 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2015-11-19 09:44:00 UTC (rev 147141)
+++ ChangeLog 2015-11-19 10:04:55 UTC (rev 147142)
@@ -1,3 +1,6 @@
+1.8.0.0-1:
+upstream update
+
1.7.6.0-1:
upstream update
Modified: PKGBUILD
===
--- PKGBUILD2015-11-19 09:44:00 UTC (rev 147141)
+++ PKGBUILD2015-11-19 10:04:55 UTC (rev 147142)
@@ -4,8 +4,8 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.7.6.0
-pkgrel=2
+pkgver=1.8.0.0
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
@@ -12,12 +12,12 @@
license=('custom')
depends=('glew' 'glut' 'libgl' 'libxml2' '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.8/pymol-v${pkgver}.tar.bz2";
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
install="${pkgname}.install"
-md5sums=('ec06f784fbb31ab276bb2960c25dc865'
+md5sums=('59d6e74377427aab5c5a5b7c9d53a4e9'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
'138550367b74fd62a7c7bc48d339eb2d')
@@ -60,4 +60,3 @@
}
# vim:set ts=2 sw=2 et:
-
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD numpy-deprecated.patch)
Date: Wednesday, May 6, 2015 @ 20:17:55
Author: arcanis
Revision: 132833
upgpkg: pymol 1.7.6.0-1
upstream update
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
Deleted:
pymol/trunk/numpy-deprecated.patch
+
ChangeLog |3 ++
PKGBUILD | 17 +--
numpy-deprecated.patch | 68 ---
3 files changed, 11 insertions(+), 77 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2015-05-06 17:18:24 UTC (rev 132832)
+++ ChangeLog 2015-05-06 18:17:55 UTC (rev 132833)
@@ -1,3 +1,6 @@
+1.7.6.0-1:
+upstream update
+
1.7.4.0-2:
glew rebuild
Modified: PKGBUILD
===
--- PKGBUILD2015-05-06 17:18:24 UTC (rev 132832)
+++ PKGBUILD2015-05-06 18:17:55 UTC (rev 132833)
@@ -4,8 +4,8 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.7.4.0
-pkgrel=2
+pkgver=1.7.6.0
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
@@ -15,14 +15,12 @@
source=("http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgver}.tar.bz2";
${pkgname}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
-"apbstools_tcltk8.6.patch"
-"numpy-deprecated.patch")
+"apbstools_tcltk8.6.patch")
install="${pkgname}.install"
-md5sums=('296045ae49b58651f4abe21604996db2'
+md5sums=('ec06f784fbb31ab276bb2960c25dc865'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
- '138550367b74fd62a7c7bc48d339eb2d'
- '46197cac724b7bce499857891bdd9a0c')
+ '138550367b74fd62a7c7bc48d339eb2d')
changelog=ChangeLog
prepare() {
@@ -41,8 +39,6 @@
# fix FS#38899
patch -p0 -i "${pkgname}-38899.patch"
mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
- # fix deprecated API
- patch -p0 -i "numpy-deprecated.patch"
# fix FS#39526
cd "${srcdir}/${pkgname}"
patch -p0 -i "${srcdir}/apbstools_tcltk8.6.patch"
@@ -50,6 +46,8 @@
build() {
cd "${srcdir}/${pkgname}"
+ # required c++11
+ export CPPFLAGS="$CPPFLAGS -std=c++11"
python2 setup.py build
}
@@ -62,3 +60,4 @@
}
# vim:set ts=2 sw=2 et:
+
Deleted: numpy-deprecated.patch
===
--- numpy-deprecated.patch 2015-05-06 17:18:24 UTC (rev 132832)
+++ numpy-deprecated.patch 2015-05-06 18:17:55 UTC (rev 132833)
@@ -1,68 +0,0 @@
-diff -ruN pymol.orig/layer0/os_python.h pymol/layer0/os_python.h
pymol.orig/layer0/os_python.h 2015-01-29 21:18:47.681749642 +
-+++ pymol/layer0/os_python.h 2015-01-29 21:21:07.501148656 +
-@@ -30,6 +30,7 @@
- #include
-
- #ifdef _PYMOL_NUMPY
-+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
- #include
- #endif
-
pymol.orig/layer0/Field.cpp2015-01-29 21:31:36.105141178 +
-+++ pymol/layer0/Field.cpp 2015-01-29 21:31:52.655071349 +
-@@ -73,7 +73,7 @@
-
- if(copy) {
- if((result = PyArray_SimpleNew(field->n_dim, dims, typenum)))
-- memcpy(PyArray_DATA(result), field->data, field->size);
-+ memcpy(PyArray_DATA((PyArrayObject *)result), field->data, field->size);
- } else {
- result = PyArray_SimpleNewFromData(field->n_dim, dims, typenum,
field->data);
- }
pymol.orig/layer2/CoordSet.cpp 2015-01-29 21:58:16.588313743 +
-+++ pymol/layer2/CoordSet.cpp 2015-01-29 21:59:42.051283150 +
-@@ -198,7 +198,7 @@
-
- if(copy) {
- if((result = PyArray_SimpleNew(2, dims, typenum)))
-- memcpy(PyArray_DATA(result), cs->Coord, cs->NIndex * 3 * base_size);
-+ memcpy(PyArray_DATA((PyArrayObject *)result), cs->Coord, cs->NIndex * 3
* base_size);
- } else {
- result = PyArray_SimpleNewFromData(2, dims, typenum, cs->Coord);
- }
pymol.orig/layer3/Selector.cpp 2014-12-04 01:50:03.0 +0300
-+++ pymol/layer3/Selector.cpp 2015-01-30 00:44:31.622293145 +0300
-@@ -6608,7 +6608,7 @@
- }
-
- result = PyArray_SimpleNew(2, dims, typenum);
-- dataptr = (float*) PyArray_DATA(result);
-+ dataptr = (float*) PyArray_DATA((PyArrayObject *)result);
-
- for(i = 0, iter.reset(); iter.next(); i++) {
- v_ptr = iter.getCoord();
-@@ -6677,11 +6677,12 @@
- import_array1(false);
-
- if(PyArray_Check(coords)) {
--if(PyArray_NDIM(coords) != 2 || PyArray_DIM(coords, 1) != 3) {
-+if(PyArray_NDIM((PyArrayObject *)coords) != 2 ||
-+PyArray_DIM((PyArrayObject *)coords, 1) != 3) {
- ErrMessage(G, "LoadCoords", "numpy array shape mismatch");
- return false;
- }
--itemsize = PyArray_ITEMSIZE(coords);
-+itemsize = PyArray_ITEMSIZE((PyArrayObject *)coords);
- switch(itemsize) {
- case sizeof(double):
- case sizeof(float):
-@@ -6700,7 +6701,7 @@
- // fast imple
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD numpy-deprecated.patch)
Date: Thursday, January 29, 2015 @ 23:28:23
Author: arcanis
Revision: 126763
upgpkg: pymol 1.7.4.0-2
glew rebuild
Added:
pymol/trunk/numpy-deprecated.patch
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
+
ChangeLog |3 ++
PKGBUILD | 14 +
numpy-deprecated.patch | 68 +++
3 files changed, 79 insertions(+), 6 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2015-01-29 21:39:29 UTC (rev 126762)
+++ ChangeLog 2015-01-29 22:28:23 UTC (rev 126763)
@@ -1,3 +1,6 @@
+1.7.4.0-2:
+glew rebuild
+
1.7.4.0-1:
upstream update
Modified: PKGBUILD
===
--- PKGBUILD2015-01-29 21:39:29 UTC (rev 126762)
+++ PKGBUILD2015-01-29 22:28:23 UTC (rev 126763)
@@ -5,22 +5,24 @@
pkgname=pymol
pkgver=1.7.4.0
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
license=('custom')
-depends=('glew' 'glut' 'libgl' 'python2-numpy' 'python2-pmw' 'tcsh')
+depends=('glew' 'glut' 'libgl' 'libxml2' '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}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
-"apbstools_tcltk8.6.patch")
+"apbstools_tcltk8.6.patch"
+"numpy-deprecated.patch")
install="${pkgname}.install"
md5sums=('296045ae49b58651f4abe21604996db2'
'0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
- '138550367b74fd62a7c7bc48d339eb2d')
+ '138550367b74fd62a7c7bc48d339eb2d'
+ '46197cac724b7bce499857891bdd9a0c')
changelog=ChangeLog
prepare() {
@@ -39,6 +41,8 @@
# fix FS#38899
patch -p0 -i "${pkgname}-38899.patch"
mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
+ # fix deprecated API
+ patch -p0 -i "numpy-deprecated.patch"
# fix FS#39526
cd "${srcdir}/${pkgname}"
patch -p0 -i "${srcdir}/apbstools_tcltk8.6.patch"
@@ -52,8 +56,6 @@
package() {
cd "${srcdir}/${pkgname}"
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"
Added: numpy-deprecated.patch
===
--- numpy-deprecated.patch (rev 0)
+++ numpy-deprecated.patch 2015-01-29 22:28:23 UTC (rev 126763)
@@ -0,0 +1,68 @@
+diff -ruN pymol.orig/layer0/os_python.h pymol/layer0/os_python.h
+--- pymol.orig/layer0/os_python.h 2015-01-29 21:18:47.681749642 +
pymol/layer0/os_python.h 2015-01-29 21:21:07.501148656 +
+@@ -30,6 +30,7 @@
+ #include
+
+ #ifdef _PYMOL_NUMPY
++#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+ #include
+ #endif
+
+--- pymol.orig/layer0/Field.cpp2015-01-29 21:31:36.105141178 +
pymol/layer0/Field.cpp 2015-01-29 21:31:52.655071349 +
+@@ -73,7 +73,7 @@
+
+ if(copy) {
+ if((result = PyArray_SimpleNew(field->n_dim, dims, typenum)))
+- memcpy(PyArray_DATA(result), field->data, field->size);
++ memcpy(PyArray_DATA((PyArrayObject *)result), field->data, field->size);
+ } else {
+ result = PyArray_SimpleNewFromData(field->n_dim, dims, typenum,
field->data);
+ }
+--- pymol.orig/layer2/CoordSet.cpp 2015-01-29 21:58:16.588313743 +
pymol/layer2/CoordSet.cpp 2015-01-29 21:59:42.051283150 +
+@@ -198,7 +198,7 @@
+
+ if(copy) {
+ if((result = PyArray_SimpleNew(2, dims, typenum)))
+- memcpy(PyArray_DATA(result), cs->Coord, cs->NIndex * 3 * base_size);
++ memcpy(PyArray_DATA((PyArrayObject *)result), cs->Coord, cs->NIndex * 3
* base_size);
+ } else {
+ result = PyArray_SimpleNewFromData(2, dims, typenum, cs->Coord);
+ }
+--- pymol.orig/layer3/Selector.cpp 2014-12-04 01:50:03.0 +0300
pymol/layer3/Selector.cpp 2015-01-30 00:44:31.622293145 +0300
+@@ -6608,7 +6608,7 @@
+ }
+
+ result = PyArray_SimpleNew(2, dims, typenum);
+- dataptr = (float*) PyArray_DATA(result);
++ dataptr = (float*) PyArray_DATA((PyArrayObject *)result);
+
+ for(i = 0, iter.reset(); iter.next(); i++) {
+ v_ptr = iter.getCoord();
+@@ -6677,11 +6677,12 @@
+ import_array1(false);
+
+ if(PyArray_Check(coords)) {
+-if(PyArray_NDIM(coords) != 2 || PyArray_DIM(coords, 1) != 3) {
++if(PyArray_NDIM((PyArrayObject *)coords) != 2 ||
++PyArray_DIM((PyArra
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD apbstools_tcltk8.6.patch)
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
===
--- PKGBUILD2014-12-08 00:51:59 UTC (rev 123612)
+++ PKGBUILD2014-12-08 02:06:38 UTC (rev 123613)
@@ -1,11 +1,11 @@
# $Id$
-# Maintainer: Evgeniy Alekseev
+# Maintainer: Evgeniy Alekseev
# Contributor: graysky
# Contributor: Tomasz Żok
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.patch2014-12-08 00:51:59 UTC (rev 123612)
+++ apbstools_tcltk8.6.patch2014-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)
- f
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Sunday, September 21, 2014 @ 20:30:57
Author: arcanis
Revision: 119366
upgpkg: pymol 1.7.2.1-2
Modified:
pymol/trunk/ChangeLog
pymol/trunk/PKGBUILD
---+
ChangeLog |3 +++
PKGBUILD |4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2014-09-21 14:54:51 UTC (rev 119365)
+++ ChangeLog 2014-09-21 18:30:57 UTC (rev 119366)
@@ -1,3 +1,6 @@
+1.7.2.1-2:
+fix dep list
+
1.7.2.1-1:
upstream update
Modified: PKGBUILD
===
--- PKGBUILD2014-09-21 14:54:51 UTC (rev 119365)
+++ PKGBUILD2014-09-21 18:30:57 UTC (rev 119366)
@@ -5,12 +5,12 @@
pkgname=pymol
pkgver=1.7.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
license=('custom')
-depends=('glew' 'glut' 'mesa' 'python2-numpy' 'python2-pmw' 'tcsh')
+depends=('glew' 'glut' 'libgl' '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}.png::"https://c.fsdn.com/allura/p/pymol/icon";
[arch-commits] Commit in pymol/trunk (ChangeLog PKGBUILD)
Date: Tuesday, August 26, 2014 @ 21:45:43
Author: arcanis
Revision: 117929
upgpkg: pymol 1.7.2.1-1
Added:
pymol/trunk/ChangeLog
Modified:
pymol/trunk/PKGBUILD
---+
ChangeLog |8
PKGBUILD | 21 +
2 files changed, 21 insertions(+), 8 deletions(-)
Added: ChangeLog
===
--- ChangeLog (rev 0)
+++ ChangeLog 2014-08-26 19:45:43 UTC (rev 117929)
@@ -0,0 +1,8 @@
+1.7.2.1-1:
+upstream update
+
+1.7.2.0-2:
+glew rebuild
+
+1.7.2.0-1:
+upstream update
Modified: PKGBUILD
===
--- PKGBUILD2014-08-26 18:49:44 UTC (rev 117928)
+++ PKGBUILD2014-08-26 19:45:43 UTC (rev 117929)
@@ -4,8 +4,8 @@
# Contributor: Tomasz Żok
pkgname=pymol
-pkgver=1.7.2.0
-pkgrel=2
+pkgver=1.7.2.1
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/";
@@ -13,24 +13,29 @@
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}.png::"https://c.fsdn.com/allura/p/pymol/icon";
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
install="${pkgname}.install"
-md5sums=('921b26d20f82d383ba5622baea946527'
+md5sums=('a3349139f8c70739be524cb08e438b82'
+ '0e9df23150d39cbcb8f79c38ce2a52e5'
'1f8152c4604ba2939b24e25a022937ca'
'c48bf253e59ff97c14114cd285a4f1e1')
+changelog=ChangeLog
prepare() {
# create desktop file
- gendesk -f --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="PyMOL"
--categories="Science;Chemistry"
+ gendesk -f -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" \
+ --name="PyMOL Molecular Graphics System" \
+ --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
- 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"
+ find "${pkgname}" -name '*.py' -type f -exec \
+ sed -i 's|env python|env python2|g' {} \;
+ find "${pkgname}/test" -type f -exec \
+ sed -i 's|bin/python|bin/python2|g' {} \;
# fix FS#38899
patch -p0 -i "${pkgname}-38899.patch"
mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
