@@ -0,0 +1,166 @@
1+Index: utsushi-0.57.0/configure.ac
2+===================================================================
3+--- utsushi-0.57.0.orig/configure.ac
4++++ utsushi-0.57.0/configure.ac
5+@@ -221,6 +221,9 @@ AS_IF([test xno != x$enable_code_coverag
6+ [AC_MSG_ERROR([code coverage support requires a GNU C/C++ compiler])])
7+ ])
8+ AM_PROG_AR
9++AC_PATH_PROG([AWK],[awk])
10++AC_DEFINE_UNQUOTED([AWK], ["$AWK"],
11++ [Path to awk.])
12+
13+ PKG_PROG_PKG_CONFIG
14+
15+@@ -379,27 +382,31 @@ AM_CONDITIONAL([have_libmagick_pp], [tes
16+ AS_IF([test xno != "x$with_magick"],
17+ AS_CASE("x$with_magick",
18+ [xGraphicsMagick],
19+- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm])
20+- AS_IF([test xgm != x$MAGICK_CONVERT],
21++ [[AC_PATH_PROG(MAGICK_CONVERT, gm)]
22++ AS_IF([test x == x$MAGICK_CONVERT],
23+ [AC_MSG_ERROR([$with_magick requested but not found])])
24+ AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1])
25+- MAGICK_CONVERT="gm convert"
26++ HAVE_MAGICK=1
27++ MAGICK_CONVERT="$MAGICK_CONVERT convert"
28+ ],
29+ [xImageMagick],
30+- [AC_CHECK_PROGS([MAGICK_CONVERT], [convert])
31+- AS_IF([test xconvert != x$MAGICK_CONVERT],
32++ [[AC_PATH_PROG(MAGICK_CONVERT, convert)]
33++ AS_IF([test x == x$MAGICK_CONVERT],
34+ [AC_MSG_ERROR([$with_magick requested but not found])])
35+ AC_DEFINE([HAVE_IMAGE_MAGICK], [1])
36++ HAVE_MAGICK=1
37+ ],
38+ [xyes|xcheck],
39+- [AC_CHECK_PROGS([MAGICK_CONVERT], [gm convert])
40++ [[AC_PATH_PROGS([MAGICK_CONVERT], [gm convert])]
41+ AS_CASE(x$MAGICK_CONVERT,
42+- [xgm],
43++ [x*gm],
44+ [AC_DEFINE([HAVE_GRAPHICS_MAGICK], [1])
45+- MAGICK_CONVERT="gm convert"
46++ HAVE_MAGICK=1
47++ MAGICK_CONVERT="$MAGICK_CONVERT convert"
48+ ],
49+- [xconvert],
50++ [x*convert],
51+ [AC_DEFINE([HAVE_IMAGE_MAGICK], [1])
52++ HAVE_MAGICK=1
53+ ],
54+ [dnl default case
55+ AS_IF([test xcheck != "x$with_magick"],
56+@@ -410,7 +417,7 @@ AS_IF([test xno != "x$with_magick"],
57+ AC_MSG_ERROR([unknown value: --with-magick=$with_magick])
58+ ]))
59+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
60+-AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"])
61++AM_CONDITIONAL([have_magick], [test x != "x$HAVE_MAGICK"])
62+
63+ AS_IF([test xno != "x$with_gtkmm"],
64+ [PKG_CHECK_MODULES([LIBGTKMM], [gtkmm-2.4 >= 2.20],
65+Index: utsushi-0.57.0/filters/magick.cpp
66+===================================================================
67+--- utsushi-0.57.0.orig/filters/magick.cpp
68++++ utsushi-0.57.0/filters/magick.cpp
69+@@ -81,19 +81,18 @@ chomp (char *str)
70+ }
71+
72+ bool
73+-magick_version_before_(const char *magick, const char *cutoff)
74++magick_version_before_(const char *cutoff)
75+ {
76+ FILE *fp = NULL;
77+ int errc = 0;
78+
79+- if (0 == strcmp ("GraphicsMagick", magick))
80+- fp = popen ("gm convert -version"
81+- "| awk '/^GraphicsMagick/{print $2}'", "r");
82+- if (fp) errc = errno;
83+-
84+- if (0 == strcmp ("ImageMagick", magick))
85+- fp = popen ("convert -version"
86+- "| awk '/^Version:/{print $3}'", "r");
87++#if HAVE_GRAPHICS_MAGICK
88++ fp = popen (MAGICK_CONVERT " -version"
89++ "| " AWK " '/^GraphicsMagick/{print $2}'", "r");
90++#elif HAVE_IMAGE_MAGICK
91++ fp = popen (MAGICK_CONVERT " -version"
92++ "| " AWK " '/^Version:/{print $3}'", "r");
93++#endif
94+ if (fp) errc = errno;
95+
96+ if (fp)
97+@@ -106,42 +105,32 @@ magick_version_before_(const char *magic
98+
99+ if (version)
100+ {
101+- log::debug ("found %1%-%2%") % magick % version;
102++ log::debug ("found " MAGICK_CONVERT "version %1%") % version;
103+ return (0 > strverscmp (version, cutoff));
104+ }
105+ }
106+
107+ if (errc)
108+- log::alert ("failure checking %1% version: %2%")
109+- % magick
110++ log::alert ("failure checking " MAGICK_CONVERT " version: %1%")
111+ % strerror (errc);
112+
113+ return false;
114+ }
115+
116+ bool
117+-graphics_magick_version_before_(const char *cutoff)
118+-{
119+- return magick_version_before_("GraphicsMagick", cutoff);
120+-}
121+-
122+-bool
123+-image_magick_version_before_(const char *cutoff)
124+-{
125+- return magick_version_before_("ImageMagick", cutoff);
126+-}
127+-
128+-bool
129+ auto_orient_is_usable ()
130+ {
131+ static int usable = -1;
132+
133+ if (-1 == usable)
134+ {
135+- if (HAVE_GRAPHICS_MAGICK) // version -auto-orient was added
136+- usable = !graphics_magick_version_before_("1.3.18");
137+- if (HAVE_IMAGE_MAGICK) // version known to work
138+- usable = !image_magick_version_before_("6.7.8-9");
139++#if HAVE_GRAPHICS_MAGICK
140++ // version -auto-orient was added
141++ usable = !magick_version_before_("1.3.18");
142++#elif HAVE_IMAGE_MAGICK
143++ // version known to work
144++ usable = !magick_version_before_("6.7.8-9");
145++#endif
146+ if (-1 == usable)
147+ usable = false;
148+ usable = (usable ? 1 : 0);
149+@@ -392,7 +381,7 @@ magick::arguments (const context& ctx)
150+ if (color_correction_)
151+ {
152+ if (HAVE_IMAGE_MAGICK
153+- && !image_magick_version_before_("6.6.1-0"))
154++ && !magick_version_before_("6.6.1-0"))
155+ argv += " -color-matrix";
156+ else
157+ argv += " -recolor";
158+@@ -416,7 +405,7 @@ magick::arguments (const context& ctx)
159+ size_t mat_size = ((HAVE_IMAGE_MAGICK) ? 6 : 5);
160+
161+ if (HAVE_IMAGE_MAGICK
162+- && !image_magick_version_before_("6.6.1-0"))
163++ && !magick_version_before_("6.6.1-0"))
164+ argv += " -color-matrix";
165+ else
166+ argv += " -recolor";