summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2018-02-20 08:55:48 -0500
committerPedro A. López-Valencia2018-02-20 08:55:48 -0500
commit249d0bd3bd387f0f97bf8d89fbf5198f1733428b (patch)
treed88b8a33adea5a667658ba2bfa6cca4f9d0c2c7e
parentbbeb62818aa9a4db4f29ad22847c135fb6c55cd7 (diff)
downloadaur-249d0bd3bd387f0f97bf8d89fbf5198f1733428b.tar.gz
Make sure imagemagick6 is detectected properly.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1214e9609a66..e45d53274d3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = emacs-pretest
pkgdesc = The extensible, customizable, self-documenting real-time display editor -- pretest version
pkgver = 26.0.91
- pkgrel = 1
+ pkgrel = 2
url = http://www.gnu.org/software/emacs/emacs.html
arch = x86_64
license = GPL3
@@ -16,7 +16,7 @@ pkgbase = emacs-pretest
depends = dconf
depends = desktop-file-utils
depends = alsa-lib
- depends = imagemagick
+ depends = libmagick6
depends = gnutls
provides = emacs
conflicts = emacs
diff --git a/PKGBUILD b/PKGBUILD
index f73e9cc7d858..9eabb5e1a441 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,12 @@
pkgname=emacs-pretest
_pkgname=emacs
pkgver=26.0.91
-pkgrel=1
+pkgrel=2
pkgdesc="The extensible, customizable, self-documenting real-time display editor -- pretest version"
arch=('x86_64')
url="http://www.gnu.org/software/emacs/emacs.html"
license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'dconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'dconf' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls')
provides=('emacs')
conflicts=('emacs')
source=(https://alpha.gnu.org/gnu/emacs/pretest/$_pkgname-$pkgver.tar.xz{,.sig})
@@ -22,6 +22,9 @@ validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF9
build() {
cd "$srcdir"/$_pkgname-$pkgver
+# Else imagemagick is not detected.
+export PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig
+
local confopts=(
--prefix=/usr
--sysconfdir=/etc