pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove lemonbar, add lemonbar-xft
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Sun Dec 12 23:10:44 2021 +0100
Changeset: 7619b69acfbf53ad3071ae5a8e1a1aaafb9f6c21
Modified Files:
Makefile
Added Files:
lemonbar-xft/DESCR
lemonbar-xft/Makefile
lemonbar-xft/PLIST
lemonbar-xft/distinfo
lemonbar-xft/patches/patch-lemonbar.c
Removed Files:
lemonbar/DESCR
lemonbar/Makefile
lemonbar/PLIST
lemonbar/distinfo
Log Message:
Remove lemonbar, add lemonbar-xft
Remove lemonbar, same version as in pkgsrc.
Add lemonbar-xft, fork supporting TTF fonts.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7619b69acfbf53ad3071ae5a8e1a1aaafb9f6c21
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
lemonbar-xft/DESCR | 3 +++
lemonbar-xft/Makefile | 31 +++++++++++++++++++++
lemonbar-xft/PLIST | 3 +++
lemonbar-xft/distinfo | 6 +++++
lemonbar-xft/patches/patch-lemonbar.c | 51 +++++++++++++++++++++++++++++++++++
lemonbar/DESCR | 3 ---
lemonbar/Makefile | 30 ---------------------
lemonbar/PLIST | 3 ---
lemonbar/distinfo | 5 ----
10 files changed, 95 insertions(+), 42 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 6734a5051e..777e8f4140 100644
--- a/Makefile
+++ b/Makefile
@@ -1989,7 +1989,7 @@ SUBDIR+= ldc017
SUBDIR+= ldc120
SUBDIR+= lde
SUBDIR+= ldtp
-SUBDIR+= lemonbar
+SUBDIR+= lemonbar-xft
SUBDIR+= leo
SUBDIR+= leocad
SUBDIR+= lfe
diff --git a/lemonbar-xft/DESCR b/lemonbar-xft/DESCR
new file mode 100644
index 0000000000..25fbad089e
--- /dev/null
+++ b/lemonbar-xft/DESCR
@@ -0,0 +1,3 @@
+lemonbar (formerly known as bar) is a lightweight bar entirely based on
+XCB. Provides full UTF-8 support, basic formatting, RandR and Xinerama
+support and EWMH compliance without wasting your precious memory.
diff --git a/lemonbar-xft/Makefile b/lemonbar-xft/Makefile
new file mode 100644
index 0000000000..fd1e817519
--- /dev/null
+++ b/lemonbar-xft/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD$
+
+DISTNAME= lemonbar-xft-1.3
+CATEGORIES= x11
+MASTER_SITES= https://gitlab.com/protesilaos/lemonbar-xft/-/archive/0042efd2ec1477ab96eb044ebba72a10aefff21f/
+
+MAINTAINER= pin%NetBSD.org@localhost
+HOMEPAGE= https://gitlab.com/protesilaos/lemonbar-xft/
+COMMENT= Featherweight lemon-scented bar
+LICENSE= mit
+
+WRKSRC= ${WRKDIR}/lemonbar-xft-0042efd2ec1477ab96eb044ebba72a10aefff21f
+
+CONFLICTS= lemonbar-[0-9]*
+
+USE_TOOLS+= gmake pod2man
+
+BUILD_TARGET= all doc
+
+CFLAGS.NetBSD+= -D_NETBSD_SOURCE # memrchr
+
+INSTALLATION_DIRS+= bin
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/lemonbar ${DESTDIR}${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/lemonbar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lemonbar-xft/PLIST b/lemonbar-xft/PLIST
new file mode 100644
index 0000000000..b6ba7f18d7
--- /dev/null
+++ b/lemonbar-xft/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+bin/lemonbar
+man/man1/lemonbar.1
diff --git a/lemonbar-xft/distinfo b/lemonbar-xft/distinfo
new file mode 100644
index 0000000000..dc3d39c2f6
--- /dev/null
+++ b/lemonbar-xft/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+BLAKE2s (lemonbar-xft-1.3.tar.gz) = 709001c325c7873bb22ef05103ff564c8c1cf592c6689bb5a8f5358f85cb7d36
+SHA512 (lemonbar-xft-1.3.tar.gz) = b106a18e1628f29be8bff3964599a52c852dfce4eec4dafde10e25c84580ba533bec20ef0b5151521f33fe26b1c2803f8491a3d315640d9642d9c196a0de1402
+Size (lemonbar-xft-1.3.tar.gz) = 17111 bytes
+SHA1 (patch-lemonbar.c) = 578b2fdd58af3d173b7a7844ee59c15f30a9df80
diff --git a/lemonbar-xft/patches/patch-lemonbar.c b/lemonbar-xft/patches/patch-lemonbar.c
new file mode 100644
index 0000000000..66ef2ccdeb
--- /dev/null
+++ b/lemonbar-xft/patches/patch-lemonbar.c
@@ -0,0 +1,51 @@
+$NetBSD$
+
+Adapt pkgsrc lemonbar patch
+
+--- lemonbar.c.orig 2020-12-13 07:41:32.000000000 +0000
++++ lemonbar.c
+@@ -616,7 +616,7 @@ parse (char *text)
+ p++;
+ while (p < block_end) {
+ int w;
+- while (isspace(*p))
++ while (isspace((unsigned char)*p))
+ p++;
+
+ switch (*p++) {
+@@ -638,7 +638,7 @@ parse (char *text)
+ case 'A':
+ button = XCB_BUTTON_INDEX_1;
+ // The range is 1-5
+- if (isdigit(*p) && (*p > '0' && *p < '6'))
++ if (isdigit((unsigned char)*p) && (*p > '0' && *p < '6'))
+ button = *p++ - '0';
+ if (!area_add(p, block_end, &p, cur_mon, pos_x, align, button))
+ return;
+@@ -657,7 +657,7 @@ parse (char *text)
+ { cur_mon = monhead; }
+ else if (*p == 'l')
+ { cur_mon = montail ? montail : monhead; }
+- else if (isdigit(*p))
++ else if (isdigit((unsigned char)*p))
+ { cur_mon = monhead;
+ for (int i = 0; i != *p-'0' && cur_mon->next; i++)
+ cur_mon = cur_mon->next;
+@@ -689,7 +689,7 @@ parse (char *text)
+ font_index = -1;
+ p++;
+ break;
+- } else if (isdigit(*p)) {
++ } else if (isdigit((unsigned char)*p)) {
+ font_index = (int)strtoul(p, &ep, 10);
+ // User-specified 'font_index' ∊ (0,font_count]
+ // Otherwise just fallback to the automatic font selection
+@@ -1214,7 +1214,7 @@ parse_geometry_string (char *str, int *t
+ p++; continue;
+ }
+ // A digit must follow
+- if (!isdigit(*p)) {
++ if (!isdigit((unsigned char)*p)) {
+ fprintf(stderr, "Invalid geometry specified\n");
+ return false;
+ }
diff --git a/lemonbar/DESCR b/lemonbar/DESCR
deleted file mode 100644
index 25fbad089e..0000000000
--- a/lemonbar/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-lemonbar (formerly known as bar) is a lightweight bar entirely based on
-XCB. Provides full UTF-8 support, basic formatting, RandR and Xinerama
-support and EWMH compliance without wasting your precious memory.
diff --git a/lemonbar/Makefile b/lemonbar/Makefile
deleted file mode 100644
index c0be4e18a4..0000000000
--- a/lemonbar/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD$
-
-DISTNAME= lemonbar-1.4
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GITHUB:=LemonBoy/}
-GITHUB_PROJECT= bar
-GITHUB_TAG= v${PKGVERSION_NOREV}
-
-MAINTAINER= hopkinsza%gmail.com@localhost
-HOMEPAGE= https://github.com/LemonBoy/bar
-COMMENT= Featherweight lemon-scented bar
-LICENSE= mit
-
-USE_TOOLS+= gmake pod2man
-
-AUTO_MKDIRS= yes
-
-# Add `doc' target to lemonbar's `all'.
-SUBST_CLASSES+= makefile
-SUBST_STAGE.makefile= pre-build
-SUBST_MESSAGE.makefile= Fixing Makefile
-SUBST_FILES.makefile= Makefile
-SUBST_SED.makefile+= -e 's/^all: .*$$/& doc/'
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/lemonbar ${DESTDIR}${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/lemonbar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-
-.include "../../x11/libxcb/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lemonbar/PLIST b/lemonbar/PLIST
deleted file mode 100644
index b6ba7f18d7..0000000000
--- a/lemonbar/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-bin/lemonbar
-man/man1/lemonbar.1
diff --git a/lemonbar/distinfo b/lemonbar/distinfo
deleted file mode 100644
index f508a126b4..0000000000
--- a/lemonbar/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-RMD160 (lemonbar-1.4.tar.gz) = 416917e37c611abf12eb6ee1a12fce7b836e5ac1
-SHA512 (lemonbar-1.4.tar.gz) = 2e516298854ad4ebf3dd4b67e933f0dca46a23cfb4146ef1737f26d937c582d0f9ce93b62ce094a7e456d55bd6273168f664c284c48c9637c8ed08f032799b14
-Size (lemonbar-1.4.tar.gz) = 16810 bytes
Home |
Main Index |
Thread Index |
Old Index