diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2023-11-26 19:30:31 +0100 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2023-11-26 19:30:31 +0100 |
| commit | eea76fa4fa45ae161cebb6375831d30e46bc6bd7 (patch) | |
| tree | 2366ea3c9e94388ad0284370169aef62ae81a437 /graphics/graphviz/files | |
| parent | devel/libnotify: fix build with lld 17 (take 2) (diff) | |
graphics/graphviz: update to 9.0.0
Diffstat (limited to 'graphics/graphviz/files')
| -rw-r--r-- | graphics/graphviz/files/patch-configure.ac | 18 | ||||
| -rw-r--r-- | graphics/graphviz/files/patch-lib_gvpr_actions.c | 11 | ||||
| -rw-r--r-- | graphics/graphviz/files/patch-lib_gvpr_compile.c | 11 |
3 files changed, 31 insertions, 9 deletions
diff --git a/graphics/graphviz/files/patch-configure.ac b/graphics/graphviz/files/patch-configure.ac index 44edaea55b2a..7445520a6126 100644 --- a/graphics/graphviz/files/patch-configure.ac +++ b/graphics/graphviz/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2023-07-07 07:42:32 UTC +--- configure.ac.orig 2023-09-11 18:30:03 UTC +++ configure.ac -@@ -634,7 +634,7 @@ else +@@ -620,7 +620,7 @@ else if test "x$GUILE_CONFIG" = "x"; then use_guile="No (guile not available)" else @@ -9,12 +9,12 @@ GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1` GUILE_VERSION_MINOR=`echo $GUILE_VERSION | cut -d '.' -f 2` AC_CHECK_PROGS(GUILE,guile$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR guile$GUILE_VERSION_MAJOR guile) -@@ -814,16 +814,16 @@ else +@@ -800,16 +800,16 @@ else if test "x$PKG_CONFIG" != "x"; then AC_MSG_CHECKING(for Lua headers and libraries with pkg-config) echo -- for l in "$lua_suffix" "" "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" ; do -+ for l in "$lua_suffix" "" "54" "-5.4" "53" "-5.3" "52" "-5.2" "51" "5.1" "50" "5.0" ; do +- for l in "$lua_suffix" "" "53" "5.3" "52" "5.2" "51" "5.1" ; do ++ for l in "$lua_suffix" "" "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" ; do pkgconfig_lua_found=`$PKG_CONFIG --exists lua$l 2>/dev/null` if test "x$?" = "x0" ; then - LUA_INCLUDES="$LUA_CFLAGS "`$PKG_CONFIG --cflags lua$l` @@ -29,11 +29,11 @@ LUA_LIBS="$LUA_LFLAGS "`$PKG_CONFIG --libs lualib$l` fi break -@@ -1187,6 +1187,7 @@ else +@@ -1173,6 +1173,7 @@ else use_ruby="No (ruby not available)" else RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`" + RUBY_CFLAGS="${RUBY_CFLAGS} -I`$RUBY $srcdir/config/config_ruby.rb inc`" - # hack for powerpc-darwin8 (10.4) - if test "x$DARWIN" = "xyes"; then - RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'` + RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]\"`" + RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`" + if test "x$RUBY_INSTALL_DIR" = "x"; then diff --git a/graphics/graphviz/files/patch-lib_gvpr_actions.c b/graphics/graphviz/files/patch-lib_gvpr_actions.c new file mode 100644 index 000000000000..a8ead9200f98 --- /dev/null +++ b/graphics/graphviz/files/patch-lib_gvpr_actions.c @@ -0,0 +1,11 @@ +--- lib/gvpr/actions.c.orig 2023-09-11 18:30:04 UTC ++++ lib/gvpr/actions.c +@@ -33,7 +33,7 @@ + #define KINDS(p) ((AGTYPE(p) == AGRAPH) ? "graph" : (AGTYPE(p) == AGNODE) ? "node" : "edge") + + static int iofread(void *chan, char *buf, int bufsize) { +- return (int)read(fileno(chan), buf, bufsize); ++ return (int)read(fileno((FILE *)chan), buf, bufsize); + } + + static int ioputstr(void *chan, const char *str) { diff --git a/graphics/graphviz/files/patch-lib_gvpr_compile.c b/graphics/graphviz/files/patch-lib_gvpr_compile.c new file mode 100644 index 000000000000..24aa574db381 --- /dev/null +++ b/graphics/graphviz/files/patch-lib_gvpr_compile.c @@ -0,0 +1,11 @@ +--- lib/gvpr/compile.c.orig 2023-09-11 18:30:04 UTC ++++ lib/gvpr/compile.c +@@ -56,7 +56,7 @@ static Sflong_t ptr2int(const void *p) { + + static int iofread(void *chan, char *buf, int bufsize) + { +- return (int)read(fileno(chan), buf, bufsize); ++ return (int)read(fileno((FILE *)chan), buf, bufsize); + } + + static int ioputstr(void *chan, const char *str) |