Stefan Hagen <sh+openbsd-ports@codevoid.de> [2021-12-12, 20:18 +0100]:
> Omar Polo wrote:
>
>> Omar Polo <op@openbsd.org> writes:
>>
>> > Omar Polo <op@openbsd.org> writes:
>> >
>> >> Omar Polo <op@openbsd.org> writes:
>> >>
>> >>> Timo Myyrä <timo.myyra@bittivirhe.fi> writes:
>> >>>
>> >>>> Hi,
>> >>>>
>> >>>> Dunst has had few releases since last update so bump it to latest.
>> >>>>
>> >>>> Timo
>> >>>
>> >>> Hello,
>> >>>
>> >>> diff looks fine, it builds and package fine. don't know if it was an
>> >>> issue with my previous configuration but now I can see the icons too!
>> >>>
>> >>> However, the configuration changed a bit since last update and so dunst
>> >>> refuse to start if one had a custom configuration. Settings like
>> >>> `geometry' are gone and the keybindings are completely removed in favour
>> >>> of dunstctl(1). Probably not important enough to warrant an entry on
>> >>> current.html but at least nice to notify ;)
>> >>>
>> >>> For the laziest out there `bind-key C-space "dunstctl close"` in .cwmrc
>> >>> restores the default control-space to close the topmost notification.
>> >>>
>> >>> Thanks!
>> >>>
>> >>> Omar Polo
>> >>
>> >> I was about to commit the diff, when I noticed that 1.7.3 is already
>> >> out: https://github.com/dunst-project/dunst/releases/tag/v1.7.3
>> >>
>> >> Attaching your patch with the version number bumped, new checksums and
>> >> reindented the continuation line in pre-configure. (make update-patches
>> >> changed an offsets in a diff I think)
>> >>
>> >> here it works just as fine, is it still ok for you?
>> >>
>> >> Thanks,
>> >>
>> >> Omar Polo
>> >
>> > Oops, it was mangled somehow. attaching the diff (for real) again
>>
>> ...and I forgot to cvs add the new patches before re-generating the
>> diff...
>>
>> thanks sdk@ for noticing :)
>
> This one works, thank you.
>
> TEST_DEPENDS= shells/bash should be added. I did not look around if this
> can be avoided. But "make test" errors out with:
> env: bash: No such file or directory
>
> with that, ok sdk@
>
>> Index: Makefile
>> ===================================================================
>> RCS file: /home/cvs/ports/x11/dunst/Makefile,v
>> retrieving revision 1.11
>> diff -u -p -r1.11 Makefile
>> --- Makefile 27 Sep 2020 18:37:40 -0000 1.11
>> +++ Makefile 12 Dec 2021 18:31:52 -0000
>> @@ -4,7 +4,7 @@ COMMENT = customizable and lightweight n
>>
>> GH_ACCOUNT = dunst-project
>> GH_PROJECT = dunst
>> -GH_TAGNAME = v1.5.0
>> +GH_TAGNAME = v1.7.3
>>
>> CATEGORIES = x11
>>
>> @@ -21,7 +21,8 @@ WANTLIB += pango-1.0 pangocairo-1.0 pthr
>>
>> USE_GMAKE = Yes
>>
>> -BUILD_DEPENDS = x11/dbus
>> +BUILD_DEPENDS = graphics/png \
>> + x11/dbus
>>
>> LIB_DEPENDS += devel/gettext,-runtime \
>> devel/glib2 \
>> @@ -32,11 +33,18 @@ LIB_DEPENDS += devel/gettext,-runtime \
>>
>> RUN_DEPENDS += x11/dbus
>>
>> +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>
>> Index: distinfo
>> ===================================================================
>> RCS file: /home/cvs/ports/x11/dunst/distinfo,v
>> retrieving revision 1.6
>> diff -u -p -r1.6 distinfo
>> --- distinfo 25 Sep 2020 13:53:53 -0000 1.6
>> +++ distinfo 12 Dec 2021 18:32:01 -0000
>> @@ -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
>> Index: patches/patch-config_mk
>> ===================================================================
>> RCS file: /home/cvs/ports/x11/dunst/patches/patch-config_mk,v
>> retrieving revision 1.4
>> diff -u -p -r1.4 patch-config_mk
>> --- patches/patch-config_mk 2 Aug 2019 13:49:29 -0000 1.4
>> +++ patches/patch-config_mk 12 Dec 2021 18:31:42 -0000
>> @@ -1,14 +1,16 @@
>> -$OpenBSD: patch-config_mk,v 1.4 2019/08/02 13:49:29 sthen Exp $
>> +$OpenBSD$
>>
>> 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
>> Index: patches/patch-docs_dunst_1_pod
>> ===================================================================
>> RCS file: patches/patch-docs_dunst_1_pod
>> diff -N patches/patch-docs_dunst_1_pod
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-docs_dunst_1_pod 12 Dec 2021 18:31:42 -0000
>> @@ -0,0 +1,14 @@
>> +$OpenBSD$
>> +
>> +Index: docs/dunst.1.pod
>> +--- docs/dunst.1.pod.orig
>> ++++ docs/dunst.1.pod
>> +@@ -61,7 +61,7 @@ Display a notification on startup.
>> +
>> + A default configuration file is included (usually ##SYSCONFDIR##/dunst/dunstrc)
>> + and serves as the least important configuration file. Note: this was previously
>> +-/usr/share/dunst/dunstrc. You can edit this file to change the system-wide
>> ++${PREFIX}/share/dunst/dunstrc. You can edit this file to change the system-wide
>> + defaults or copy it to a more important location to override its settings. See
>> + the FILES section for more details on where dunst searches for its
>> + configuration files and how settings get applied.
>> Index: patches/patch-docs_dunst_5_pod
>> ===================================================================
>> RCS file: patches/patch-docs_dunst_5_pod
>> diff -N patches/patch-docs_dunst_5_pod
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-docs_dunst_5_pod 12 Dec 2021 18:31:42 -0000
>> @@ -0,0 +1,38 @@
>> +$OpenBSD$
>> +
>> +Index: docs/dunst.5.pod
>> +--- docs/dunst.5.pod.orig
>> ++++ docs/dunst.5.pod
>> +@@ -384,7 +384,7 @@ gets the last say.
>> +
>> + If B<icon_position> is set to off, this setting is ignored.
>> +
>> +-=item B<icon_path> (default: "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/")
>> ++=item B<icon_path> (default: "${PREFIX}/share/icons/gnome/16x16/status/:${PREFIX}/share/icons/gnome/16x16/devices/")
>> +
>> + Can be set to a colon-separated list of paths to search for icons to use with
>> + notifications.
>> +@@ -398,7 +398,7 @@ replace this and will need new settings.
>> + Comma-separated of names of the the themes to use for looking up icons. This has
>> + to be the name of the directory in which the theme is located, not the
>> + human-friendly name of the theme. So for example, the theme B<Breeze Dark> is
>> +-located in F</usr/share/icons/breeze-dark>. In this case you have to set the
>> ++located in F<${PREFIX}/share/icons/breeze-dark>. In this case you have to set the
>> + theme to B<breeze-dark>.
>> +
>> + The first theme in the list is the most important. Only if the icon cannot be
>> +@@ -438,12 +438,12 @@ Maximum number of notifications that will be kept in h
>> + is reached, older notifications will be deleted once a new one arrives. See
>> + HISTORY.
>> +
>> +-=item B<dmenu> (default: "/usr/bin/dmenu")
>> ++=item B<dmenu> (default: "${LOCALBASE}/bin/dmenu")
>> +
>> + The command that will be run when opening the context menu. Should be either
>> + a dmenu command or a dmenu-compatible menu.
>> +
>> +-=item B<browser> (default: "/usr/bin/xdg-open")
>> ++=item B<browser> (default: "${LOCALBASE}/bin/xdg-open")
>> +
>> + The command that will be run when opening a URL. The URL to be opened will be
>> + appended to the end of the value of this setting.
>> Index: patches/patch-docs_dunst_pod
>> ===================================================================
>> RCS file: patches/patch-docs_dunst_pod
>> diff -N patches/patch-docs_dunst_pod
>> --- patches/patch-docs_dunst_pod 2 Aug 2019 13:49:29 -0000 1.2
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,14 +0,0 @@
>> -$OpenBSD: patch-docs_dunst_pod,v 1.2 2019/08/02 13:49:29 sthen Exp $
>> -
>> -Index: docs/dunst.pod
>> ---- docs/dunst.pod.orig
>> -+++ docs/dunst.pod
>> -@@ -35,7 +35,7 @@ rules or using the output in other scripts.
>> -
>> - =head1 CONFIGURATION
>> -
>> --An example configuration file is included (usually /usr/share/dunst/dunstrc).
>> -+An example configuration file is included in ${PREFIX}/share/examples/dunst/dunstrc.
>> - To change the configuration, copy this file to ~/.config/dunst/dunstrc and edit
>> - it accordingly.
>> -
>> Index: patches/patch-dunstrc
>> ===================================================================
>> RCS file: /home/cvs/ports/x11/dunst/patches/patch-dunstrc,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 patch-dunstrc
>> --- patches/patch-dunstrc 25 Sep 2020 13:53:53 -0000 1.3
>> +++ patches/patch-dunstrc 12 Dec 2021 18:31:42 -0000
>> @@ -3,7 +3,7 @@ $OpenBSD: patch-dunstrc,v 1.3 2020/09/25
>> 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
>> Index: patches/patch-src_icon-lookup_c
>> ===================================================================
>> RCS file: patches/patch-src_icon-lookup_c
>> diff -N patches/patch-src_icon-lookup_c
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-src_icon-lookup_c 12 Dec 2021 18:31:42 -0000
>> @@ -0,0 +1,15 @@
>> +$OpenBSD$
>> +
>> +Don't use malloc.h header on OpenBSD.
>> +
>> +Index: src/icon-lookup.c
>> +--- src/icon-lookup.c.orig
>> ++++ src/icon-lookup.c
>> +@@ -3,7 +3,6 @@
>> +
>> + #include <glib.h>
>> + #include <stdio.h>
>> +-#include <malloc.h>
>> + #include <unistd.h>
>> + #include <assert.h>
>> +
>> Index: patches/patch-src_input_c
>> ===================================================================
>> RCS file: patches/patch-src_input_c
>> diff -N patches/patch-src_input_c
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-src_input_c 12 Dec 2021 18:31:42 -0000
>> @@ -0,0 +1,15 @@
>> +$OpenBSD$
>> +
>> +Index: src/input.c
>> +--- src/input.c.orig
>> ++++ src/input.c
>> +@@ -4,7 +4,9 @@
>> + #include "settings.h"
>> + #include "queues.h"
>> + #include <stddef.h>
>> ++#ifdef __linux__
>> + #include <linux/input-event-codes.h>
>> ++
No comments:
Post a Comment