Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2017-04-17 10:24:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Mon Apr 17 10:24:22 2017 rev:129 rq:487770 version:25.2 Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2017-03-29 13:20:29.263104678 +0200 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2017-04-17 10:24:24.682357866 +0200 @@ -1,0 +2,16 @@ +Wed Apr 12 09:25:13 UTC 2017 - [email protected] + +- build with ImageMagick 7 [bsc#1033077] + + emacs-25.2-ImageMagick7.patch + +------------------------------------------------------------------- +Mon Apr 3 06:34:49 UTC 2017 - [email protected] + +- Check if "-no-pie" is known to the compiler/linker + +------------------------------------------------------------------- +Sun Apr 2 16:49:35 UTC 2017 - [email protected] + +- also pass "-no-pie" as linkerflag to disable PIE. + +------------------------------------------------------------------- New: ---- emacs-25.2-ImageMagick7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.YrXajM/_old 2017-04-17 10:24:27.030025389 +0200 +++ /var/tmp/diff_new_pack.YrXajM/_new 2017-04-17 10:24:27.038024256 +0200 @@ -17,6 +17,9 @@ %bcond_with autoconf +%if %{suse_version} >= 1330 +%bcond_without autoconf +%endif # Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.1) %bcond_with cairo @@ -121,6 +124,10 @@ Patch16: emacs-24.4-flyspell.patch Patch22: emacs-24.1-bnc628268.patch Patch23: emacs-25.1-custom-fonts.patch +# this patch works with both ImageMagick-6 and ImageMagick-7 for us, +# but that is because we ship /usr/include/ImageMagick-7/wand compat +# symlink +Patch24: emacs-25.2-ImageMagick7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)} @@ -235,6 +242,7 @@ %patch22 -p0 -b .obsolate %patch23 -p0 -b .custfnt %patch -p0 -b .0 +%patch24 -p1 %if %{without autoconf} # We don't want to run autoconf @@ -324,6 +332,7 @@ %endif CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATION_WARNINGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" LDFLAGS= + cflags -Wl,-no-pie LDFLAGS cflags -pipe CFLAGS cflags -Wno-pointer-sign CFLAGS cflags -Wno-unused-variable CFLAGS ++++++ emacs-25.2-ImageMagick7.patch ++++++ Index: emacs-25.2/configure.ac =================================================================== --- emacs-25.2.orig/configure.ac 2017-04-12 11:44:53.680930444 +0200 +++ emacs-25.2/configure.ac 2017-04-12 11:44:53.692930606 +0200 @@ -2406,7 +2406,7 @@ if test "${HAVE_X11}" = "yes" || test "$ 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. - IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2" + IMAGEMAGICK_MODULE="MagickWand >= 6.3.5 MagickWand != 6.8.2" EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE]) AC_SUBST(IMAGEMAGICK_CFLAGS) AC_SUBST(IMAGEMAGICK_LIBS) Index: emacs-25.2/src/image.c =================================================================== --- emacs-25.2.orig/src/image.c 2017-02-03 11:25:45.000000000 +0100 +++ emacs-25.2/src/image.c 2017-04-12 12:01:48.298637854 +0200 @@ -8402,7 +8402,11 @@ imagemagick_compute_animated_image (Magi PixelWand **source, **dest; size_t source_width, source_height; ssize_t source_left, source_top; +#if MagickLibVersion >= 0x700 + PixelInfo pixel; +#else MagickPixelPacket pixel; +#endif DisposeType dispose; ptrdiff_t lines = 0; @@ -8467,7 +8471,11 @@ imagemagick_compute_animated_image (Magi if (dispose == BackgroundDispose || PixelGetAlpha (source[x])) { PixelGetMagickColor (source[x], &pixel); +#if MagickLibVersion >= 0x700 + PixelSetPixelColor (dest[x + source_left], &pixel); +#else PixelSetMagickColor (dest[x + source_left], &pixel); +#endif } } PixelSyncIterator (dest_iterator); @@ -8512,7 +8520,11 @@ imagemagick_load_image (struct frame *f, MagickWand *image_wand; PixelIterator *iterator; PixelWand **pixels, *bg_wand = NULL; +#if MagickLibVersion >= 0x700 + PixelInfo pixel; +#else MagickPixelPacket pixel; +#endif Lisp_Object image; Lisp_Object value; Lisp_Object crop;
