aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2019-08-31 19:37:58 +0200
committerUlrich Müller <ulm@gentoo.org>2019-08-31 19:37:58 +0200
commitafa052da7303e80ff7a79977cc6b645a11060a07 (patch)
treeb44e8c823fe7234617e5f1b450dab0ea5ccacc06
parentUpdate README. (diff)
downloademacs-patches-master.tar.gz
emacs-patches-master.tar.bz2
emacs-patches-master.zip
Remove 26.1 patchset.HEADmaster
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--emacs/26.1/01_all_bootstrap-infloop.patch34
-rw-r--r--emacs/26.1/02_all_imagemagick-7.patch96
2 files changed, 0 insertions, 130 deletions
diff --git a/emacs/26.1/01_all_bootstrap-infloop.patch b/emacs/26.1/01_all_bootstrap-infloop.patch
deleted file mode 100644
index f476565..0000000
--- a/emacs/26.1/01_all_bootstrap-infloop.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/660448
-
-From 13726cbac681e442649de1dfd73fcc7f889e87d9 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sat, 7 Jul 2018 10:59:22 -0700
-Subject: [PATCH] Fix bootstrap infloop in GNU/Linux alpha
-
-* src/emacs.c (main): Do not re-exec if EMACS_HEAP_EXEC
-is already set (Bug#32083).
----
- src/emacs.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/emacs.c b/src/emacs.c
-index 017c62308c..f5e47428ef 100644
---- a/src/emacs.c
-+++ b/src/emacs.c
-@@ -707,10 +707,12 @@ main (int argc, char **argv)
- bool disable_aslr = dumping;
- # endif
-
-- if (disable_aslr && disable_address_randomization ())
-+ if (disable_aslr && disable_address_randomization ()
-+ && !getenv ("EMACS_HEAP_EXEC"))
- {
- /* Set this so the personality will be reverted before execs
-- after this one. */
-+ after this one, and to work around an re-exec loop on buggy
-+ kernels (Bug#32083). */
- xputenv ("EMACS_HEAP_EXEC=true");
-
- /* Address randomization was enabled, but is now disabled.
---
-2.17.1
diff --git a/emacs/26.1/02_all_imagemagick-7.patch b/emacs/26.1/02_all_imagemagick-7.patch
deleted file mode 100644
index 3750b67..0000000
--- a/emacs/26.1/02_all_imagemagick-7.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Support ImageMagick version 7.
-https://bugs.gentoo.org/665058
-https://debbugs.gnu.org/25967
-
-This backports and consolidates the following commits from upstream git:
-
-commit 3cc42bb60099c32f64e57d2ee33c8321adba7942
-Author: Glenn Morris <rgm@gnu.org>
-Date: Thu Aug 30 13:56:08 2018 -0400
-
- * configure.ac: Fix goofs in my recent ImageMagick change.
-
-commit 42ed35c68b7c199aa797e655fdc3547c5c3087d2
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date: Thu Aug 30 10:03:43 2018 -0700
-
- Pacify -Wdouble-promotion in ImageMagick code
-
-commit bf1b147b55e1328efca6e40181e79dd9a369895d
-Author: Glenn Morris <rgm@gnu.org>
-Date: Mon Aug 27 22:03:25 2018 -0400
-
- * configure.ac, src/image.c: Tweak previous ImageMagick change.
-
-commit 5729486951e6a60db55ea17ee3bac9baf8b54f6a
-Author: Karl Otness <karl@karlotness.com>
-Date: Mon Aug 27 21:57:44 2018 -0400
-
- Support ImageMagick version 7 (bug#25967)
-
---- emacs-26.1-orig/configure.ac
-+++ emacs-26.1/configure.ac
-@@ -2521,11 +2521,14 @@
- 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
-@@ -5399,7 +5402,7 @@
- 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}
---- emacs-26.1-orig/src/image.c
-+++ emacs-26.1/src/image.c
-@@ -8270,11 +8270,20 @@
- /* 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 *);
-@@ -8799,7 +8808,8 @@
- #endif /* HAVE_MAGICKEXPORTIMAGEPIXELS */
- {
- size_t image_height;
-- MagickRealType color_scale = 65535.0 / QuantumRange;
-+ double quantum_range = QuantumRange;
-+ MagickRealType color_scale = 65535.0 / quantum_range;
-
- /* Try to create a x pixmap to hold the imagemagick pixmap. */
- if (!image_create_x_image_and_pixmap (f, img, width, height, 0,