diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 29 | ||||
| -rw-r--r-- | coot-dynarama.patch | 20 |
3 files changed, 46 insertions, 19 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Wed May 2 11:41:07 UTC 2018 pkgbase = coot pkgdesc = Crystallographic Object-Oriented Toolkit for model building, completion and validation - pkgver = 0.8.9.1 - pkgrel = 2 + pkgver = 0.8.9.2 + pkgrel = 1 url = http://lmb.bioch.ox.ac.uk/coot/ arch = i686 arch = x86_64 @@ -14,7 +12,7 @@ pkgbase = coot depends = guile1.8-gui depends = gtkglext depends = libccp4>=6.5.1-2 - depends = clipper>=2.1.20170202-3 + depends = libclipper>=2.1.20170202-3 depends = goocanvas1 depends = gsl depends = libgnomecanvas @@ -33,10 +31,10 @@ pkgbase = coot depends = which depends = bc depends = sqlite - depends = rdkit-python2<=2017_09_3-1 + depends = rdkit-python2<=2017_09_3-2 depends = mmdb2>=2.0.12-4 replaces = coot-data - source = http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/source/releases/coot-0.8.9.1.tar.gz + source = coot-0.8.9.2.tar.gz::https://github.com/pemsley/coot/archive/Release-0.8.9.2-fix.tar.gz source = https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/dependencies/refmac-monomer-library.tar.gz source = https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/coot/dependencies/reference-structures.tar.gz source = coot-configure.ac.patch @@ -48,8 +46,9 @@ pkgbase = coot source = coot-python.patch source = coot-lidia.patch source = coot-pyrogen.patch + source = coot-dynarama.patch source = coot.in - sha256sums = 51b6faef11177a8ab682fbe28448f935ae1252ad53b4efa31339ff658a63ff94 + sha256sums = d8dcf9184ab91de225eb3cb91ef83e057b241e27a6d21f585f2c25b35da54e4f sha256sums = 03562eec612103a48bd114cfe0d171943e88f94b84610d16d542cda138e5f36b sha256sums = 44db38506f0f90c097d4855ad81a82a36b49cd1e3ffe7d6ee4728b15109e281a sha256sums = 2babfbc3cb798868d9e22f19ee49d12981fac35e3dfba2d8f7318716f59f673c @@ -61,6 +60,7 @@ pkgbase = coot sha256sums = f4747e1fc7a3387f42b6c40358f999404761a0282ee6be3c621091d9d5d88099 sha256sums = dd2eb7c66ff2fa6f68a9d1e834e1911d2a1669a76ed29b5dbd6863619edcba18 sha256sums = b07517bdf9fcee43cf13533902ef333adcdaa45e60905628dfefc98ff55e95b5 + sha256sums = 485f305444fbe8ec3df3add5df68c5f2f7524507211f94bdecf2fa110c28c014 sha256sums = 5ba4e0d9bdc4db0bab403b8f9aadb1320af60e91f9ed87e81dc680425375590b pkgname = coot @@ -1,15 +1,15 @@ # Maintainer: Alexander Minges <alexander.minges@gmail.com> pkgname=coot -pkgver=0.8.9.1 -pkgrel=2 +pkgver=0.8.9.2 +pkgrel=1 pkgdesc="Crystallographic Object-Oriented Toolkit for model building, completion and validation" arch=('i686' 'x86_64') url="http://lmb.bioch.ox.ac.uk/coot/" license=('GPL') replaces=('coot-data') -depends=('guile1.8' 'guile1.8-lib' 'guile1.8-gtk' 'guile1.8-gui' 'gtkglext' 'libccp4>=6.5.1-2' 'clipper>=2.1.20170202-3' 'goocanvas1' 'gsl' 'libgnomecanvas' 'imlib' 'swig' - 'freeglut' 'libgl' 'gtk2' 'cairo' 'libssm>=1.4.0-2' 'zlib' 'curl' 'python2' 'pygtk' 'gtkglarea' 'which' 'bc' 'sqlite' 'rdkit-python2<=2017_09_3-1' 'mmdb2>=2.0.12-4') -source=(http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/$pkgname/source/releases/$pkgname-$pkgver.tar.gz +depends=('guile1.8' 'guile1.8-lib' 'guile1.8-gtk' 'guile1.8-gui' 'gtkglext' 'libccp4>=6.5.1-2' 'libclipper>=2.1.20170202-3' 'goocanvas1' 'gsl' 'libgnomecanvas' 'imlib' 'swig' + 'freeglut' 'libgl' 'gtk2' 'cairo' 'libssm>=1.4.0-2' 'zlib' 'curl' 'python2' 'pygtk' 'gtkglarea' 'which' 'bc' 'sqlite' 'rdkit-python2<=2017_09_3-2' 'mmdb2>=2.0.12-4') +source=($pkgname-$pkgver.tar.gz::https://github.com/pemsley/$pkgname/archive/Release-$pkgver-fix.tar.gz https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/$pkgname/dependencies/refmac-monomer-library.tar.gz https://www2.mrc-lmb.cam.ac.uk/personal/pemsley/$pkgname/dependencies/reference-structures.tar.gz coot-configure.ac.patch @@ -21,10 +21,11 @@ source=(http://www2.mrc-lmb.cam.ac.uk/personal/pemsley/$pkgname/source/releases/ coot-python.patch coot-lidia.patch coot-pyrogen.patch + coot-dynarama.patch coot.in ) -sha256sums=('51b6faef11177a8ab682fbe28448f935ae1252ad53b4efa31339ff658a63ff94' +sha256sums=('d8dcf9184ab91de225eb3cb91ef83e057b241e27a6d21f585f2c25b35da54e4f' '03562eec612103a48bd114cfe0d171943e88f94b84610d16d542cda138e5f36b' '44db38506f0f90c097d4855ad81a82a36b49cd1e3ffe7d6ee4728b15109e281a' '2babfbc3cb798868d9e22f19ee49d12981fac35e3dfba2d8f7318716f59f673c' @@ -36,11 +37,12 @@ sha256sums=('51b6faef11177a8ab682fbe28448f935ae1252ad53b4efa31339ff658a63ff94' 'f4747e1fc7a3387f42b6c40358f999404761a0282ee6be3c621091d9d5d88099' 'dd2eb7c66ff2fa6f68a9d1e834e1911d2a1669a76ed29b5dbd6863619edcba18' 'b07517bdf9fcee43cf13533902ef333adcdaa45e60905628dfefc98ff55e95b5' + '485f305444fbe8ec3df3add5df68c5f2f7524507211f94bdecf2fa110c28c014' '5ba4e0d9bdc4db0bab403b8f9aadb1320af60e91f9ed87e81dc680425375590b') -build() { +prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-Release-$pkgver-fix" patch -Np0 -i "$srcdir/coot-configure.ac.patch" patch -Np0 -i "$srcdir/coot-makefile.patch" @@ -51,13 +53,18 @@ build() { patch -Np0 -i "$srcdir/coot-python.patch" patch -Np0 -i "$srcdir/coot-lidia.patch" patch -Np0 -i "$srcdir/coot-pyrogen.patch" - + patch -NRtp0 -i "$srcdir/coot-dynarama.patch" iconv -f iso8859-1 -t utf-8 README > README.conv && mv -f README.conv README cp $srcdir/coot.in src/ + # rm macros/libtool.m4 + +} + +build() { + cd "$srcdir/$pkgname-Release-$pkgver-fix" - rm macros/libtool.m4 aclocal -I macros libtoolize --automake --copy autoconf @@ -81,7 +88,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-Release-$pkgver-fix" make DESTDIR="$pkgdir/" install sed -i 's|COOT_PYTHON_DIR=|COOT_PYTHON_DIR=/usr/lib/python2.7/site-packages/coot|' src/$pkgname sed -i 's|COOT_REFMAC_LIB_DIR=|COOT_REFMAC_LIB_DIR=/usr/share/coot/lib/|' src/$pkgname diff --git a/coot-dynarama.patch b/coot-dynarama.patch new file mode 100644 index 000000000000..7af8d00acb3c --- /dev/null +++ b/coot-dynarama.patch @@ -0,0 +1,20 @@ +--- src/dynarama-main.cc.orig 2018-07-10 13:29:01.850708482 +0200 ++++ src/dynarama-main.cc 2018-04-01 02:17:29.000000000 +0200 +@@ -23,8 +23,6 @@ + + #ifdef HAVE_GOOCANVAS + +-#include <gtk/gtk.h> +- + #ifdef __GNU_LIBRARY__ + #include "compat/coot-getopt.h" + #else +@@ -35,6 +33,8 @@ + + #include <sys/stat.h> + ++#include <gtk/gtk.h> ++ + #ifdef HAVE_GOOCANVAS + #include <goocanvas.h> + #endif |