--- graphviz-2.24.0/configure.orig 2010-01-26 08:01:10.000000000 -0800 +++ graphviz-2.24.0/configure 2011-07-25 16:27:43.000000000 -0700 @@ -22518,6 +22523,9 @@ +# AC_LIBLTDL_CONVENIENCE is clobbering the override to use installed ltdl +if false +then case $enable_ltdl_convenience in no) { { $as_echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5 $as_echo "$as_me: error: this package needs a convenience libltdl" >&2;} @@ -22528,6 +22536,7 @@ LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la" LTDLDEPS=$LIBLTDL LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" +fi --- graphviz-2.24.0/plugin/quartz/gvplugin_quartz.h.orig 2009-12-11 16:19:44.000000000 -0800 +++ graphviz-2.24.0/plugin/quartz/gvplugin_quartz.h 2009-12-11 16:20:20.000000000 -0800 @@ -17,7 +17,10 @@ #ifndef GVPLUGIN_QUARTZ_H #define GVPLUGIN_QUARTZ_H -#include +#include +#include +#include +#include #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) #include --- graphviz-2.26.3/plugin/quartz/gvplugin_quartz.c.orig 2009-12-11 16:19:44.000000000 -0800 +++ graphviz-2.26.3/plugin/quartz/gvplugin_quartz.c 2009-12-11 16:20:20.000000000 -0800 @@ -29,6 +29,7 @@ /* Uniform Type Identifiers corresponding to each format_type */ CFStringRef format_uti [] = { NULL, + NULL, CFSTR("com.microsoft.bmp"), CFSTR("com.ilm.openexr-image"), CFSTR("com.compuserve.gif"), --- graphviz-2.24.0/plugin/quartz/gvloadimage_quartz.c.orig 2009-12-11 16:48:18.000000000 -0800 +++ graphviz-2.24.0/plugin/quartz/gvloadimage_quartz.c 2009-12-11 16:48:44.000000000 -0800 @@ -22,6 +22,10 @@ #include #include +#include +#include +#include + #include "gvplugin_loadimage.h" #include "gvplugin_quartz.h" --- graphviz-2.24.0/plugin/quartz/gvrender_quartz.c.orig 2009-12-11 16:50:12.000000000 -0800 +++ graphviz-2.24.0/plugin/quartz/gvrender_quartz.c 2009-12-11 16:51:29.000000000 -0800 @@ -21,12 +21,20 @@ #include #include +#include +#include + #include "gvplugin_device.h" #include "gvplugin_render.h" #include "graph.h" #include "gvplugin_quartz.h" +#ifndef CGFLOAT_DEFINED +/* nowhere defined, for Carbon Emacs the same work-around */ +typedef float CGFloat; +#endif + static CGFloat dashed[] = {6.0}; static CGFloat dotted[] = {2.0, 6.0}; --- graphviz-2.24.0/lib/gvc/gvcext.h.orig 2011-07-25 17:05:11.000000000 -0700 +++ graphviz-2.24.0/lib/gvc/gvcext.h 2011-07-25 17:09:51.000000000 -0700 @@ -19,6 +19,8 @@ #ifndef GVCEXT_H #define GVCEXT_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -58,10 +60,14 @@ typedef struct GVJ_s GVJ_t; typedef struct GVC_s GVC_t; +#if 0 typedef struct { const char *name; void* address; } lt_symlist_t; +#else + typedef const lt_dlsymlist lt_symlist_t; // libtool2's ltdl.h +#endif typedef struct gvplugin_available_s gvplugin_available_t; --- graphviz-2.28.0.old/tclpkg/gv/Makefile.am 2011-03-28 19:15:56.000000000 +0100 +++ graphviz-2.28.0/tclpkg/gv/Makefile.am 2012-06-09 16:37:52.421455627 +0100 @@ -111,6 +111,8 @@ gv.ml gv.mli: gv_ocaml.cpp gv_ocaml.cpp: gv.i $(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i + sed '/caml_array_length/d' < gv_ocaml.cpp > gv_ocaml.cpp. + mv gv_ocaml.cpp. gv_ocaml.cpp swig.mli: $(SWIG) -ocaml -co swig.mli swig.ml: --- graphviz-2.28.0.old/tclpkg/gv/Makefile.in 2011-05-07 04:27:54.000000000 +0100 +++ graphviz-2.28.0/tclpkg/gv/Makefile.in 2012-06-09 16:40:11.215092361 +0100 @@ -3362,6 +3362,8 @@ gv.ml gv.mli: gv_ocaml.cpp gv_ocaml.cpp: gv.i $(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i + sed '/caml_array_length/d' < gv_ocaml.cpp > gv_ocaml.cpp. + mv gv_ocaml.cpp. gv_ocaml.cpp swig.mli: $(SWIG) -ocaml -co swig.mli swig.ml: --- graphviz-2.28.0/configure.orig 2013-07-27 10:36:46.000000000 -0400 +++ graphviz-2.28.0/configure 2013-07-27 10:37:06.000000000 -0400 @@ -21925,7 +21925,7 @@ RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'` fi RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG['LIBRUBYARG_SHARED']\"`" - RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`" + RUBY_INSTALL_DIR="@FINKPREFIX@/lib/graphviz/ruby" save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES" ac_fn_c_check_header_mongrel "$LINENO" "ruby.h" "ac_cv_header_ruby_h" "$ac_includes_default"