[packages/ImageMagick] add agread extra parameter

glen glen at pld-linux.org
Tue Mar 19 23:37:08 CET 2013


commit d6ed4a5697eaec3b03c75960825c0163cb6d4c8c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 20 00:32:48 2013 +0200

    add agread extra parameter
    
    seems the parameter was always defined in prototype, just compiler was
    not that picky about that

 ImageMagick.spec   |  2 ++
 agread-param.patch | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index c0a020f..988229b 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -39,6 +39,7 @@ Patch1:		%{name}-link.patch
 Patch2:		%{name}-libpath.patch
 Patch3:		%{name}-ldflags.patch
 Patch4:		%{name}-lt.patch
+Patch5:		 agread-param.patch
 URL:		http://www.imagemagick.org/
 BuildRequires:	OpenEXR-devel >= 1.0.6
 BuildRequires:	autoconf >= 2.67
@@ -629,6 +630,7 @@ Moduł kodera dla plików WMF.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
 
diff --git a/agread-param.patch b/agread-param.patch
new file mode 100644
index 0000000..834fdf5
--- /dev/null
+++ b/agread-param.patch
@@ -0,0 +1,32 @@
+add agread extra parameter
+
+seems the parameter was always defined in prototype, just compiler was
+not that picky about that
+
+libtool: compile:  ccache x86_64-pld-linux-gcc -std=gnu99 -std=gnu99 -DHAVE_CONFIG_H -I. -I./config -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -fopenmp -O2 -fwrapv -pipe -Wformat -Werror=format-security -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -fPIC -march=x86-64 -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2 -Wall -pthread -MT coders/coders_dot_la-dot.lo -MD -MP -MF coders/.deps/coders_dot_la-dot.Tpo -c coders/dot.c  -fPIC -DPIC -o coders/.libs/coders_dot_la-dot.o
+coders/dot.c: In function 'ReadDOTImage':
+coders/dot.c:138:3: error: too few arguments to function 'agread'
+In file included from /usr/include/graphviz/types.h:49:0,
+                 from /usr/include/graphviz/gvc.h:17,
+                 from coders/dot.c:66:
+/usr/include/graphviz/cgraph.h:268:18: note: declared here
+make[1]: *** [coders/coders_dot_la-dot.lo] Error 1
+make[1]: Leaving directory `/home/users/glen/rpm/BUILD/x86_64-linux/ImageMagick-6.7.5-9'
+
+checked:
+- auto/ti/graphviz-2_26_3-7
+- auto/th/graphviz-2_20_3-9
+- auto/ti/graphviz-2_18-4
+- auto/ti/graphviz-2_14_1-6
+
+--- ImageMagick-6.7.9-10/coders/dot.c~	2012-08-30 14:41:56.000000000 +0300
++++ ImageMagick-6.7.9-10/coders/dot.c	2013-03-20 00:23:13.217244621 +0200
+@@ -136,7 +136,7 @@
+   (void) AcquireUniqueFilename(read_info->filename);
+   (void) FormatLocaleString(command,MaxTextExtent,"-Tsvg -o%s %s",
+     read_info->filename,image_info->filename);
+-  graph=agread(GetBlobFileHandle(image));
++  graph=agread(GetBlobFileHandle(image), (Agdisc_t *) 0);
+   if (graph == (graph_t *) NULL)
+     return ((Image *) NULL);
+   option=GetImageOption(image_info,"dot:layout-engine");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/d6ed4a5697eaec3b03c75960825c0163cb6d4c8c



More information about the pld-cvs-commit mailing list