summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2019-05-12 21:51:41 +0200
committerhaawda2019-05-12 21:51:41 +0200
commit6cfb64a7a1a5361a96447d2fcb9fe143d5ef545b (patch)
treedc8170c232ee5f50a423cee5864dd88608129b6e
parent24b17c059b57c1993a7cd2f996e11178c53364db (diff)
downloadaur-6cfb64a7a1a5361a96447d2fcb9fe143d5ef545b.tar.gz
link against libmagick instead of libmagick6
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8829281c585b..cd997ddd77e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-lucid-git
pkgdesc = GNU Emacs. Official git master.
- pkgver = 27.0.50.r135638
+ pkgver = 27.0.50.r136298
pkgrel = 1
url = http://www.gnu.org/software/emacs/
arch = i686
@@ -21,7 +21,7 @@ pkgbase = emacs-lucid-git
depends = libdbus
depends = libxfixes
depends = jansson
- depends = libmagick6
+ depends = libmagick
depends = desktop-file-utils
provides = emacs
provides = emacs-seq
diff --git a/PKGBUILD b/PKGBUILD
index df375f86f867..4cf67f136062 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=emacs-lucid-git
-pkgver=27.0.50.r135638
+pkgver=27.0.50.r136298
pkgrel=1
pkgdesc="GNU Emacs. Official git master."
arch=('i686' 'x86_64')
@@ -9,7 +9,7 @@ url="http://www.gnu.org/software/emacs/"
license=('GPL')
depends=('alsa-lib' 'gpm' 'hicolor-icon-theme' 'm17n-lib' 'libxrandr' 'acl'
'libxinerama' 'librsvg' 'gnutls' 'xaw3d' 'libdbus' 'libxfixes'
- 'jansson' 'libmagick6' 'desktop-file-utils')
+ 'jansson' 'libmagick' 'desktop-file-utils')
makedepends=('git' 'texlive-core')
conflicts=('emacs')
options=('docs' '!emptydirs')
@@ -26,7 +26,7 @@ pkgver() {
build() {
cd emacs
[[ -x configure ]] || ( ./autogen.sh git && ./autogen.sh autoconf )
- ac_cv_lib_gif_EGifPutExtensionLast=yes PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \
+ ac_cv_lib_gif_EGifPutExtensionLast=yes PKG_CONFIG_PATH="/usr/lib/imagemagick/pkgconfig" \
./configure --program-transform-name='s/^ctags$/ctags.emacs/' \
--prefix=/usr \
--sysconfdir=/etc \