summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD15
2 files changed, 3 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f8e074f20b3..9cdbaa07bfce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs28-git
pkgdesc = GNU Emacs. emacs-28 release branch.
- pkgver = 28.0.90.151020
+ pkgver = 28.0.90.151062
pkgrel = 1
url = http://www.gnu.org/software/emacs/
install = emacs28-git.install
diff --git a/PKGBUILD b/PKGBUILD
index ed6072146e65..e3017d618bab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -57,9 +57,6 @@ NOCAIRO= # Disable here.
XWIDGETS= # Use GTK+ widgets pulled from webkit2gtk. Usable.
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.
################################################################################
@@ -69,7 +66,7 @@ if [[ $CLI == "YES" ]] ; then
else
pkgname="emacs28-git"
fi
-pkgver=28.0.90.151020
+pkgver=28.0.90.151062
pkgrel=1
pkgdesc="GNU Emacs. emacs-28 release branch."
arch=('x86_64')
@@ -135,9 +132,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+=();
@@ -235,12 +230,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