From af60adce6ac1b0af8aa02f8e24604781d2ead4ff09fcf9f393111d0aec68457a Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Fri, 7 Oct 2011 08:24:21 +0000
Subject: [PATCH] - fixed [bnc#717871] -- imagemagick display wrong order   *
 scene.patch

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=96
---
 ImageMagick-6.7.2-7.tar.bz2     |  3 +++
 ImageMagick-6.7.2-9.tar.bz2     |  3 ---
 ImageMagick-6.7.2.7-scene.patch | 26 ++++++++++++++++++++++++++
 ImageMagick.changes             |  4 ++--
 ImageMagick.spec                | 10 +++++++++-
 5 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 ImageMagick-6.7.2-7.tar.bz2
 delete mode 100644 ImageMagick-6.7.2-9.tar.bz2
 create mode 100644 ImageMagick-6.7.2.7-scene.patch

diff --git a/ImageMagick-6.7.2-7.tar.bz2 b/ImageMagick-6.7.2-7.tar.bz2
new file mode 100644
index 0000000..c0e494d
--- /dev/null
+++ b/ImageMagick-6.7.2-7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b16f2b3984bd1098fc1586d26f41201c40cbd89db4617df9e76e3ce612d2b336
+size 10222109
diff --git a/ImageMagick-6.7.2-9.tar.bz2 b/ImageMagick-6.7.2-9.tar.bz2
deleted file mode 100644
index 0579862..0000000
--- a/ImageMagick-6.7.2-9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c524d30abd0e2a216adf6d3f840c29e16a89a9e387d1f528d3981477d2a9fa7
-size 10237928
diff --git a/ImageMagick-6.7.2.7-scene.patch b/ImageMagick-6.7.2.7-scene.patch
new file mode 100644
index 0000000..431cada
--- /dev/null
+++ b/ImageMagick-6.7.2.7-scene.patch
@@ -0,0 +1,26 @@
+Index: magick/display.c
+===================================================================
+--- magick/display.c
++++ magick/display.c
+@@ -14578,7 +14578,7 @@
+         Window name is the base of the filename.
+       */
+       GetPathComponent(display_image->magick_filename,TailPath,filename);
+-      if (GetImageListLength(display_image) == 1)
++      if (display_image->scene == 0)
+         (void) FormatLocaleString(windows->image.name,MaxTextExtent,
+           "%s: %s",MagickPackageName,filename);
+       else
+Index: wand/display.c
+===================================================================
+--- wand/display.c
++++ wand/display.c
+@@ -667,6 +667,7 @@
+           state|=ExitState;
+         if (LocaleCompare(filename,"-") == 0)
+           state|=ExitState;
++        RemoveAllImageStack();
+         continue;
+       }
+     pend=image != (Image *) NULL ? MagickTrue : MagickFalse;
+
diff --git a/ImageMagick.changes b/ImageMagick.changes
index faf9696..d65fb84 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,8 +1,8 @@
 -------------------------------------------------------------------
 Thu Oct  6 12:47:38 UTC 2011 - pgajdos@suse.com
 
-- update to 6.7.2.9: fixes [bnc#717871] -- imagemagick display
-  wrong order
+- fixed [bnc#717871] -- imagemagick display wrong order
+  * scene.patch
 
 -------------------------------------------------------------------
 Tue Sep 20 13:22:37 UTC 2011 - pgajdos@suse.com
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 1821bbf..642fc19 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -84,7 +84,7 @@ BuildRequires:  libwebp-devel
 
 %define xtp_version 5.4.3
 %define mfr_version 6.7.2
-%define mfr_revision 9
+%define mfr_revision 7
 %define source_version %{mfr_version}-%{mfr_revision}
 License:        Public Domain, Freeware
 Group:          Productivity/Graphics/Other
@@ -106,6 +106,7 @@ Patch2:         ImageMagick-6.6.8.9-doc.patch
 # see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include
 # for upstream progress
 Patch3:         ImageMagick-6.6.9.1-inc-struct.diff
+Patch4:         ImageMagick-6.7.2.7-scene.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       imagemag = %{version}
 Obsoletes:      imagemag < %{version}
@@ -198,6 +199,7 @@ rm -rf xtp-%{xtp_version}
 %patch1
 %patch2
 %patch3 -p1
+%patch4
 # remove together with inc-struct.diff     ----
 echo>header-test.c '#include "wand.h"'        #
 echo>wand.h '#include "wand/MagickWand.h"'    #
@@ -506,4 +508,10 @@ HTML documentation for ImageMagick library and scene examples.
 
 
 
+
+
+
+
+
+
 %changelog