[pkg-virtuoso] 02/07: New patch: 17-fix-imagemagick-detection.patch (Closes: #758459) Thanks to bastien ROUCARIES

[Maximiliano Curia]

This is an automated email from the git hooks/post-receive script.

maxy pushed a commit to branch master
in repository pkg-virtuoso.

commit 5358a253b6195c2c1225ec7390233acec3f8f405
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Sep 10 18:36:07 2014 +0200

    New patch: 17-fix-imagemagick-detection.patch (Closes: #758459) Thanks to bastien ROUCARIES
---
 debian/changelog                                  |  3 +-
 debian/patches/17-fix-imagemagick-detection.patch | 91 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index edfcea9..61531a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 virtuoso-opensource (6.1.6+dfsg-5~) UNRELEASED; urgency=medium
 
-  * 
+  * New patch: 17-fix-imagemagick-detection.patch (Closes: #758459)
+    Thanks to bastien ROUCARIES
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 10 Sep 2014 18:32:02 +0200
 
diff --git a/debian/patches/17-fix-imagemagick-detection.patch b/debian/patches/17-fix-imagemagick-detection.patch
new file mode 100644
index 0000000..6e816b7
--- /dev/null
+++ b/debian/patches/17-fix-imagemagick-detection.patch
@@ -0,0 +1,91 @@
+Index: virtuoso-opensource-6.1.6+dfsg/binsrc/samples/image_magick/Makefile.am
+===================================================================
+--- virtuoso-opensource-6.1.6+dfsg.orig/binsrc/samples/image_magick/Makefile.am
++++ virtuoso-opensource-6.1.6+dfsg/binsrc/samples/image_magick/Makefile.am
+@@ -35,10 +35,10 @@ im_la_CFLAGS  += -I$(top_srcdir)/libsrc/
+ im_la_CFLAGS  += -I$(top_srcdir)/libsrc/plugin 
+ im_la_CFLAGS  += -I$(top_srcdir)/libsrc/langfunc 
+ im_la_CFLAGS  += @ZLIB_INC@
+-im_la_CFLAGS  += $(IM_CPPFLAGS)
++im_la_CFLAGS  += $(IM_CFLAGS)
+ im_la_CFLAGS  += -D_GNU_SOURCE -DGLOBALREF=extern -D_USRDLL
+ im_la_LDFLAGS = -module -avoid-version -export-dynamic -export-symbols im.exp -no-undefined
+-im_la_LIBADD  = $(IM_LDFLAGS) $(IM_LIBS)
++im_la_LIBADD  = $(IM_LIBS)
+ 
+ # ----------------------------------------------------------------------
+ #
+Index: virtuoso-opensource-6.1.6+dfsg/configure.in
+===================================================================
+--- virtuoso-opensource-6.1.6+dfsg.orig/configure.in
++++ virtuoso-opensource-6.1.6+dfsg/configure.in
+@@ -1314,64 +1314,16 @@ AC_HELP_STRING([--disable-imagemagick],
+ 
+ if test "x$with_im" != "xno"
+ then
+-    AC_PATH_PROG(IM_CONFIG, Wand-config, notfound, ["$with_im/bin:$PATH"])
+-
+-    if test "x$IM_CONFIG" = "xnotfound"
+-    then
+-       AC_MSG_WARN([The ImageMagick plugin will not be build])
+-       with_im=no
+-    fi
++    PKG_CHECK_MODULES(IM,MagickWand,[with_im="yes"],[dnl
++	with_im="no";dnl
++	AC_MSG_WARN([The ImageMagick plugin will not be build])dnl
++	])
+ fi
+ 
+-if test "x$with_im" != "xno"
+-then
+-    AC_MSG_CHECKING([ImageMagick library usability])
+-
+-    save_CPPFLAGS="$CPPFLAGS"
+-    save_LIBS="$LIBS"
+-    save_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
+-
+-    IM_CPPFLAGS=`"$IM_CONFIG" --cppflags`
+-    IM_LDFLAGS=`"$IM_CONFIG" --ldflags`
+-    IM_LIBS=`"$IM_CONFIG" --libs`
+-
+-    CPPFLAGS="$CPPFLAGS $IM_CPPFLAGS"
+-    LIBS="$LIBS $IM_LDFLAGS $IM_LIBS"
+-
+-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_im/lib"
+-    export LD_LIBRARY_PATH
+-
+-    AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <time.h>
+-#include <wand/magick-wand.h>
+-MagickWand *magick_wand;
+-int
+-main ()
+-{
+-  MagickWandGenesis();
+-  return 0;
+-}],
+-[
+-  AC_MSG_RESULT(good)
+-],
+-[
+-  AC_MSG_RESULT([bad. Check config.log for details])
+-  with_im="no"
+-  AC_MSG_WARN([The ImageMagick plugin will not be build])
+-])
+-
+-    LIBS="$save_LIBS"
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH"
+-fi
+ 
+ AM_CONDITIONAL(WITH_IM, test "x$with_im" != "xno" )
+-AC_SUBST(IM_CPPFLAGS)
+-AC_SUBST(IM_LDFLAGS)
+ AC_SUBST(IM_LIBS)
++AC_SUBST(IM_CFLAGS)
+ 
+ 
+ ##########################################################################
diff --git a/debian/patches/series b/debian/patches/series
index 0a1ebdf..378c4dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ disable-full-test-suite.patch
 check_log_fix.patch
 do_not_depend_on_MAXPATHLEN.patch
 safer-timeout.patch
+17-fix-imagemagick-detection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtuoso/pkg-virtuoso.git