Tue Aug 11 20:14:22 UTC 202020200811201422

a/kernel-generic-5.4.58-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.58-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.58-x86_64-1.txz:  Upgraded.
ap/mariadb-10.5.5-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.4.58-x86-1.txz:  Upgraded.
e/emacs-27.1-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.58-noarch-1.txz:  Upgraded.
l/imagemagick-7.0.10_27-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

2 files changed, 3 insertions, 85 deletions

diff --git a/source/e/emacs/0001-Support-ImageMagick-version-7.patch b/source/e/emacs/0001-Support-ImageMagick-version-7.patch
deleted file mode 100644
index 15e11b6d..00000000
--- a/source/e/emacs/0001-Support-ImageMagick-version-7.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 9648f9e622471b36111847c0ed352303c8c09504 Mon Sep 17 00:00:00 2001

-From: Paul Eggert <eggert@cs.ucla.edu>

-Date: Mon, 26 Nov 2018 17:37:16 -0800

-Subject: [PATCH] Support ImageMagick version 7

-

-Backport from master.

-* configure.ac (HAVE_IMAGEMAGICK7): New macro.

-(HAVE_IMAGEMAGICK): Also define if using ImageMagick 7 or later.

-* src/image.c [HAVE_IMAGEMAGICK7]: Include

-<MagickWand/MagickWand.h> and <MagickCore/version.h> instead of

-<wand/MagickWand.h> and <magick/version.h>.

-(PixelSetMagickColor, MagickPixelPacket) [HAVE_IMAGEMAGICK7]:

-New compatibility definitions.

----

- configure.ac | 15 +++++++++------

- src/image.c  | 13 +++++++++++--

- 2 files changed, 20 insertions(+), 8 deletions(-)

-

-diff --git a/configure.ac b/configure.ac

-index dc6d776d45..a4d0feaad5 100644

---- a/configure.ac

-+++ b/configure.ac

-@@ -2521,11 +2521,14 @@ AC_DEFUN

- HAVE_IMAGEMAGICK=no

- if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes"; then

-   if test "${with_imagemagick}" != "no"; then

--    ## 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"

--    EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])

-+    EMACS_CHECK_MODULES([IMAGEMAGICK], [MagickWand >= 7])

-+    if test $HAVE_IMAGEMAGICK = yes; then

-+       AC_DEFINE([HAVE_IMAGEMAGICK7], 1, [Define to 1 if using ImageMagick7.])

-+    else

-+       ## 6.3.5 is the earliest version known to work; see Bug#17339.

-+       ## 6.8.2 makes Emacs crash; see Bug#13867.

-+       EMACS_CHECK_MODULES([IMAGEMAGICK], [Wand >= 6.3.5 Wand != 6.8.2])

-+    fi

- 

-     if test $HAVE_IMAGEMAGICK = yes; then

-       OLD_CFLAGS=$CFLAGS

-@@ -5404,7 +5407,7 @@ AC_DEFUN

-   Does Emacs use -lrsvg-2?                                ${HAVE_RSVG}

-   Does Emacs use cairo?                                   ${HAVE_CAIRO}

-   Does Emacs use -llcms2?                                 ${HAVE_LCMS2}

--  Does Emacs use imagemagick (version 6)?                 ${HAVE_IMAGEMAGICK}

-+  Does Emacs use imagemagick?                             ${HAVE_IMAGEMAGICK}

-   Does Emacs support sound?                               ${HAVE_SOUND}

-   Does Emacs use -lgpm?                                   ${HAVE_GPM}

-   Does Emacs use -ldbus?                                  ${HAVE_DBUS}

-diff --git a/src/image.c b/src/image.c

-index a6b2d9060b..cc99f33d5f 100644

---- a/src/image.c

-+++ b/src/image.c

-@@ -8272,11 +8272,20 @@ imagemagick_image_p (Lisp_Object object)

- /* The GIF library also defines DrawRectangle, but its never used in Emacs.

-    Therefore rename the function so it doesn't collide with ImageMagick.  */

- #define DrawRectangle DrawRectangleGif

--#include <wand/MagickWand.h>

-+

-+#ifdef HAVE_IMAGEMAGICK7

-+# include <MagickWand/MagickWand.h>

-+# include <MagickCore/version.h>

-+/* ImageMagick 7 compatibility definitions.  */

-+# define PixelSetMagickColor PixelSetPixelColor

-+typedef PixelInfo MagickPixelPacket;

-+#else

-+# include <wand/MagickWand.h>

-+# include <magick/version.h>

-+#endif

- 

- /* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.

-    Emacs seems to work fine with the hidden version, so unhide it.  */

--#include <magick/version.h>

- #if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665

- extern WandExport void PixelGetMagickColor (const PixelWand *,

- 					    MagickPixelPacket *);

--- 

-2.19.1

-

diff --git a/source/e/emacs/emacs.SlackBuild b/source/e/emacs/emacs.SlackBuild
index 14066256..1e5a164a 100755
--- a/source/e/emacs/emacs.SlackBuild
+++ b/source/e/emacs/emacs.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2015, 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2015, 2017, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=emacs
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 # Determine version number the tarball is labeled with:
 TARBALLVER=${TARBALLVER:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 # OK, now what's being used as the source directory version number...  account
@@ -92,8 +92,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/0001-Support-ImageMagick-version-7.patch.gz | patch -p1 --verbose || exit 1
-autoreconf -vif
+#autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \