CVS commit: pkgsrc/graphics/graphviz

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec  2 16:02:30 UTC 2024

Modified Files:
        pkgsrc/graphics/graphviz: distinfo
Added Files:
        pkgsrc/graphics/graphviz/patches: patch-lib_gvpr_actions.c
            patch-lib_gvpr_compile.h

Log Message:
graphviz: Avoid lock_t.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/graphics/graphviz/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/graphviz/patches/patch-lib_gvpr_actions.c \
    pkgsrc/graphics/graphviz/patches/patch-lib_gvpr_compile.h

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

Modified files:

Index: pkgsrc/graphics/graphviz/distinfo
diff -u pkgsrc/graphics/graphviz/distinfo:1.88 pkgsrc/graphics/graphviz/distinfo:1.89
--- pkgsrc/graphics/graphviz/distinfo:1.88      Mon Nov 18 13:59:28 2024
+++ pkgsrc/graphics/graphviz/distinfo   Mon Dec  2 16:02:30 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.88 2024/11/18 13:59:28 micha Exp $
+$NetBSD: distinfo,v 1.89 2024/12/02 16:02:30 jperkin Exp $
 
 BLAKE2s (graphviz-12.2.0.tar.gz) = e7ab7167a5af792de92dd33048a4a2b8b366a6850b4a7a7ce831151b31e8af16
 SHA512 (graphviz-12.2.0.tar.gz) = d7c73aca3ccbce0327f48c58fa54b76be84140fc8ab99b91eb595b917f1ff89172aa868705df2d1bd50dc75328be824455cd9f6cf079dbb1269c40af9966d418
@@ -6,4 +6,6 @@ Size (graphviz-12.2.0.tar.gz) = 26813735
 SHA1 (patch-config_config__perl.pl) = 430acb7d7ee3e149de0af9832c5a29602884f83e
 SHA1 (patch-configure.ac) = dcb9fd2822d3eb5dddcda5a55746d51114f92d06
 SHA1 (patch-lib_gvc_Makefile.am) = 8a25c16a31923fc42138773f308f3b3fc5ee662b
+SHA1 (patch-lib_gvpr_actions.c) = d82023aa576ed4404e3a123ee063d58228ec2ea6
+SHA1 (patch-lib_gvpr_compile.h) = 5cf479c021783f74fc7e886faf1c0cf5b8e721de
 SHA1 (patch-plugin_gs_gvloadimage__gs.c) = 982ac1db252e3224633069db956c5dc803cd5ea9

Added files:

Index: pkgsrc/graphics/graphviz/patches/patch-lib_gvpr_actions.c
diff -u /dev/null pkgsrc/graphics/graphviz/patches/patch-lib_gvpr_actions.c:1.1
--- /dev/null   Mon Dec  2 16:02:30 2024
+++ pkgsrc/graphics/graphviz/patches/patch-lib_gvpr_actions.c   Mon Dec  2 16:02:30 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_gvpr_actions.c,v 1.1 2024/12/02 16:02:30 jperkin Exp $
+
+Avoid lock_t.
+
+--- lib/gvpr/actions.c.orig    2024-12-02 15:59:23.387253475 +0000
++++ lib/gvpr/actions.c
+@@ -502,7 +502,7 @@ int lockGraph(Agraph_t *g, int v) {
+     if (data->lock.zombie)
+       agclose(g);
+     else
+-      data->lock = (lock_t){0};
++      data->lock = (gvprlock_t){0};
+   }
+   return oldv;
+ }
Index: pkgsrc/graphics/graphviz/patches/patch-lib_gvpr_compile.h
diff -u /dev/null pkgsrc/graphics/graphviz/patches/patch-lib_gvpr_compile.h:1.1
--- /dev/null   Mon Dec  2 16:02:30 2024
+++ pkgsrc/graphics/graphviz/patches/patch-lib_gvpr_compile.h   Mon Dec  2 16:02:30 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-lib_gvpr_compile.h,v 1.1 2024/12/02 16:02:30 jperkin Exp $
+
+Avoid lock_t.
+
+--- lib/gvpr/compile.h.orig    2024-12-02 15:58:56.601986844 +0000
++++ lib/gvpr/compile.h
+@@ -38,11 +38,11 @@ extern "C" {
+ typedef struct {
+   bool locked: 1; ///< is the lock currently taken?
+   bool zombie: 1; ///< was a deletion request recorded while locked?
+-} lock_t;
++} gvprlock_t;
+ 
+     typedef struct {
+       Agrec_t h;
+-      lock_t lock;
++      gvprlock_t lock;
+     } gval_t;
+ 
+     typedef struct {