summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2021-12-03 07:03:34 -0500
committerPedro A. López-Valencia2021-12-03 07:03:34 -0500
commita0feb807d2c9eb6479d4ff6908a72b21e571ca2e (patch)
treea2a9e31c24d70e1178e14a61ddc44c15cb392ead
parentc43361de91b7b1dc7e70e3d7a7cc074e56a6cd2d (diff)
downloadaur-a0feb807d2c9eb6479d4ff6908a72b21e571ca2e.tar.gz
* Drop ImageMagick support. (Yay!)
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD16
2 files changed, 3 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 882418ba90d9..d03fc781669c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Development master branch.
- pkgver = 29.0.50.152024
+ pkgver = 29.0.50.152302
pkgrel = 1
url = http://www.gnu.org/software/emacs/
install = emacs-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 57bc0d3c1fff..e93bf45a7b35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -60,10 +60,6 @@ DOCS_HTML= # Generate and install html documentation.
DOCS_PDF= # Generate and install pdf documentation.
-MAGICK= # ImageMagick 7 support. Deprecated (read the logs).
- # ImageMagick, like flash, won't die...
- # -->>If you just *believe* you need ImageMagick, you don't.<<--
-
NOGZ="YES" # Don't compress .el files.
################################################################################
@@ -73,7 +69,7 @@ if [[ $CLI == "YES" ]] ; then
else
pkgname="emacs-git"
fi
-pkgver=29.0.50.152025
+pkgver=29.0.50.152302
pkgrel=1
pkgdesc="GNU Emacs. Development master branch."
arch=('x86_64')
@@ -139,9 +135,7 @@ else
makedepends+=( 'xorgproto' );
fi
-if [[ $MAGICK == "YES" ]]; then
- depends+=( 'imagemagick' 'libjpeg-turbo' 'giflib' );
-elif [[ ! $NOX == "YES" ]] && [[ ! $CLI == "YES" ]]; then
+if [[ ! $NOX == "YES" ]] && [[ ! $CLI == "YES" ]]; then
depends+=( 'libjpeg-turbo' 'giflib' );
elif [[ $CLI == "YES" ]]; then
depends+=();
@@ -239,12 +233,6 @@ else
_conf+=( '--with-x-toolkit=gtk3' '--without-xaw3d' );
fi
-if [[ $MAGICK == "YES" ]]; then
- _conf+=( '--with-imagemagick');
-else
- _conf+=();
-fi
-
if [[ $NOCAIRO == "YES" || $CLI == "YES" ]]; then
_conf+=( '--without-cairo' );
fi