CVS commit: pkgsrc/misc/gkrellsun

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Aug 23 06:29:54 UTC 2023

Modified Files:
        pkgsrc/misc/gkrellsun: distinfo
        pkgsrc/misc/gkrellsun/patches: patch-src20_gkrellsun.c
Added Files:
        pkgsrc/misc/gkrellsun/patches: patch-Makefile

Log Message:
misc/gkrellsun: Fix a build breakage with glib2-2.76


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/gkrellsun/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/gkrellsun/patches/patch-Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c

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

Modified files:

Index: pkgsrc/misc/gkrellsun/distinfo
diff -u pkgsrc/misc/gkrellsun/distinfo:1.2 pkgsrc/misc/gkrellsun/distinfo:1.3
--- pkgsrc/misc/gkrellsun/distinfo:1.2  Tue Dec 13 13:12:10 2022
+++ pkgsrc/misc/gkrellsun/distinfo      Wed Aug 23 06:29:53 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2022/12/13 13:12:10 jperkin Exp $
+$NetBSD: distinfo,v 1.3 2023/08/23 06:29:53 pho Exp $
 
 BLAKE2s (gkrellsun-1.0.0.tar.gz) = 29aebc2c39df47ce9b06a27882f2ba2b0853fa5c1504c01d3e735ba267a33e03
 SHA512 (gkrellsun-1.0.0.tar.gz) = 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
 Size (gkrellsun-1.0.0.tar.gz) = 96970 bytes
+SHA1 (patch-Makefile) = 91f8ff32ca4084a7c78ce72800f3effd88415aee
 SHA1 (patch-src20_Makefile) = aa82b3842f704ced762830bf65de5b69e368c78d
-SHA1 (patch-src20_gkrellsun.c) = 5361ecc6e27ca9407d7cfa02ab186554df7ba9c6
+SHA1 (patch-src20_gkrellsun.c) = d8b64f27b04c616c707d3683cc66265736136e96

Index: pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c
diff -u pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c:1.1 pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c:1.2
--- pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c:1.1   Tue Dec 13 13:12:10 2022
+++ pkgsrc/misc/gkrellsun/patches/patch-src20_gkrellsun.c       Wed Aug 23 06:29:53 2023
@@ -1,10 +1,13 @@
-$NetBSD: patch-src20_gkrellsun.c,v 1.1 2022/12/13 13:12:10 jperkin Exp $
+$NetBSD: patch-src20_gkrellsun.c,v 1.2 2023/08/23 06:29:53 pho Exp $
 
-Avoid "sun" conflict.
+* Avoid "sun" conflict.
+
+* Fix a build breakage with glib2-2.76. No idea why it has a declaration
+  here. It conflicts with a macro in <glib-2.0/glib/gstring.h>.
 
 --- src20/gkrellsun.c.orig     2006-03-17 13:29:51.000000000 +0000
 +++ src20/gkrellsun.c
-@@ -16,6 +16,10 @@ time_t* CurrentTime;
+@@ -16,8 +16,11 @@ time_t* CurrentTime;
  
  #include <math.h>
  
@@ -13,5 +16,7 @@ Avoid "sun" conflict.
 +#endif
 +
  /* splint */
- extern gchar* g_string_free (/*@only@*/ GString *, gboolean);
+-extern gchar* g_string_free (/*@only@*/ GString *, gboolean);
  extern void pango_font_description_free (/*@owned@*/PangoFontDescription *);
+ 
+ #define PLUGIN_HEIGHT 54

Added files:

Index: pkgsrc/misc/gkrellsun/patches/patch-Makefile
diff -u /dev/null pkgsrc/misc/gkrellsun/patches/patch-Makefile:1.1
--- /dev/null   Wed Aug 23 06:29:54 2023
+++ pkgsrc/misc/gkrellsun/patches/patch-Makefile        Wed Aug 23 06:29:53 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile,v 1.1 2023/08/23 06:29:53 pho Exp $
+
+Do not ignore errors while building or installing files.
+
+--- Makefile.orig      2023-08-23 06:12:51.180498982 +0000
++++ Makefile
+@@ -2,7 +2,7 @@ VER=1.0.0
+ TMP=.
+ 
+ all: comment
+-      cd src20; make; cd ..
++      set -e; cd src20; make; cd ..
+ 
+ comment:
+       @echo
+@@ -12,7 +12,7 @@ comment:
+       @echo 
+ 
+ install: comment
+-      cd src20; make install; cd ..
++      set -e; cd src20; make install; cd ..
+ 
+ distclean: clean
+