summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAthemis2018-07-10 13:47:22 +0200
committerAthemis2018-07-10 13:49:09 +0200
commitbba2f82d538bfff5752e2d4d7893e5b88ca845d1 (patch)
tree2d828e1ff315be4eef3dedb738a55333cbf9b588
parentc06560982ebf0b2a2af7ad9d97c686c47507a414 (diff)
downloadaur-coot.tar.gz
fix building with recent glibc and gtk2
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD15
-rw-r--r--coot-dynarama.patch20
3 files changed, 35 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1a535917ab1..e95e0b109be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed May 2 11:41:07 UTC 2018
+# Tue Jul 10 11:41:08 UTC 2018
pkgbase = coot
pkgdesc = Crystallographic Object-Oriented Toolkit for model building, completion and validation
pkgver = 0.8.9.1
- pkgrel = 2
+ pkgrel = 3
url = http://lmb.bioch.ox.ac.uk/coot/
arch = i686
arch = x86_64
@@ -48,6 +48,7 @@ pkgbase = coot
source = coot-python.patch
source = coot-lidia.patch
source = coot-pyrogen.patch
+ source = coot-dynarama.patch
source = coot.in
sha256sums = 51b6faef11177a8ab682fbe28448f935ae1252ad53b4efa31339ff658a63ff94
sha256sums = 03562eec612103a48bd114cfe0d171943e88f94b84610d16d542cda138e5f36b
@@ -61,6 +62,7 @@ pkgbase = coot
sha256sums = f4747e1fc7a3387f42b6c40358f999404761a0282ee6be3c621091d9d5d88099
sha256sums = dd2eb7c66ff2fa6f68a9d1e834e1911d2a1669a76ed29b5dbd6863619edcba18
sha256sums = b07517bdf9fcee43cf13533902ef333adcdaa45e60905628dfefc98ff55e95b5
+ sha256sums = 485f305444fbe8ec3df3add5df68c5f2f7524507211f94bdecf2fa110c28c014
sha256sums = 5ba4e0d9bdc4db0bab403b8f9aadb1320af60e91f9ed87e81dc680425375590b
pkgname = coot
diff --git a/PKGBUILD b/PKGBUILD
index 7940acaef0a..b3535f413f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Alexander Minges <alexander.minges@gmail.com>
pkgname=coot
pkgver=0.8.9.1
-pkgrel=2
+pkgrel=3
pkgdesc="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
arch=('i686' 'x86_64')
url="http://lmb.bioch.ox.ac.uk/coot/"
@@ -21,6 +21,7 @@ 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
)
@@ -36,9 +37,10 @@ sha256sums=('51b6faef11177a8ab682fbe28448f935ae1252ad53b4efa31339ff658a63ff94'
'f4747e1fc7a3387f42b6c40358f999404761a0282ee6be3c621091d9d5d88099'
'dd2eb7c66ff2fa6f68a9d1e834e1911d2a1669a76ed29b5dbd6863619edcba18'
'b07517bdf9fcee43cf13533902ef333adcdaa45e60905628dfefc98ff55e95b5'
+ '485f305444fbe8ec3df3add5df68c5f2f7524507211f94bdecf2fa110c28c014'
'5ba4e0d9bdc4db0bab403b8f9aadb1320af60e91f9ed87e81dc680425375590b')
-build() {
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -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-$pkgver"
+
aclocal -I macros
libtoolize --automake --copy
autoconf
diff --git a/coot-dynarama.patch b/coot-dynarama.patch
new file mode 100644
index 00000000000..7af8d00acb3
--- /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