Accepting request 86257 from graphics

- fix compilation of yast2-qt-graph

- disable GD plugin completely

OBS-URL: https://build.opensuse.org/request/show/86257
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=45

fix-headers.diff

@@ -0,0 +1,24 @@
+Index: graphviz-2.28.0/lib/cdt/cdt.h
+===================================================================
+--- graphviz-2.28.0.orig/lib/cdt/cdt.h	2010-04-26 20:35:08.000000000 +0200
++++ graphviz-2.28.0/lib/cdt/cdt.h	2011-10-03 15:47:24.632084472 +0200
+@@ -17,6 +17,7 @@
+ #endif
+ 
+ #include <stddef.h>	/* size_t */
++#include <string.h>
+ 
+ #ifndef _BEGIN_EXTERNS_
+ #define _BEGIN_EXTERNS_
+@@ -238,11 +239,6 @@ extern int		dtsize _ARG_((Dt_t*));
+ extern int		dtstat _ARG_((Dt_t*, Dtstat_t*, int));
+ extern unsigned int	dtstrhash _ARG_((unsigned int, Void_t*, int));
+ 
+-#if !_PACKAGE_ast
+-extern int		memcmp _ARG_((const Void_t*, const Void_t*, size_t));
+-extern int		strcmp _ARG_((const char*, const char*));
+-#endif
+-
+ #undef extern
+ _END_EXTERNS_
+ 

graphviz-plugins.spec

@@ -80,7 +80,7 @@ Patch105:       graphviz-2.18-do_not_use_ocamlopt.patch
 Patch106:       graphviz-fix-pkgIndex.patch
 Requires(pre):  coreutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Prefix:         /usr
+
 %define rb_libdir    %{_libdir}/ruby
 %define rb_sitedir   %{rb_libdir}/site_ruby/%{rb_ver}
 %define rb_vendordir %{rb_libdir}/vendor_ruby/%{rb_ver}
@@ -276,6 +276,7 @@ export CPPFLAGS="%{optflags}"
       --disable-dependency-tracking \
       --with-ipsepcola \
       --without-ming \
+      --disable-silent-rules \
       --enable-ltdl-install=no \
       --disable-io
 make DESTDIR=%{buildroot}  %{?_smp_mflags}

graphviz.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Oct  3 13:55:01 UTC 2011 - coolo@suse.com
+
+- fix compilation of yast2-qt-graph
+
+-------------------------------------------------------------------
+Mon Oct  3 11:53:27 UTC 2011 - coolo@suse.com
+
+- disable GD plugin completely
+
 -------------------------------------------------------------------
 Wed Sep 28 19:08:30 UTC 2011 - idonmez@suse.com
 

graphviz.spec

@@ -30,6 +30,7 @@ Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.
 Source2:        graphviz-rpmlintrc
 Patch1:         graphviz-gd_png_check_sig.patch
 Patch2:         graphviz-fix-pkgIndex.patch
+Patch3:         fix-headers.diff
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
@@ -55,7 +56,6 @@ Requires(pre):  /bin/rm
 Recommends:     graphviz-gd = %{version}
 Recommends:     graphviz-gnome = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Prefix:         /usr
 
 %description
 A collection of tools and tcl packages for the manipulation and layout
@@ -90,6 +90,7 @@ Note: If you need output in png format you also need to install
 %setup -q
 %patch1
 %patch2
+%patch3 -p1
 
 # Fix path in generated man pages
 sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl
@@ -110,7 +111,10 @@ export CPPFLAGS="%{optflags}"
       --enable-ltdl-install=no \
       --with-ipsepcola \
       --without-ming \
-      --disable-io
+      --disable-io \
+      --disable-silent-rules \
+      --with-mylibgd=no \
+      --with-libgd=no
 make %{?_smp_mflags} DESTDIR=%{buildroot}
 
 %install