OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Aug-2007 13:21:43
Branch: HEAD Handle: 2007082912214300
Modified files:
openpkg-src/graphviz graphviz.patch graphviz.spec
Log:
fix building without pango (and its cairo backend), disable building
against pango by default and allow one to use 'with_pango' to build
against pango again
Summary:
Revision Changes Path
1.11 +57 -0 openpkg-src/graphviz/graphviz.patch
1.73 +14 -4 openpkg-src/graphviz/graphviz.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/graphviz/graphviz.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 graphviz.patch
--- openpkg-src/graphviz/graphviz.patch 3 Aug 2007 17:54:28 -0000
1.10
+++ openpkg-src/graphviz/graphviz.patch 29 Aug 2007 11:21:43 -0000
1.11
@@ -50,3 +50,60 @@
#if defined(HAVE_LIBGD) && defined(HAVE_LIBFREETYPE) &&
defined(HAVE_GD_FREETYPE)
/* fontsize at which text is omitted entirely */
+Index: cmd/dot/Makefile.am
+--- cmd/dot/Makefile.am 2007/08/28 12:28:57 1.1
++++ cmd/dot/Makefile.am 2007/08/28 13:08:51
+@@ -96,6 +96,7 @@
+ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@
@PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@
@IPSEPCOLA_LIBS@ @MATH_LIBS@
+ endif
+ else
++if WITH_PANGOCAIRO
+ dot_static_LDADD = \
+ $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
+ $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
+@@ -107,6 +108,18 @@
+ $(top_builddir)/lib/graph/libgraph_C.la \
+ $(top_builddir)/lib/cdt/libcdt_C.la \
+ @GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@
@JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@
@SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
++else
++dot_static_LDADD = \
++ $(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
++ $(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
++ $(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
++ $(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
++ $(top_builddir)/lib/gvc/libgvc_C.la \
++ $(top_builddir)/lib/pathplan/libpathplan_C.la \
++ $(top_builddir)/lib/graph/libgraph_C.la \
++ $(top_builddir)/lib/cdt/libcdt_C.la \
++ @GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@
@JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@
@SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
++endif
+ endif
+
+ dot_builtins_SOURCES =3D dot.c $(top_srcdir)/lib/gvc/dot_builtins.c
$(top_srcdir)/lib/gvc/no_demand_loading.c
+@@ -138,6 +151,7 @@
+ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@
@PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@
@IPSEPCOLA_LIBS@ @MATH_LIBS@
+ endif
+ else
++if WITH_PANGOCAIRO
+ dot_builtins_LDADD = \
+ $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
+ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
+@@ -149,6 +163,18 @@
+ $(top_builddir)/lib/graph/libgraph.la \
+ $(top_builddir)/lib/cdt/libcdt.la \
+ @GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@
@JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@
@SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
++else
++dot_builtins_LDADD = \
++ $(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
++ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
++ $(top_builddir)/plugin/core/libgvplugin_core.la \
++ $(top_builddir)/plugin/gd/libgvplugin_gd.la \
++ $(top_builddir)/lib/gvc/libgvc_builtins.la \
++ $(top_builddir)/lib/pathplan/libpathplan.la \
++ $(top_builddir)/lib/graph/libgraph.la \
++ $(top_builddir)/lib/cdt/libcdt.la \
++ @GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@
@JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@
@SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
++endif
+ endif
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/graphviz/graphviz.spec
============================================================================
$ cvs diff -u -r1.72 -r1.73 graphviz.spec
--- openpkg-src/graphviz/graphviz.spec 16 Aug 2007 15:22:40 -0000
1.72
+++ openpkg-src/graphviz/graphviz.spec 29 Aug 2007 11:21:43 -0000
1.73
@@ -38,11 +38,12 @@
Group: Diagram
License: GPL
Version: %{V_graphviz}
-Release: 20070816
+Release: 20070829
# package options
%option with_x11 no
%option with_perl no
+%option with_pango no
# list of sources
Source0:
http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-%{V_graphviz}.tar.gz
@@ -53,10 +54,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, flex, bison
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, flex, bison,
autoconf, automake
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: freetype, png, jpeg, gd
-PreReq: freetype, png, jpeg, gd
+BuildPreReq: freetype, png, zlib, jpeg, gd
+PreReq: freetype, png, zlib, jpeg, gd
%if "%{with_x11}" == "yes"
BuildPreReq: X11, fontconfig
PreReq: X11, fontconfig
@@ -65,6 +66,10 @@
BuildPreReq: perl, perl-sys, perl-openpkg
PreReq: perl, perl-sys
%endif
+%if "%{with_pango}" == "yes"
+BuildPreReq: pango, cairo
+PreReq: pango, cairo
+%endif
AutoReq: no
AutoReqProv: no
@@ -145,6 +150,11 @@
%else
--without-x \
%endif
+%if "%{with_pango}" == "yes"
+ --with-pangocairo \
+%else
+ --without-pangocairo \
+%endif
--disable-shared \
--enable-static
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
