packages (AC-branch): graphviz/graphviz.spec, graphviz/libs.patch (NEW)=?UTF-8?Q?=20?=- h...

[glen]

Author: glen                         Date: Thu Mar  1 19:45:41 2012 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- hacks to get it build with current state

---- Files affected:
packages/graphviz:
   graphviz.spec (1.63 -> 1.63.2.1) , libs.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/graphviz/graphviz.spec
diff -u packages/graphviz/graphviz.spec:1.63 packages/graphviz/graphviz.spec:1.63.2.1
--- packages/graphviz/graphviz.spec:1.63	Thu Dec 14 02:12:12 2006
+++ packages/graphviz/graphviz.spec	Thu Mar  1 20:45:36 2012
@@ -15,7 +15,7 @@
 Summary(pl):	Narzêdzie do wizualizacji w postaci grafów
 Name:		graphviz
 Version:	2.8
-Release:	7
+Release:	8
 License:	CPL v1.0
 Group:		X11/Applications/Graphics
 Source0:	http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Patch3:		%{name}-tk.patch
 Patch4:		%{name}-lua.patch
 Patch5:		%{name}-python.patch
+Patch6:		libs.patch
 URL:		http://www.graphviz.org/
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf >= 2.50
@@ -62,6 +63,11 @@
 Requires:	ghostscript-fonts-std
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		filterout_ld	-Wl,--as-needed
+
+# all bindings need -lsomething
+%define		no_install_post_check_so	1
+
 %description
 A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in barcharts).
@@ -227,6 +233,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -428,6 +435,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63.2.1  2012/03/01 19:45:36  glen
+- hacks to get it build with current state
+
 Revision 1.63  2006/12/14 01:12:12  glen
 - rel 7
 

================================================================
Index: packages/graphviz/libs.patch
diff -u /dev/null packages/graphviz/libs.patch:1.1.2.1
--- /dev/null	Thu Mar  1 20:45:41 2012
+++ packages/graphviz/libs.patch	Thu Mar  1 20:45:36 2012
@@ -0,0 +1,54 @@
+--- graphviz-2.8/lib/gvc/Makefile.am~	2005-10-18 23:58:04.000000000 +0300
++++ graphviz-2.8/lib/gvc/Makefile.am	2012-03-01 20:09:08.297321025 +0200
+@@ -35,7 +35,7 @@
+ 	$(top_builddir)/lib/common/libcommon.la \
+ 	$(top_builddir)/lib/graph/libgraph.la \
+ 	$(top_builddir)/lib/pathplan/libpathplan.la \
+-	@GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@
++	@GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ $(X_LIBS)
+ libgvc_la_LIBADD = ${libgvc_builtins_la_LIBADD}
+ 
+ EXTRA_DIST = Makefile.old dot_builtins.c
+--- graphviz-2.8/cmd/dot/Makefile.am~	2006-01-03 18:48:06.000000000 +0200
++++ graphviz-2.8/cmd/dot/Makefile.am	2012-03-01 21:20:14.453712571 +0200
+@@ -22,7 +22,7 @@
+ pdf_DATA = dot.pdf
+ 
+ dot_SOURCES = dot.c
+-dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la
++dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la -lgd
+ 
+ install-data-hook:
+ 	(cd $(DESTDIR)$(man1dir); for i in $(linkedman); do rm -f $$i; $(LN_S) dot.1 $$i; done;)
+--- graphviz-2.8/cmd/tools/Makefile.am~	2005-11-10 05:43:04.000000000 +0200
++++ graphviz-2.8/cmd/tools/Makefile.am	2012-03-01 21:21:28.378208200 +0200
+@@ -98,6 +98,7 @@
+ gvpack_SOURCES = gvpack.c gvpack_builtins.c
+ 
+ gvpack_LDADD = \
++	-lgd \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+ 	$(top_builddir)/lib/ingraphs/libingraphs.la \
+ 	$(top_builddir)/lib/plugin/libgvplugin_neato_layout.la
+--- graphviz-2.8/tclpkg/gdtclft/Makefile.am~	2005-10-19 00:05:35.000000000 +0300
++++ graphviz-2.8/tclpkg/gdtclft/Makefile.am	2012-03-01 21:24:32.478189634 +0200
+@@ -26,7 +26,7 @@
+ libgdtclft_la_SOURCES = gdtclft.c
+ libgdtclft_la_LIBADD = \
+ 	$(top_builddir)/tclpkg/tclhandle/libtclhandle.la \
+-	$(top_builddir)/tclpkg/tclstubs/libtclstubs.la @GD_LIBS@
++	$(top_builddir)/tclpkg/tclstubs/libtclstubs.la @GD_LIBS@ $(X_LIBS)
+ libgdtclft_la_LDFLAGS = -module -no-undefined
+ 
+ if WITH_TCL
+--- graphviz-2.8/contrib/diffimg/Makefile.am~	2012-03-01 21:26:30.000000000 +0200
++++ graphviz-2.8/contrib/diffimg/Makefile.am	2012-03-01 21:26:32.386688053 +0200
+@@ -8,7 +8,7 @@
+ 
+ diffimg_SOURCES = diffimg.c
+ 
+-diffimg_LDADD = @GD_LIBS@
++diffimg_LDADD = @GD_LIBS@ $(X_LIBS) -lgd
+ 
+ GRAPH = "digraph G { hello -> world }"
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/graphviz/graphviz.spec?r1=1.63&r2=1.63.2.1&f=u