Graphviz in CURRENT configures pango and cairo by default. Since this
dependency is not listed in the specfile, I assume new behaviour.

For now, don't use pango or cairo at all. A with_pango package option
should probably be added eventually.

The build script for cmd/dot needs to take into account that pango might
be disabled even when using the external libgd.

Suggested patches:

--- graphviz.spec       2007/08/28 10:58:26     1.1
+++ graphviz.spec       2007/08/28 13:59:03     1.3
@@ -38,7 +38,7 @@
 Group:        Diagram
 License:      GPL
 Version:      %{V_graphviz}
-Release:      20070816
+Release:      20070828

 #   package options
 %option       with_x11   no
@@ -55,8 +55,8 @@
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc, make, flex, bison
 PreReq:       OpenPKG, openpkg >= 20040130
-BuildPreReq:  freetype, png, jpeg, gd
-PreReq:       freetype, png, jpeg, gd
+BuildPreReq:  freetype, png, jpeg, gd, zlib
+PreReq:       freetype, png, jpeg, gd, zlib
 %if "%{with_x11}" == "yes"
 BuildPreReq:  X11, fontconfig
 PreReq:       X11, fontconfig
@@ -145,6 +145,7 @@
 %else
         --without-x \
 %endif
+        --without-pangocairo \
         --disable-shared \
         --enable-static


--- graphviz.patch      2007/08/28 13:10:06     1.1
+++ graphviz.patch      2007/08/28 13:51:11     1.3
@@ -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 = 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
+
+

-- 
Michael Diers | Software Developer | http://www.elego.de/

______________________________________________________________________
OpenPKG                                             http://openpkg.org
User Communication List                      openpkg-users@openpkg.org

Reply via email to