pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

graphviz: Fix build for NetBSD



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Oct 13 13:27:42 2023 +0200
Changeset:	8f3d8bbf2b6d87503d3d898ac13dfc0c318ca9ea

Modified Files:
	graphviz/PLIST
	graphviz/distinfo
Added Files:
	graphviz/patches/patch-lib_gvpr_actions.c
	graphviz/patches/patch-lib_gvpr_compile.c

Log Message:
graphviz: Fix build for NetBSD

- Fix PLIST
- Add patches for upstream commit 8ce6b211ce7b9ebad3e30fa909effebf59955a93

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8f3d8bbf2b6d87503d3d898ac13dfc0c318ca9ea

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 graphviz/PLIST                            |  3 ++-
 graphviz/distinfo                         |  2 ++
 graphviz/patches/patch-lib_gvpr_actions.c | 18 ++++++++++++++++++
 graphviz/patches/patch-lib_gvpr_compile.c | 18 ++++++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)

diffs:
diff --git a/graphviz/PLIST b/graphviz/PLIST
index 37193cd609..1cd839dcd9 100644
--- a/graphviz/PLIST
+++ b/graphviz/PLIST
@@ -69,12 +69,13 @@ ${PLIST.gd}lib/graphviz/libgvplugin_gd.la
 ${PLIST.gtk}lib/graphviz/libgvplugin_gdk.la
 ${PLIST.ghostscript}${PLIST.x11}lib/graphviz/libgvplugin_gs.la
 ${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
+lib/graphviz/libgvplugin_kitty.la
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_pango.la
 ${PLIST.poppler}lib/graphviz/libgvplugin_poppler.la
 ${PLIST.quartz}lib/graphviz/libgvplugin_quartz.la
 ${PLIST.svg}lib/graphviz/libgvplugin_rsvg.la
-lib/graphviz/libgvplugin_vt100.la
+lib/graphviz/libgvplugin_vt.la
 lib/graphviz/libgvplugin_webp.la
 ${PLIST.x11}lib/graphviz/libgvplugin_xlib.la
 ${PLIST.lua}lib/graphviz/lua/libgv_lua.la
diff --git a/graphviz/distinfo b/graphviz/distinfo
index 1b1805ac49..ff70af210f 100644
--- a/graphviz/distinfo
+++ b/graphviz/distinfo
@@ -6,5 +6,7 @@ Size (graphviz-9.0.0.tar.xz) = 21412796 bytes
 SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
 SHA1 (patch-configure.ac) = 80e303d6a9b95c5bb732677a0f1f63d209b39856
 SHA1 (patch-lib_gvc_Makefile.am) = 180b45f810e5bb3948509d50b5be3b159b38a78f
+SHA1 (patch-lib_gvpr_actions.c) = 5307d2c543127e4d90330699be65b529ed34bdf1
+SHA1 (patch-lib_gvpr_compile.c) = 497909cf6819052319cf7e77f92666227c4b821d
 SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9
 SHA1 (patch-plugin_xlib_gvdevice__xlib.c) = 05d1549db3b9221f5bcb947173034775b0df7c6c
diff --git a/graphviz/patches/patch-lib_gvpr_actions.c b/graphviz/patches/patch-lib_gvpr_actions.c
new file mode 100644
index 0000000000..fffe8bf0a0
--- /dev/null
+++ b/graphviz/patches/patch-lib_gvpr_actions.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Workaround for upstream commit 8ce6b211ce7b9ebad3e30fa909effebf59955a93 .
+At least with NetBSD stdio fileno() does not accept (void *) type for parameter.
+
+--- lib/gvpr/actions.c.orig	2023-09-11 18:30:04.000000000 +0000
++++ lib/gvpr/actions.c
+@@ -33,7 +33,9 @@
+ #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);
++  FILE *fp = chan;
++
++  return (int)read(fileno(fp), buf, bufsize);
+ }
+ 
+ static int ioputstr(void *chan, const char *str) {
diff --git a/graphviz/patches/patch-lib_gvpr_compile.c b/graphviz/patches/patch-lib_gvpr_compile.c
new file mode 100644
index 0000000000..364cffb7d5
--- /dev/null
+++ b/graphviz/patches/patch-lib_gvpr_compile.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Workaround for upstream commit 8ce6b211ce7b9ebad3e30fa909effebf59955a93 .
+At least with NetBSD stdio fileno() does not accept (void *) type for parameter.
+
+--- lib/gvpr/compile.c.orig	2023-09-11 18:30:04.000000000 +0000
++++ lib/gvpr/compile.c
+@@ -56,7 +56,9 @@ static Sflong_t ptr2int(const void *p) {
+ 
+ static int iofread(void *chan, char *buf, int bufsize)
+ {
+-  return (int)read(fileno(chan), buf, bufsize);
++  FILE *fp = chan;
++
++  return (int)read(fileno(fp), buf, bufsize);
+ }
+ 
+ static int ioputstr(void *chan, const char *str)


Home | Main Index | Thread Index | Old Index