Attachment #183844 for bug #220306

Lines 52-58 OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE Link Here

(-)editors/emacs/Makefile (-1 / +11 lines)
52	OPTIONS_RADIO_SOUND= ALSA OSS	52	OPTIONS_RADIO_SOUND= ALSA OSS
53	OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D	53	OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D
54	OPTIONS_GROUP= GRAPHICS NEEDX11	54	OPTIONS_GROUP= GRAPHICS NEEDX11
55	OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM	55	OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK MAGICK7 PNG SVG TIFF XPM
56	OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \	56	OPTIONS_GROUP_NEEDX11= GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM \
57	XWIDGETS	57	XWIDGETS
58		58
Lines 71-76 KQUEUE_DESC= File notification via kqueue Link Here
71	LLDB_DESC= LLDB support for GUD	71	LLDB_DESC= LLDB support for GUD
72	#LTO_DESC= Enable link-time optimization	72	#LTO_DESC= Enable link-time optimization
73	MAGICK_DESC= ImageMagick image processing support	73	MAGICK_DESC= ImageMagick image processing support
		74	MAGICK7_DESC= ${MAGICK_DESC:S/Magick/& 7.*/}
74	M17N_DESC= M17N for text-shaping (implies XFT)	75	M17N_DESC= M17N for text-shaping (implies XFT)
75	MODULES_DESC= Dynamic modules support	76	MODULES_DESC= Dynamic modules support
76	NEEDX11_DESC= Other X11-dependent (each implies X11)	77	NEEDX11_DESC= Other X11-dependent (each implies X11)
Lines 135-140 M17N_IMPLIES= XFT X11 Link Here
135	MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick	136	MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick
136	MAGICK_CONFIGURE_WITH= imagemagick	137	MAGICK_CONFIGURE_WITH= imagemagick
137	MAGICK_IMPLIES= X11	138	MAGICK_IMPLIES= X11
		139	MAGICK_PREVENTS= MAGICK7
		140	MAGICK7_LIB_DEPENDS= libMagickCore-7.so:graphics/ImageMagick7
		141	MAGICK7_CONFIGURE_ON= --with-${MAGICK_CONFIGURE_WITH}
		142	MAGICK7_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-magick7
		143	MAGICK7_IMPLIES= ${MAGICK_IMPLIES}
		144	MAGICK7_PREVENTS= MAGICK
138	MODULES_CONFIGURE_WITH= modules	145	MODULES_CONFIGURE_WITH= modules
139	MOTIF_USES= motif	146	MOTIF_USES= motif
140	MOTIF_CONFIGURE_ON= --with-x-toolkit=motif	147	MOTIF_CONFIGURE_ON= --with-x-toolkit=motif
Lines 185-190 XWIDGETS_CONFIGURE_WITH=xwidgets Link Here
185	XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3	192	XWIDGETS_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3
186	XWIDGETS_IMPLIES= GTK3	193	XWIDGETS_IMPLIES= GTK3
187		194
		195	post-patch-MAGICK7-on:
		196	@${REINPLACE_CMD} -e 's/Wand/Magick&/g' ${WRKSRC}/configure
		197
188	# With a desktop entry stage-qa will give a warning about requiring	198	# With a desktop entry stage-qa will give a warning about requiring
189	# desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,	199	# desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,
190	# but don't pull in those dependencies when X11 is off.	200	# but don't pull in those dependencies when X11 is off.




