*** empty log message ***
This commit is contained in:
op
parent
f9e4d21cc3
commit
ad8ee9ae5e
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2020/09/27 18:37:40 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2021/12/12 20:23:16 op Exp $
|
||||
|
||||
COMMENT = customizable and lightweight notification-daemon
|
||||
|
||||
GH_ACCOUNT = dunst-project
|
||||
GH_PROJECT = dunst
|
||||
GH_TAGNAME = v1.5.0
|
||||
GH_TAGNAME = v1.7.3
|
||||
|
||||
CATEGORIES = x11
|
||||
|
||||
@ -19,9 +19,15 @@ WANTLIB += X11 Xext Xinerama Xrandr Xss c cairo gdk_pixbuf-2.0
|
||||
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 harfbuzz intl m notify
|
||||
WANTLIB += pango-1.0 pangocairo-1.0 pthread
|
||||
|
||||
# C11 with GNU extensions
|
||||
COMPILER = base-clang ports-gcc
|
||||
COMPILER_LANGS = c
|
||||
CFLAGS += -std=gnu11
|
||||
|
||||
USE_GMAKE = Yes
|
||||
|
||||
BUILD_DEPENDS = x11/dbus
|
||||
BUILD_DEPENDS = graphics/png \
|
||||
x11/dbus
|
||||
|
||||
LIB_DEPENDS += devel/gettext,-runtime \
|
||||
devel/glib2 \
|
||||
@ -32,11 +38,20 @@ LIB_DEPENDS += devel/gettext,-runtime \
|
||||
|
||||
RUN_DEPENDS += x11/dbus
|
||||
|
||||
TEST_DEPENDS = shells/bash
|
||||
|
||||
MAKE_FLAGS = WAYLAND=0
|
||||
|
||||
FAKE_FLAGS = PREFIX="${PREFIX}" \
|
||||
MANPREFIX="${PREFIX}/man" \
|
||||
DATADIR="${PREFIX}/share/examples"
|
||||
DATADIR="${PREFIX}/share/examples" \
|
||||
SYSCONFDIR="/etc"
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
|
||||
${SUBST_CMD} ${WRKSRC}/docs/dunst.1.pod \
|
||||
${WRKSRC}/docs/dunst.5.pod ${WRKSRC}/dunstrc
|
||||
|
||||
post-install:
|
||||
mv ${WRKINST}/${SYSCONFDIR}/dunst ${PREFIX}/share
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (dunst-1.5.0.tar.gz) = LDkK3xRLX6D/AH6jYWyQ8btTffaoBCGWmT9VhdG8jJo=
|
||||
SIZE (dunst-1.5.0.tar.gz) = 169272
|
||||
SHA256 (dunst-1.7.3.tar.gz) = FQx4JpAobhY2Y7DrJgW3M5JyQBWXOLg2WAi4UeCvu+4=
|
||||
SIZE (dunst-1.7.3.tar.gz) = 4596283
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
$OpenBSD: patch-config_mk,v 1.4 2019/08/02 13:49:29 sthen Exp $
|
||||
$OpenBSD: patch-config_mk,v 1.5 2021/12/12 20:23:16 op Exp $
|
||||
|
||||
Index: config.mk
|
||||
--- config.mk.orig
|
||||
+++ config.mk
|
||||
@@ -26,7 +26,7 @@ VALGRIND ?= valgrind
|
||||
@@ -36,8 +36,8 @@ endif
|
||||
|
||||
# flags
|
||||
DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
|
||||
-DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC}
|
||||
+DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC}
|
||||
DEFAULT_LDFLAGS = -lm
|
||||
DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\"
|
||||
-DEFAULT_CFLAGS = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
|
||||
-DEFAULT_LDFLAGS = -lm -lrt
|
||||
+DEFAULT_CFLAGS = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings ${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
|
||||
+DEFAULT_LDFLAGS = -lm
|
||||
|
||||
CPPFLAGS_DEBUG := -DDEBUG_BUILD
|
||||
CFLAGS_DEBUG := -O0
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-dunstrc,v 1.3 2020/09/25 13:53:53 feinerer Exp $
|
||||
$OpenBSD: patch-dunstrc,v 1.4 2021/12/12 20:23:16 op Exp $
|
||||
|
||||
Index: dunstrc
|
||||
--- dunstrc.orig
|
||||
+++ dunstrc
|
||||
@@ -175,7 +175,7 @@
|
||||
@@ -196,7 +196,7 @@
|
||||
max_icon_size = 32
|
||||
|
||||
# Paths to default icons.
|
||||
@ -12,16 +12,16 @@ Index: dunstrc
|
||||
|
||||
### History ###
|
||||
|
||||
@@ -189,10 +189,10 @@
|
||||
@@ -210,10 +210,10 @@
|
||||
### Misc/Advanced ###
|
||||
|
||||
# dmenu path.
|
||||
- dmenu = /usr/bin/dmenu -p dunst:
|
||||
+ dmenu = ${PREFIX}/bin/dmenu -p dunst:
|
||||
+ dmenu = ${LOCALBASE}/bin/dmenu -p dunst:
|
||||
|
||||
# Browser for opening urls in context menu.
|
||||
- browser = /usr/bin/firefox -new-tab
|
||||
+ browser = ${PREFIX}/bin/firefox -new-tab
|
||||
- browser = /usr/bin/xdg-open
|
||||
+ browser = ${LOCALBASE}/bin/xdg-open
|
||||
|
||||
# Always run rule-defined scripts, even if the notification is suppressed
|
||||
always_run_script = true
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-src_notification_c,v 1.3 2020/09/25 13:53:53 feinerer Exp $
|
||||
$OpenBSD: patch-src_notification_c,v 1.4 2021/12/12 20:23:16 op Exp $
|
||||
|
||||
Index: src/notification.c
|
||||
--- src/notification.c.orig
|
||||
+++ src/notification.c
|
||||
@@ -58,7 +58,7 @@ void notification_print(const struct notification *n)
|
||||
@@ -60,7 +60,7 @@ void notification_print(const struct notification *n)
|
||||
printf("\ticon_id: '%s'\n", n->icon_id);
|
||||
printf("\tdesktop_entry: '%s'\n", n->desktop_entry ? n->desktop_entry : "");
|
||||
printf("\tcategory: %s\n", n->category);
|
||||
@ -12,23 +12,32 @@ Index: src/notification.c
|
||||
printf("\turgency: %s\n", notification_urgency_to_string(n->urgency));
|
||||
printf("\ttransient: %d\n", n->transient);
|
||||
printf("\tformatted: '%s'\n", n->msg);
|
||||
@@ -574,14 +574,14 @@ void notification_update_text_to_render(struct notific
|
||||
@@ -140,8 +140,8 @@ void notification_run_script(struct notification *n)
|
||||
// Set environment variables
|
||||
gchar *n_id_str = g_strdup_printf("%i", n->id);
|
||||
gchar *n_progress_str = g_strdup_printf("%i", n->progress);
|
||||
- gchar *n_timeout_str = g_strdup_printf("%li", n->timeout/1000);
|
||||
- gchar *n_timestamp_str = g_strdup_printf("%li", n->timestamp / 1000);
|
||||
+ gchar *n_timeout_str = g_strdup_printf("%lli", (long long)n->timeout/1000);
|
||||
+ gchar *n_timestamp_str = g_strdup_printf("%lli", (long long)n->timestamp / 1000);
|
||||
safe_setenv("DUNST_APP_NAME", appname);
|
||||
safe_setenv("DUNST_SUMMARY", summary);
|
||||
safe_setenv("DUNST_BODY", body);
|
||||
@@ -668,14 +668,14 @@ void notification_update_text_to_render(struct notific
|
||||
char *new_buf;
|
||||
if (hours > 0) {
|
||||
new_buf =
|
||||
- g_strdup_printf("%s (%ldh %ldm %lds old)", buf, hours,
|
||||
- minutes, seconds);
|
||||
+ g_strdup_printf("%s (%lldh %lldm %llds old)", buf, (long long)hours,
|
||||
+ (long long)minutes, (long long)seconds);
|
||||
+ g_strdup_printf("%s (%lldh %lldm %llds old)", buf, hours,
|
||||
minutes, seconds);
|
||||
} else if (minutes > 0) {
|
||||
new_buf =
|
||||
- g_strdup_printf("%s (%ldm %lds old)", buf, minutes,
|
||||
- seconds);
|
||||
+ g_strdup_printf("%s (%lldm %llds old)", buf, (long long)minutes,
|
||||
+ (long long)seconds);
|
||||
+ g_strdup_printf("%s (%lldm %llds old)", buf, minutes,
|
||||
seconds);
|
||||
} else {
|
||||
- new_buf = g_strdup_printf("%s (%lds old)", buf, seconds);
|
||||
+ new_buf = g_strdup_printf("%s (%llds old)", buf, (long long)seconds);
|
||||
+ new_buf = g_strdup_printf("%s (%llds old)", buf, seconds);
|
||||
}
|
||||
|
||||
g_free(buf);
|
||||
|
||||
@ -1,9 +1,14 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2020/09/25 13:53:53 feinerer Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2021/12/12 20:23:16 op Exp $
|
||||
@bin bin/dunst
|
||||
bin/dunstctl
|
||||
@bin bin/dunstify
|
||||
@man man/man1/dunst.1
|
||||
@man man/man1/dunstctl.1
|
||||
share/dbus-1/services/org.knopwob.dunst.service
|
||||
share/examples/dunst/
|
||||
share/examples/dunst/dunstrc
|
||||
@man man/man5/dunst.5
|
||||
share/dunst/
|
||||
@sample ${SYSCONFDIR}/dunst/
|
||||
share/dunst/dunstrc
|
||||
@sample ${SYSCONFDIR}/dunst/dunstrc
|
||||
share/examples/dbus-1/
|
||||
share/examples/dbus-1/services/
|
||||
share/examples/dbus-1/services/org.knopwob.dunst.service
|
||||
|
||||
Loading…
Reference in New Issue
Block a user