On Mon, Sep 21, 2020 at 06:22:44PM +0000, Timo Myyrä wrote:
> Here's a bump for x11/dunst. Dbus doesn't seem to be needed during build
> so move to run_depends.
>
> works for me on amd64.
Works for me on amd64 as well.
Two nits:
1)
$ make port-lib-depends-check
dunst-1.5.0(x11/dunst):
Missing lib: notify.4 (/usr/local/bin/dunstify) (NOT REACHABLE)
So add
devel/libnotify \
to LIB_DEPENDS and add
notify
to WANTLIB.
2)
@bin/dunstctl in pkg/PLIST
Drop the @ at the beginning as it is a shell script.
Besides that OK feinerer@
Best regards,
Ingo
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/dunst/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 Makefile
> --- Makefile 2 Aug 2019 13:49:29 -0000 1.9
> +++ Makefile 20 Sep 2020 05:51:11 -0000
> @@ -4,7 +4,7 @@ COMMENT = customizable and lightweight n
>
> GH_ACCOUNT = dunst-project
> GH_PROJECT = dunst
> -GH_TAGNAME = v1.4.1
> +GH_TAGNAME = v1.5.0
>
> CATEGORIES = x11
>
> @@ -15,9 +15,9 @@ MAINTAINER = Timo Myyra <timo.myyra@bitt
> # BSD
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += X11 Xext Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
> -WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 pangocairo-1.0
> -WANTLIB += pthread
> +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
> +WANTLIB += pango-1.0 pangocairo-1.0 pthread
>
> USE_GMAKE = Yes
>
> @@ -25,8 +25,9 @@ LIB_DEPENDS += devel/gettext,-runtime \
> devel/glib2 \
> devel/pango \
> graphics/cairo \
> - graphics/gdk-pixbuf2 \
> - x11/dbus
> + graphics/gdk-pixbuf2
> +
> +RUN_DEPENDS += x11/dbus
>
> FAKE_FLAGS = PREFIX="${PREFIX}" \
> MANPREFIX="${PREFIX}/man" \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/dunst/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- distinfo 2 Aug 2019 13:49:29 -0000 1.5
> +++ distinfo 20 Sep 2020 05:51:11 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (dunst-1.4.1.tar.gz) = FWP+jJ6vMwej19vtJAUh956EFfE2SXAwUSxpcTEYvf4=
> -SIZE (dunst-1.4.1.tar.gz) = 160124
> +SHA256 (dunst-1.5.0.tar.gz) = LDkK3xRLX6D/AH6jYWyQ8btTffaoBCGWmT9VhdG8jJo=
> +SIZE (dunst-1.5.0.tar.gz) = 169272
> Index: patches/patch-dunstrc
> ===================================================================
> RCS file: /cvs/ports/x11/dunst/patches/patch-dunstrc,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-dunstrc
> --- patches/patch-dunstrc 2 Aug 2019 13:49:29 -0000 1.2
> +++ patches/patch-dunstrc 20 Sep 2020 05:51:11 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-dunstrc,v 1.2 2019/08/02
> Index: dunstrc
> --- dunstrc.orig
> +++ dunstrc
> -@@ -166,7 +166,7 @@
> +@@ -175,7 +175,7 @@
> max_icon_size = 32
>
> # Paths to default icons.
> @@ -12,7 +12,7 @@ Index: dunstrc
>
> ### History ###
>
> -@@ -180,10 +180,10 @@
> +@@ -189,10 +189,10 @@
> ### Misc/Advanced ###
>
> # dmenu path.
> Index: patches/patch-src_notification_c
> ===================================================================
> RCS file: patches/patch-src_notification_c
> diff -N patches/patch-src_notification_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_notification_c 20 Sep 2020 05:51:11 -0000
> @@ -0,0 +1,34 @@
> +$OpenBSD$
> +
> +Index: src/notification.c
> +--- src/notification.c.orig
> ++++ src/notification.c
> +@@ -58,7 +58,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);
> +- printf("\ttimeout: %ld\n", n->timeout/1000);
> ++ printf("\ttimeout: %lld\n", (long long)n->timeout/1000);
> + 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
> + 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);
> + } 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);
> + } else {
> +- new_buf = g_strdup_printf("%s (%lds old)", buf,
> seconds);
> ++ new_buf = g_strdup_printf("%s (%llds old)", buf,
> (long long)seconds);
> + }
> +
> + g_free(buf);
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/dunst/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- pkg/PLIST 23 Feb 2018 22:34:18 -0000 1.3
> +++ pkg/PLIST 20 Sep 2020 05:51:11 -0000
> @@ -1,6 +1,9 @@
> @comment $OpenBSD: PLIST,v 1.3 2018/02/23 22:34:18 kn Exp $
> @bin bin/dunst
> +@bin 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