--- src/image.c.orig	2017-02-03 10:25:45 UTC
+++ src/image.c
@@ -8240,14 +8240,14 @@ 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>
+#include <MagickWand/MagickWand.h>
 
 /* 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>
+#include <MagickCore/version.h>
 #if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
 extern WandExport void PixelGetMagickColor (const PixelWand *,
-					    MagickPixelPacket *);
+					    PixelInfo *);
 #endif
 
 /* Log ImageMagick error message.
@@ -8402,7 +8402,7 @@ imagemagick_compute_animated_image (MagickWand *super_
       PixelWand **source, **dest;
       size_t source_width, source_height;
       ssize_t source_left, source_top;
-      MagickPixelPacket pixel;
+      PixelInfo pixel;
       DisposeType dispose;
       ptrdiff_t lines = 0;
 
@@ -8467,7 +8467,7 @@ imagemagick_compute_animated_image (MagickWand *super_
 	      if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
 		{
 		  PixelGetMagickColor (source[x], &pixel);
-		  PixelSetMagickColor (dest[x + source_left], &pixel);
+		  PixelSetPixelColor (dest[x + source_left], &pixel);
 		}
 	    }
 	  PixelSyncIterator (dest_iterator);
@@ -8512,7 +8512,7 @@ imagemagick_load_image (struct frame *f, struct image 
   MagickWand *image_wand;
   PixelIterator *iterator;
   PixelWand **pixels, *bg_wand = NULL;
-  MagickPixelPacket  pixel;
+  PixelInfo  pixel;
   Lisp_Object image;
   Lisp_Object value;
   Lisp_Object crop;

Lines 5-11 PKGNAMESUFFIX= -nox11 Link Here

(-)editors/emacs-nox11/Makefile (-1 / +1 lines)
5		5
6	CONFLICTS_INSTALL= emacs-[0-9]* emacs-devel-[0-9]*	6	CONFLICTS_INSTALL= emacs-[0-9]* emacs-devel-[0-9]*
7		7
8	OPTIONS_EXCLUDE= CAIRO GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK \	8	OPTIONS_EXCLUDE= CAIRO GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MAGICK7 \
9	MOTIF OTF PNG SCROLLBARS SVG TIFF X11 XAW XAW3D XFT XIM \	9	MOTIF OTF PNG SCROLLBARS SVG TIFF X11 XAW XAW3D XFT XIM \
10	XPM XWIDGETS	10	XPM XWIDGETS
11	OPTIONS_DEFAULT= GNUTLS MODULES SOURCES XML	11	OPTIONS_DEFAULT= GNUTLS MODULES SOURCES XML

Return to bug 220306

Line 0 Link Here

(-)editors/emacs/files/extra-patch-magick7 (+47 lines)
	1	--- src/image.c.orig 2017-02-03 10:25:45 UTC
	2	+++ src/image.c
	3	@@ -8240,14 +8240,14 @@ imagemagick_image_p (Lisp_Object object)
	4	/* The GIF library also defines DrawRectangle, but its never used in Emacs.
	5	Therefore rename the function so it doesn't collide with ImageMagick. */
	6	#define DrawRectangle DrawRectangleGif
	7	-#include <wand/MagickWand.h>
	8	+#include <MagickWand/MagickWand.h>
	9
	10	/* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.
	11	Emacs seems to work fine with the hidden version, so unhide it. */
	12	-#include <magick/version.h>
	13	+#include <MagickCore/version.h>
	14	#if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
	15	extern WandExport void PixelGetMagickColor (const PixelWand *,
	16	- MagickPixelPacket *);
	17	+ PixelInfo *);
	18	#endif
	19
	20	/* Log ImageMagick error message.
	21	@@ -8402,7 +8402,7 @@ imagemagick_compute_animated_image (MagickWand *super_
	22	PixelWand source, dest;
	23	size_t source_width, source_height;
	24	ssize_t source_left, source_top;
	25	- MagickPixelPacket pixel;
	26	+ PixelInfo pixel;
	27	DisposeType dispose;
	28	ptrdiff_t lines = 0;
	29
	30	@@ -8467,7 +8467,7 @@ imagemagick_compute_animated_image (MagickWand *super_
	31	if (dispose == BackgroundDispose \|\| PixelGetAlpha (source[x]))
	32	{
	33	PixelGetMagickColor (source[x], &pixel);
	34	- PixelSetMagickColor (dest[x + source_left], &pixel);
	35	+ PixelSetPixelColor (dest[x + source_left], &pixel);
	36	}
	37	}
	38	PixelSyncIterator (dest_iterator);
	39	@@ -8512,7 +8512,7 @@ imagemagick_load_image (struct frame *f, struct image
	40	MagickWand *image_wand;
	41	PixelIterator *iterator;
	42	PixelWand *pixels, bg_wand = NULL;
	43	- MagickPixelPacket pixel;
	44	+ PixelInfo pixel;
	45	Lisp_Object image;
	46	Lisp_Object value;
	47	Lisp_Object crop;