[gmic/f22] Fix link failure and prevent signed/unsigned errors on arm

[Daniel P. Berrange]

commit f5d767bc2ff1a2cdc69dc5f7fcc5be067f5b76cc
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Wed Feb 18 16:21:38 2015 +0000

    Fix link failure and prevent signed/unsigned errors on arm

 0001-gmic-run-linker-failure.patch |   16 ++++++++++++++++
 gmic.spec                          |    4 +++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/0001-gmic-run-linker-failure.patch b/0001-gmic-run-linker-failure.patch
new file mode 100644
index 0000000..a5bdfe0
--- /dev/null
+++ b/0001-gmic-run-linker-failure.patch
@@ -0,0 +1,16 @@
+diff -rup gmic-1.6.0.4/src/gmic.cpp gmic-1.6.0.4.new/src/gmic.cpp
+--- gmic-1.6.0.4/src/gmic.cpp	2015-02-06 10:20:55.000000000 +0000
++++ gmic-1.6.0.4.new/src/gmic.cpp	2015-02-18 15:25:18.742795544 +0000
+@@ -13461,5 +13461,12 @@ template gmic::gmic(const char *const co
+                     const bool include_default_commands,
+                     float *const p_progress=0, bool *const p_is_cancel);
+ 
++template gmic& gmic::_run(const gmic_list<char>& commands_line,
++                          gmic_list<gmic_pixel_type> &images, gmic_list<char> &images_names,
++                          float *const p_progress, bool *const p_is_cancel);
++
++template CImgList<float>::~CImgList();
++template CImgList<char>::~CImgList();
++
+ #endif // #ifdef gmic_main
+ #endif // #ifdef cimg_plugin
diff --git a/gmic.spec b/gmic.spec
index 5309b37..fc30c0a 100644
--- a/gmic.spec
+++ b/gmic.spec
@@ -7,6 +7,7 @@ Name: gmic
 Version: 1.6.0.4
 Release: 1%{?dist}
 Source: http://downloads.sourceforge.net/project/%{name}/%{name}_%{version}.tar.gz
+Patch1: 0001-gmic-run-linker-failure.patch
 License: CeCILL
 Url: http://gmic.sourceforge.net/index.shtml
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -63,6 +64,7 @@ Provides a plugin for using G'MIC from GIMP
 %prep
 
 %setup -q
+%patch1 -p1
 
 %build
 cd src
@@ -77,7 +79,7 @@ cp /usr/include/CImg.h CImg.h
 # Setting FFMPEG flags to empty string to disable G'MIC's
 # use of that library. It will fallback to exec'ing the
 # CLI tools if they happen to be installed.
-make %{?_smp_mflags} FFMPEG_CFLAGS= FFMPEG_LDFLAGS= OPT_CFLAGS="%{optflags}"
+make %{?_smp_mflags} FFMPEG_CFLAGS= FFMPEG_LDFLAGS= OPT_CFLAGS="%{optflags} -fsigned-char"
 
 %install
 iconv -f iso8859-1 -t utf-8 COPYING > COPYING.conv && mv -f COPYING.conv COPYING