remove patch and option nomakeflags

3 files changed, 4 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbdbf8a8aff1..1f629e39d406 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = emacs-lucid-git
 	pkgdesc = GNU Emacs. Official git master.
-	pkgver = 27.0.50.r131803
+	pkgver = 27.0.50.r131970
 	pkgrel = 1
 	url = http://www.gnu.org/software/emacs/
 	arch = i686
@@ -28,9 +28,7 @@ pkgbase = emacs-lucid-git
 	options = !emptydirs
 	options = !makeflags
 	source = git://git.savannah.gnu.org/emacs.git
-	source = check_IM6.patch
 	sha256sums = SKIP
-	sha256sums = 19f6e3e50ab63296d5b021184fe5ddea35ed4332d2f48c2b616a393d9744d56e
 
 pkgname = emacs-lucid-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 99d6f3a5491a..1c308799b190 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.r131803
+pkgver=27.0.50.r131970
 pkgrel=1
 pkgdesc="GNU Emacs. Official git master."
 arch=('i686' 'x86_64')
@@ -14,9 +14,8 @@ makedepends=('git' 'texlive-core')
 conflicts=('emacs')
 options=('docs' '!emptydirs' '!makeflags')
 provides=('emacs')
-source=("git://git.savannah.gnu.org/emacs.git" check_IM6.patch)
-sha256sums=('SKIP'
-            '19f6e3e50ab63296d5b021184fe5ddea35ed4332d2f48c2b616a393d9744d56e')
+source=("git://git.savannah.gnu.org/emacs.git")
+sha256sums=('SKIP')
 
 pkgver() {
   cd emacs
@@ -24,11 +23,6 @@ pkgver() {
   printf "%s.r%s" "$(echo $_mainver)" "$(git rev-list --count HEAD)"
 }
 
-prepare() {
-  cd emacs
-  patch -Np1 < "$srcdir"/check_IM6.patch
-}
-
 build() {
   cd emacs
   [[ -x configure ]] || ( ./autogen.sh git && ./autogen.sh autoconf )
diff --git a/check_IM6.patch b/check_IM6.patch
deleted file mode 100644
index 98e081fbda66..000000000000
--- a/check_IM6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4c2644b11d..ab3b78f863 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2524,7 +2524,7 @@ AC_DEFUN
-     ## 6.3.5 is the earliest version known to work; see Bug#17339.
-     ## 6.8.2 makes Emacs crash; see Bug#13867.
-     ## 7 and later have not been ported to; See Bug#25967.
--    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
-+    IMAGEMAGICK_MODULE="Wand-6.Q16HDRI"
-     EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
- 
-     if test $HAVE_IMAGEMAGICK = yes; then