[PR PATCH] xnotify

[PR PATCH] xnotify

[tuxliban]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

There is a new pull request by tuxliban against master on the void-packages repository

https://github.com/tuxliban/void-packages xnotify
https://github.com/void-linux/void-packages/pull/27198

xnotify
- New package: xnotify-0.8.1
XNotify displays a notification on the screen. XNotify receives a notification specification in stdin and shows a notification for the user on the screen.
Among the features that also stand out is that it has support to show images


A patch file from https://github.com/void-linux/void-packages/pull/27198.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xnotify-27198.patch --]
[-- Type: text/x-diff, Size: 7452 bytes --]

From 19b83b04173aafc9342c41520d4d8122efe9c975 Mon Sep 17 00:00:00 2001
From: tuxliban <tenshalito@gmail.com>
Date: Wed, 16 Dec 2020 03:56:49 -0600
Subject: [PATCH 1/3] New package: herbe-1.0.0

---
 srcpkgs/herbe/patches/Xresources.diff | 95 +++++++++++++++++++++++++++
 srcpkgs/herbe/template                | 17 +++++
 2 files changed, 112 insertions(+)
 create mode 100644 srcpkgs/herbe/patches/Xresources.diff
 create mode 100644 srcpkgs/herbe/template

diff --git a/srcpkgs/herbe/patches/Xresources.diff b/srcpkgs/herbe/patches/Xresources.diff
new file mode 100644
index 00000000000..2c9e9b1c5da
--- /dev/null
+++ b/srcpkgs/herbe/patches/Xresources.diff
@@ -0,0 +1,95 @@
+diff --git a/config.def.h b/config.def.h
+index 86b7e76..d545925 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -2,18 +2,18 @@ static const char *background_color = "#3e3e3e";
+ static const char *border_color = "#ececec";
+ static const char *font_color = "#ececec";
+ static const char *font_pattern = "monospace:size=10";
+-static const unsigned line_spacing = 5;
+-static const unsigned int padding = 15;
++static unsigned line_spacing = 5;
++static unsigned int padding = 15;
+ 
+-static const unsigned int width = 450;
+-static const unsigned int border_size = 2;
+-static const unsigned int pos_x = 30;
+-static const unsigned int pos_y = 60;
++static unsigned int width = 450;
++static unsigned int border_size = 2;
++static unsigned int pos_x = 30;
++static unsigned int pos_y = 60;
+ 
+ enum corners { TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT };
+ enum corners corner = TOP_RIGHT;
+ 
+-static const unsigned int duration = 5; /* in seconds */
++static unsigned int duration = 5; /* in seconds */
+ 
+ #define DISMISS_BUTTON Button1
+ #define ACTION_BUTTON Button3
+diff --git a/herbe.c b/herbe.c
+index 51d3990..574e967 100644
+--- a/herbe.c
++++ b/herbe.c
+@@ -1,5 +1,6 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xft/Xft.h>
++#include <X11/Xresource.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <signal.h>
+@@ -15,6 +16,13 @@
+ #define EXIT_FAIL 1
+ #define EXIT_DISMISS 2
+ 
++#define XRES_STR(name)                                        \
++	if (XrmGetResource(db, "herbe." #name, "*", &type, &val)) \
++	name = val.addr
++#define XRES_INT(name)                                        \
++	if (XrmGetResource(db, "herbe." #name, "*", &type, &val)) \
++	name = strtoul(val.addr, 0, 10)
++
+ Display *display;
+ Window window;
+ int exit_code = EXIT_DISMISS;
+@@ -107,6 +115,28 @@ int main(int argc, char *argv[])
+ 	if (!(display = XOpenDisplay(0)))
+ 		die("Cannot open display");
+ 
++	XrmInitialize();
++
++	char *res_man = XResourceManagerString(display);
++	XrmDatabase db = XrmGetStringDatabase(res_man);
++
++	char *type;
++	XrmValue val;
++
++	XRES_STR(background_color);
++	XRES_STR(border_color);
++	XRES_STR(font_color);
++	XRES_STR(font_pattern);
++
++	XRES_INT(line_spacing);
++	XRES_INT(padding);
++	XRES_INT(width);
++	XRES_INT(border_size);
++	XRES_INT(pos_x);
++	XRES_INT(pos_y);
++	XRES_INT(corner);
++	XRES_INT(duration);
++
+ 	int screen = DefaultScreen(display);
+ 	Visual *visual = DefaultVisual(display, screen);
+ 	Colormap colormap = DefaultColormap(display, screen);
+@@ -214,7 +244,8 @@ int main(int argc, char *argv[])
+ 	XftDrawDestroy(draw);
+ 	XftColorFree(display, visual, colormap, &color);
+ 	XftFontClose(display, font);
++	XrmDestroyDatabase(db);
+ 	XCloseDisplay(display);
+ 
+ 	return exit_code;
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/herbe/template b/srcpkgs/herbe/template
new file mode 100644
index 00000000000..de2bf34a198
--- /dev/null
+++ b/srcpkgs/herbe/template
@@ -0,0 +1,17 @@
+# Template file for 'herbe'
+pkgname=herbe
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+makedepends="libXft-devel"
+short_desc="Daemon-less notifications without D-Bus. Minimal and lightweight"
+maintainer="tuxliban <tenshalito@gmail.com>"
+license="MIT"
+homepage="https://github.com/dudik/herbe"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=78e454159050c86e030fb5a6cf997ac914345210cdf5a4ca4d7600c5296b7f76
+patch_args="-Np1"
+
+do_build() {
+	export CFLAGS=${CFLAGS}
+}

From e8e4e6310c5715f5420da1fce243424e18858cb8 Mon Sep 17 00:00:00 2001
From: tuxliban <tenshalito@gmail.com>
Date: Wed, 16 Dec 2020 04:43:12 -0600
Subject: [PATCH 2/3] herbe: update to 1.0.0.

---
 srcpkgs/herbe/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/herbe/template b/srcpkgs/herbe/template
index de2bf34a198..e5b9319f6a1 100644
--- a/srcpkgs/herbe/template
+++ b/srcpkgs/herbe/template
@@ -3,7 +3,7 @@ pkgname=herbe
 version=1.0.0
 revision=1
 build_style=gnu-makefile
-makedepends="libXft-devel"
+makedepends="libXft-devel freetype-devel"
 short_desc="Daemon-less notifications without D-Bus. Minimal and lightweight"
 maintainer="tuxliban <tenshalito@gmail.com>"
 license="MIT"
@@ -15,3 +15,7 @@ patch_args="-Np1"
 do_build() {
 	export CFLAGS=${CFLAGS}
 }
+
+do_install() {
+	vlicense LICENSE
+}

From 78b59f83879e9958709213e616540609840ecb9a Mon Sep 17 00:00:00 2001
From: tuxliban <tenshalito@gmail.com>
Date: Wed, 16 Dec 2020 05:07:44 -0600
Subject: [PATCH 3/3] New package: xnotify-0.8.1

---
 srcpkgs/xnotify/files/config.h | 30 ++++++++++++++++++++++++++++++
 srcpkgs/xnotify/template       | 26 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 srcpkgs/xnotify/files/config.h
 create mode 100644 srcpkgs/xnotify/template

diff --git a/srcpkgs/xnotify/files/config.h b/srcpkgs/xnotify/files/config.h
new file mode 100644
index 00000000000..933d45a7a16
--- /dev/null
+++ b/srcpkgs/xnotify/files/config.h
@@ -0,0 +1,30 @@
+static struct Config config = {
+	/* fonts, separate different fonts with comma */
+	.titlefont = "ubuntu:size=10:style=bold",
+	.bodyfont = "ubuntu:size=9",
+
+	/* colors */
+	.background_color = "#263238",
+	.foreground_color = "#ececec",
+	.border_color = "#ececec",
+
+	/* geometry and gravity (see the manual) */
+	.geometryspec = "250x0-5+25",
+	.gravityspec = "NE",
+
+	/* size of border, gaps and image (in pixels) */
+	.border_pixels = 1,
+	.gap_pixels = 5,
+	.image_pixels = 0,     /* if 0, the image will fit the notification */
+	.leading_pixels = 5,    /* space between title and body texts */
+	.padding_pixels = 10,   /* space around content */
+
+	/* text alignment, set to LeftAlignment, CenterAlignment or RightAlignment */
+	.alignment = RightAlignment,
+
+	/* set to nonzero to shrink notification width to its content size */
+	.shrink = 0,
+
+	/* time, in seconds, for a notification to stay alive */
+	.sec = 15
+};
diff --git a/srcpkgs/xnotify/template b/srcpkgs/xnotify/template
new file mode 100644
index 00000000000..99e0cacda70
--- /dev/null
+++ b/srcpkgs/xnotify/template
@@ -0,0 +1,26 @@
+# Template file for 'xnotify'
+pkgname=xnotify
+version=0.8.1
+revision=1
+build_style=gnu-makefile
+makedepends="imlib2-devel libX11-devel libXft-devel libXinerama-devel"
+short_desc="Simple yet powerful notification launcher without dbus"
+maintainer="tuxliban <tenshalito@gmail.com>"
+license="MIT"
+homepage="https://github.com/phillbush/xnotify"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=bb409c37e898674843d5279eb990b3da73cdbf00bc2dc2f8aa36fc0235e3ca7b
+
+pre_build() {
+	if [ -e ${FILESDIR}/config.h ]; then
+	cp ${FILESDIR}/config.h config.h
+	fi
+}
+
+do_build() {
+	export CFLAGS=${CFLAGS}
+}
+
+post_install() {
+	vlicense LICENSE
+}

Re: New package: xnotify-0.8.1

[kawaiiamber]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27198#issuecomment-748429977

Comment:
I notice there's two commits for `herbe` template. I would squash the last two commits with `git rebase -i HEAD~2` and change last one from `pick` to `squash` and just name the commit `New package: herbe-1.0.0`. Some checks are failing to grab `X11/xlib.h` header file for `xnotify`. If you don't want to export to those architectures, you might try specifying `archs="x86_64 i686 x86_64-musl"` in the template.

Re: New package: xnotify-0.8.1

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/27198#issuecomment-748483551

Comment:
Not a fan of vendoring those configuration files, this should use the default one and optionally copy a configuration
file the user adds into the wrksrc, like dwm and st do.

We also usually don't patch software to add new features.

Re: New package: xnotify-0.8.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27198#issuecomment-828394192

Comment:
Closing due to inactivity, can be merged in #25035

Re: [PR PATCH] [Closed]: New package: xnotify-0.8.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

There's a closed pull request on the void-packages repository

 New package: xnotify-0.8.1
https://github.com/void-linux/void-packages/pull/27198

Description:
- New package: xnotify-0.8.1
XNotify displays a notification on the screen. XNotify receives a notification specification in stdin and shows a notification for the user on the screen.
Among the features that also stand out is that it has support to show images

Re: New package: xnotify-0.8.1

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/25035#issuecomment-1101923671

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: New package: xnotify-0.8.1

[natrys]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by natrys on void-packages repository

https://github.com/void-linux/void-packages/pull/25035#issuecomment-828607353

Comment:
Fair enough, changed to that.

Re: New package: xnotify-0.8.1

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25035#issuecomment-828587692

Comment:
It avoids having to specify `LDFLAGS` yourself, at least