CVS commit: pkgsrc/x11/lemonbar

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Jun 12 20:04:10 UTC 2025

Modified Files:
        pkgsrc/x11/lemonbar: Makefile distinfo
        pkgsrc/x11/lemonbar/patches: patch-lemonbar.c

Log Message:
x11/lemonbar: fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/lemonbar/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/lemonbar/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/lemonbar/patches/patch-lemonbar.c

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

Modified files:

Index: pkgsrc/x11/lemonbar/Makefile
diff -u pkgsrc/x11/lemonbar/Makefile:1.4 pkgsrc/x11/lemonbar/Makefile:1.5
--- pkgsrc/x11/lemonbar/Makefile:1.4    Fri Aug  2 10:15:32 2024
+++ pkgsrc/x11/lemonbar/Makefile        Thu Jun 12 20:04:10 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2024/08/02 10:15:32 pin Exp $
+# $NetBSD: Makefile,v 1.5 2025/06/12 20:04:10 vins Exp $
 
 DISTNAME=      lemonbar-1.5
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=LemonBoy/}
 GITHUB_PROJECT=        bar
@@ -11,7 +12,7 @@ HOMEPAGE=     https://github.com/LemonBoy/ba
 COMMENT=       Featherweight lemon-scented bar
 LICENSE=       mit
 
-CONFLICTS=      lemonbar-xft-[0-9]*
+CONFLICTS=     lemonbar-xft-[0-9]*
 
 USE_TOOLS+=    gmake pod2man
 
@@ -19,8 +20,12 @@ BUILD_TARGET=        all doc
 
 CFLAGS.NetBSD+=        -D_NETBSD_SOURCE # memrchr
 
-INSTALLATION_DIRS+=    bin
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
+BUILDLINK_TRANSFORM+=  rm:-0s
+BUILDLINK_TRANSFORM+=  opt:-std=c99:-std=gnu99 # strdup(), getopt()
+
+MAKE_FLAGS+=           VERSION=${PKGVERSION_NOREV}
+
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/lemonbar ${DESTDIR}${PREFIX}/bin/

Index: pkgsrc/x11/lemonbar/distinfo
diff -u pkgsrc/x11/lemonbar/distinfo:1.5 pkgsrc/x11/lemonbar/distinfo:1.6
--- pkgsrc/x11/lemonbar/distinfo:1.5    Fri Aug  2 10:15:32 2024
+++ pkgsrc/x11/lemonbar/distinfo        Thu Jun 12 20:04:10 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2024/08/02 10:15:32 pin Exp $
+$NetBSD: distinfo,v 1.6 2025/06/12 20:04:10 vins Exp $
 
 BLAKE2s (lemonbar-1.5.tar.gz) = 5bb1381f6e385487f200ef96991905bd6585c7782728f2dc327b2c173e7ded5f
 SHA512 (lemonbar-1.5.tar.gz) = 0ab519f21e40eec50d1c8b090d45c6ad7e4ec98e04831a32599d19e74684f975f0f8c9aaa10c83ecd97e33bedcef545199fbc7094291dcbc63233089eabf9860
 Size (lemonbar-1.5.tar.gz) = 16944 bytes
-SHA1 (patch-lemonbar.c) = 63ebe2eaaf6ea08dc2eee48a7f6496f819358520
+SHA1 (patch-lemonbar.c) = 6083d093a9263b8584a1b581aeccbe7c87901531

Index: pkgsrc/x11/lemonbar/patches/patch-lemonbar.c
diff -u pkgsrc/x11/lemonbar/patches/patch-lemonbar.c:1.1 pkgsrc/x11/lemonbar/patches/patch-lemonbar.c:1.2
--- pkgsrc/x11/lemonbar/patches/patch-lemonbar.c:1.1    Mon Nov 23 14:07:27 2020
+++ pkgsrc/x11/lemonbar/patches/patch-lemonbar.c        Thu Jun 12 20:04:10 2025
@@ -1,10 +1,34 @@
-$NetBSD: patch-lemonbar.c,v 1.1 2020/11/23 14:07:27 nia Exp $
+$NetBSD: patch-lemonbar.c,v 1.2 2025/06/12 20:04:10 vins Exp $
 
-Argument to ctype functions must be unsigned char.
+* pledge support uses err() on OpenBSD.
+* iovec struct has a iov_base member of type caddr_t on SunOS.
+* Argument to ctype functions must be unsigned char.
 
---- lemonbar.c.orig    2020-11-20 08:32:06.000000000 +0000
+--- lemonbar.c.orig    2024-04-30 07:50:08.000000000 +0000
 +++ lemonbar.c
-@@ -539,7 +539,7 @@ parse (char *text)
+@@ -8,6 +8,9 @@
+ #include <poll.h>
+ #include <getopt.h>
+ #include <unistd.h>
++#ifdef __OpenBSD__
++#include <err.h>
++#endif
+ #include <errno.h>
+ #include <assert.h>
+ #include <xcb/xcb.h>
+@@ -134,7 +137,11 @@ xcb_void_cookie_t xcb_poly_text_16_simpl
+         1                 // isvoid
+     };
+     struct iovec xcb_parts[7];
++#ifdef __sun
++    char xcb_lendelta[2];
++#else
+     uint8_t xcb_lendelta[2];
++#endif
+     xcb_void_cookie_t xcb_ret;
+     xcb_poly_text_8_request_t xcb_out;
+ 
+@@ -510,7 +517,7 @@ parse (char *text)
          if (p[0] == '%' && p[1] == '{' && (block_end = strchr(p++, '}'))) {
              p++;
              while (p < block_end) {
@@ -13,7 +37,7 @@ Argument to ctype functions must be unsi
                      p++;
  
                  switch (*p++) {
-@@ -593,7 +593,7 @@ parse (char *text)
+@@ -564,7 +571,7 @@ parse (char *text)
                      case 'A': {
                          button = XCB_BUTTON_INDEX_1;
                          // The range is 1-5
@@ -22,7 +46,7 @@ Argument to ctype functions must be unsi
                              button = *p++ - '0';
                          if (!area_add(p, block_end, &p, cur_mon, pos_x, align, button))
                              return;
-@@ -671,7 +671,7 @@ parse (char *text)
+@@ -644,7 +651,7 @@ parse (char *text)
                                // Switch to automatic font selection.
                                font_index = -1;
                                p++;
@@ -31,7 +55,7 @@ Argument to ctype functions must be unsi
                                font_index = (int)strtoul(p, &ep, 10);
                                // User-specified 'font_index' ∊ (0,font_count]
                                // Otherwise just fallback to the automatic font selection
-@@ -1217,7 +1217,7 @@ parse_geometry_string (char *str, int *t
+@@ -1176,7 +1183,7 @@ parse_geometry_string (char *str, int *t
              p++; continue;
          }
          // A digit must follow