[packages/virtuoso] - fix ImageMagick 7 paths, still does not build
baggins
baggins at pld-linux.org
Wed Dec 21 09:21:58 CET 2016
commit a70eceec85f0ec1f5c6b4adfea4a0be31c4d0100
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Dec 21 09:21:38 2016 +0100
- fix ImageMagick 7 paths, still does not build
imagemagick7.patch | 31 +++++++++++++++++++++++++++++++
virtuoso.spec | 2 ++
2 files changed, 33 insertions(+)
---
diff --git a/virtuoso.spec b/virtuoso.spec
index 03ff873..5ad461a 100644
--- a/virtuoso.spec
+++ b/virtuoso.spec
@@ -17,6 +17,7 @@ Group: Applications
Source0: http://downloads.sourceforge.net/virtuoso/%{name}-opensource-%{version}.tar.gz
# Source0-md5: e4cb5500fae5a41209f9f00074cbff87
Patch0: libwbxml.patch
+Patch1: imagemagick7.patch
URL: http://virtuoso.openlinksw.com/
BuildRequires: ImageMagick-devel
BuildRequires: autoconf
@@ -111,6 +112,7 @@ Virtuoso documentation.
%prep
%setup -q -n %{name}-opensource-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
diff --git a/imagemagick7.patch b/imagemagick7.patch
new file mode 100644
index 0000000..7f20f21
--- /dev/null
+++ b/imagemagick7.patch
@@ -0,0 +1,31 @@
+--- virtuoso-opensource-7.2.1/configure.in.orig 2016-12-21 09:10:29.000000000 +0100
++++ virtuoso-opensource-7.2.1/configure.in 2016-12-21 09:18:19.783118520 +0100
+@@ -1335,7 +1335,7 @@
+
+ if test "x$with_im" != "xno"
+ then
+- AC_PATH_PROG(IM_CONFIG, Wand-config, notfound, ["$with_im/bin:$PATH"])
++ AC_PATH_PROG(IM_CONFIG, MagickWand-config, notfound, ["$with_im/bin:$PATH"])
+
+ if test "x$IM_CONFIG" = "xnotfound"
+ then
+@@ -1367,7 +1367,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ MagickWand *magick_wand;
+ int
+ main ()
+--- virtuoso-opensource-7.2.1/binsrc/samples/image_magick/im.c~ 2015-03-12 03:09:01.000000000 +0100
++++ virtuoso-opensource-7.2.1/binsrc/samples/image_magick/im.c 2016-12-21 09:20:43.071615860 +0100
+@@ -37,7 +37,7 @@
+ #include <string.h>
+ #include <time.h>
+
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+
+ #define IM_VERSION "0.6"
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/virtuoso.git/commitdiff/a70eceec85f0ec1f5c6b4adfea4a0be31c4d0100
More information about the pld-cvs-commit
mailing list