CVS commit: pkgsrc/net/gtk-gnutella

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Sep 18 20:04:31 UTC 2022

Modified Files:
        pkgsrc/net/gtk-gnutella: distinfo
Added Files:
        pkgsrc/net/gtk-gnutella/patches: patch-src_lib_memusage.c

Log Message:
net/gtk-gnutella: avoid naming collision on NetBSD/powerpc.

Avoid collision with powerpc/frame.h's struct callframe.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/gtk-gnutella/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/gtk-gnutella/patches/patch-src_lib_memusage.c

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

Modified files:

Index: pkgsrc/net/gtk-gnutella/distinfo
diff -u pkgsrc/net/gtk-gnutella/distinfo:1.34 pkgsrc/net/gtk-gnutella/distinfo:1.35
--- pkgsrc/net/gtk-gnutella/distinfo:1.34       Tue Oct 26 11:05:42 2021
+++ pkgsrc/net/gtk-gnutella/distinfo    Sun Sep 18 20:04:30 2022
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.34 2021/10/26 11:05:42 nia Exp $
+$NetBSD: distinfo,v 1.35 2022/09/18 20:04:30 he Exp $
 
 BLAKE2s (gtk-gnutella-1.1.11.tar.bz2) = c8df89d48086fdcdab21c7e2f8a87fe27c51ca10f6dbbd612bc14cdf02a3acb3
 SHA512 (gtk-gnutella-1.1.11.tar.bz2) = 87d2d66b555180c0db7c360106377133b9e1f8ad8d28fc0f9a38498f3b4502a817650f9683cf92919b7d3a1b3602f7136143d2f1c920e10727576c703e233d07
 Size (gtk-gnutella-1.1.11.tar.bz2) = 19966423 bytes
 SHA1 (patch-Configure) = 926736a79a7bc469810f4887b5d0cecfedbac201
 SHA1 (patch-config__h.SH) = 2ed9d100cc044e10f2633a614cfc4100edc4cc02
+SHA1 (patch-src_lib_memusage.c) = db65ae1b7d43326f8b8eacdc95705deba0a94b5d
 SHA1 (patch-src_lib_pow2.h) = f8a36d58f84ef782535e363df6144bbfc766013e

Added files:

Index: pkgsrc/net/gtk-gnutella/patches/patch-src_lib_memusage.c
diff -u /dev/null pkgsrc/net/gtk-gnutella/patches/patch-src_lib_memusage.c:1.1
--- /dev/null   Sun Sep 18 20:04:31 2022
+++ pkgsrc/net/gtk-gnutella/patches/patch-src_lib_memusage.c    Sun Sep 18 20:04:30 2022
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_lib_memusage.c,v 1.1 2022/09/18 20:04:30 he Exp $
+
+Avoid naming collision with powerpc/frame.h definition of callframe.
+
+--- src/lib/memusage.c.orig    2016-11-11 14:33:11.000000000 +0000
++++ src/lib/memusage.c
+@@ -535,11 +535,12 @@ memusage_set_stack_accounting(memusage_t
+       MEMUSAGE_THREAD_UNLOCK(mu);
+ }
+ 
+-struct callframe {
++struct my_callframe {
+       size_t calls;
+       const struct stackatom *frame;
+       const struct memusage_counter *mc;
+ };
++#define callframe my_callframe
+ 
+ /**
+  * qsort() callback for sorting callframe items by decreasing call amount.