summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-03-18 19:52:57 +0000
committerDaniel Bermond2018-03-18 19:52:57 +0000
commit361d0b56b2ba743d6c4e058762523a36421e94bd (patch)
treef14f701b32b3f06ec5378d76e10ba219d4cf3bc3
parent70bb626821a6e607b4e21bb287d85bb1c394e234 (diff)
downloadaur-361d0b56b2ba743d6c4e058762523a36421e94bd.tar.gz
Avoid running configure twice
When using the git tree source, configure runs twice: for some reason it needs to do a recheck and runs for a second time. Remaking all the configuration files by running 'autoreconf -fis' will fix it.
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD29
2 files changed, 33 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5dd1cc3c8feb..584334fd2489 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Dec 22 21:08:15 UTC 2017
pkgbase = imagemagick-full-git
pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version)
- pkgver = 7.0.7.16.r13021.g45f72690a
+ pkgver = 7.0.7.28.r13846.g32fafbf71
pkgrel = 1
url = http://www.imagemagick.org/
arch = i686
@@ -112,21 +110,21 @@ pkgname = libmagick-full-git
conflicts = libmagick-full
options = !emptydirs
options = libtool
- backup = etc/ImageMagick-7/coder.xml
- backup = etc/ImageMagick-7/colors.xml
- backup = etc/ImageMagick-7/delegates.xml
- backup = etc/ImageMagick-7/log.xml
- backup = etc/ImageMagick-7/magic.xml
- backup = etc/ImageMagick-7/mime.xml
- backup = etc/ImageMagick-7/policy.xml
- backup = etc/ImageMagick-7/quantization-table.xml
- backup = etc/ImageMagick-7/thresholds.xml
- backup = etc/ImageMagick-7/type.xml
- backup = etc/ImageMagick-7/type-dejavu.xml
- backup = etc/ImageMagick-7/type-ghostscript.xml
+ backup = etc//coder.xml
+ backup = etc//colors.xml
+ backup = etc//delegates.xml
+ backup = etc//log.xml
+ backup = etc//magic.xml
+ backup = etc//mime.xml
+ backup = etc//policy.xml
+ backup = etc//quantization-table.xml
+ backup = etc//thresholds.xml
+ backup = etc//type.xml
+ backup = etc//type-dejavu.xml
+ backup = etc//type-ghostscript.xml
pkgname = imagemagick-full-git
- depends = libmagick-full-git=7.0.7.16.r13021.g45f72690a-1
+ depends = libmagick-full-git=7.0.7.28.r13846.g32fafbf71-1
depends = perl>=
depends = perl<
optdepends = imagemagick-full-doc-git: manual and API docs
@@ -141,7 +139,7 @@ pkgname = imagemagick-full-git
options = !emptydirs
pkgname = imagemagick-full-doc-git
- pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version) (utilities manuals and libraries API)
+ pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version) (manual and API docs)
arch = any
provides = imagemagick-doc
conflicts = imagemagick-doc
diff --git a/PKGBUILD b/PKGBUILD
index 60aaa9025fec..92844d2dd85f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,9 +23,7 @@ _qdepth='32'
pkgbase=imagemagick-full-git
pkgname=('libmagick-full-git' 'imagemagick-full-git' 'imagemagick-full-doc-git')
-pkgver=7.0.7.16.r13021.g45f72690a
-_majorver="${pkgver%%.*}"
-_etcdir="ImageMagick-${_majorver}"
+pkgver=7.0.7.28.r13846.g32fafbf71
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all libs and features, git version)"
@@ -60,10 +58,13 @@ sha256sums=('SKIP'
'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
prepare() {
- cd "$pkgbase"
-
- # fix up typemaps to match Arch Linux packages, where possible
- patch -Np1 -i "${srcdir}/arch-fonts.diff"
+ cd "$pkgbase"
+
+ # fix for 'sh: gitversion.sh: command not found' during autoreconf
+ sed -i 's|(gitversion|(./gitversion|' configure.ac
+
+ # fix up typemaps to match Arch Linux packages, where possible
+ patch -Np1 -i "${srcdir}/arch-fonts.diff"
}
pkgver() {
@@ -79,7 +80,10 @@ pkgver() {
build() {
cd "$pkgbase"
- CFLAGS="${CFLAGS} -I/usr/include/FLIF" \
+ export CFLAGS="${CFLAGS} -I/usr/include/FLIF"
+
+ autoreconf -fis
+
./configure \
--prefix='/usr' \
--sysconfdir='/etc' \
@@ -146,7 +150,10 @@ build() {
}
package_libmagick-full-git() {
- pkgdesc+=" (library)"
+ local _majorver="${pkgver%%.*}"
+ local _etcdir="ImageMagick-${_majorver}"
+
+ pkgdesc+=' (library)'
backup=(etc/"$_etcdir"/{coder,colors,delegates,log,magic,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml)
options=('!emptydirs' 'libtool')
provides=('libmagick' 'libmagick-git'
@@ -211,7 +218,7 @@ package_imagemagick-full-git() {
find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
# template start; name=perl-binary-module-dependency; version=1;
- if [ $(find "${pkgdir}/usr/lib/perl5/" -name '*.so') ]
+ if [ "$(find "${pkgdir}/usr/lib/perl5/" -name '*.so')" ]
then
local _perlver_min="$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')"
local _perlver_max="$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')"
@@ -224,7 +231,7 @@ package_imagemagick-full-git() {
}
package_imagemagick-full-doc-git() {
- pkgdesc+=" (utilities manuals and libraries API)"
+ pkgdesc+=' (manual and API docs)'
arch=('any')
provides=('imagemagick-doc')
conflicts=('imagemagick-doc' 'imagemagick-git-doc' 'imagemagick-full-doc')