Hi,
Here's update to latest version of dunst.
The regexp seems work in menu so drop that patch.
Biggest change is dropping of pledge from the port. The new version broke
previous "hackish" attempt to get around X initialization and I got reports that
pledge caused problems when the browser is set to use ssh.
Timo
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dunst/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile 12 Jul 2019 20:51:09 -0000 1.8
+++ Makefile 2 Aug 2019 04:37:57 -0000
@@ -4,8 +4,7 @@ COMMENT = customizable and lightweight n
GH_ACCOUNT = dunst-project
GH_PROJECT = dunst
-GH_TAGNAME = v1.3.2
-REVISION = 0
+GH_TAGNAME = v1.4.1
CATEGORIES = x11
@@ -16,10 +15,9 @@ MAINTAINER = Timo Myyra <timo.myyra@bitt
# BSD
PERMIT_PACKAGE = Yes
-# uses pledge()
-WANTLIB += X11 Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
+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 xdg-basedir
+WANTLIB += pthread
USE_GMAKE = Yes
@@ -28,17 +26,13 @@ LIB_DEPENDS += devel/gettext,-runtime \
devel/pango \
graphics/cairo \
graphics/gdk-pixbuf2 \
- x11/dbus \
- x11/libxdg-basedir
+ x11/dbus
-MAKE_FLAGS = V=1 \
- PREFIX="${PREFIX}" \
- MANPREFIX="${PREFIX}/man"
+FAKE_FLAGS = PREFIX="${PREFIX}" \
+ MANPREFIX="${PREFIX}/man" \
+ DATADIR="${PREFIX}/share/examples"
pre-configure:
${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
-
-post-install:
- mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dunst/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 18 Jun 2018 09:03:18 -0000 1.4
+++ distinfo 2 Aug 2019 04:37:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.3.2.tar.gz) = qrbo+xEFpkFT7uHbhdAN24B5lPA/ciKqRtQOPzhG0oo=
-SIZE (dunst-1.3.2.tar.gz) = 121575
+SHA256 (dunst-1.4.1.tar.gz) = FWP+jJ6vMwej19vtJAUh956EFfE2SXAwUSxpcTEYvf4=
+SIZE (dunst-1.4.1.tar.gz) = 160124
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-config_mk
--- patches/patch-config_mk 23 Feb 2018 22:34:18 -0000 1.3
+++ patches/patch-config_mk 2 Aug 2019 04:37:57 -0000
@@ -1,13 +1,14 @@
-$OpenBSD: patch-config_mk,v 1.3 2018/02/23 22:34:18 kn Exp $
+$OpenBSD$
+
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man
+@@ -26,7 +26,7 @@ VALGRIND ?= valgrind
# flags
- CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
--CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS}
-+CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${CPPFLAGS}
- LDFLAGS += -lm -L${X11LIB}
+ 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
CPPFLAGS_DEBUG := -DDEBUG_BUILD
Index: patches/patch-docs_dunst_pod
===================================================================
RCS file: /cvs/ports/x11/dunst/patches/patch-docs_dunst_pod,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-docs_dunst_pod
--- patches/patch-docs_dunst_pod 23 Feb 2018 22:34:18 -0000 1.1
+++ patches/patch-docs_dunst_pod 2 Aug 2019 04:37:57 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-docs_dunst_pod,v 1.1 2018/02/23 22:34:18 kn Exp $
+$OpenBSD$
Index: docs/dunst.pod
--- docs/dunst.pod.orig
@@ -8,31 +8,7 @@ Index: docs/dunst.pod
=head1 CONFIGURATION
-An example configuration file is included (usually /usr/share/dunst/dunstrc).
-+An example configuration file is included (usually ${PREFIX}/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.
-@@ -395,7 +395,7 @@ Set to 0 to disable icon scaling. (default)
-
- 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: "${LOCALBASE}/share/icons/gnome/16x16/status/:${LOCALBASE}/share/icons/gnome/16x16/devices/")
-
- Can be set to a colon-separated list of paths to search for icons to use with
- notifications.
-@@ -414,12 +414,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: "${PREFIX}/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/firefox")
-+=item B<browser> (default: "${PREFIX}/bin/firefox")
-
- 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-dunstrc
===================================================================
RCS file: /cvs/ports/x11/dunst/patches/patch-dunstrc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-dunstrc
--- patches/patch-dunstrc 23 Feb 2018 22:34:18 -0000 1.1
+++ patches/patch-dunstrc 2 Aug 2019 04:37:57 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-dunstrc,v 1.1 2018/02/23
Index: dunstrc
--- dunstrc.orig
+++ dunstrc
-@@ -165,7 +165,7 @@
+@@ -166,7 +166,7 @@
max_icon_size = 32
# Paths to default icons.
@@ -12,7 +12,7 @@ Index: dunstrc
### History ###
-@@ -179,10 +179,10 @@
+@@ -180,10 +180,10 @@
### Misc/Advanced ###
# dmenu path.
Index: patches/patch-src_dunst_c
===================================================================
RCS file: patches/patch-src_dunst_c
diff -N patches/patch-src_dunst_c
--- patches/patch-src_dunst_c 23 Feb 2018 22:34:18 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_dunst_c,v 1.3 2018/02/23 22:34:18 kn Exp $
-
-Index: src/dunst.c
---- src/dunst.c.orig
-+++ src/dunst.c
-@@ -12,6 +12,9 @@
- #include <stdio.h>
- #include <stdlib.h>
-
-+#include <err.h>
-+#include <unistd.h>
-+
- #include "dbus.h"
- #include "menu.h"
- #include "notification.h"
-@@ -147,6 +150,11 @@ int dunst_main(int argc, char *argv[])
- int owner_id = initdbus();
-
- x_setup();
-+
-+ if (settings.icon_position == icons_off) {
-+ if (pledge("stdio rpath proc exec", NULL) == -1)
-+ err(1, "pledge");
-+ }
-
- if (settings.startup_notification) {
- notification *n = notification_create();
Index: patches/patch-src_menu_c
===================================================================
RCS file: patches/patch-src_menu_c
diff -N patches/patch-src_menu_c
--- patches/patch-src_menu_c 23 Feb 2018 22:34:18 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_menu_c,v 1.2 2018/02/23 22:34:18 kn Exp $
-
-Index: src/menu.c
---- src/menu.c.orig
-+++ src/menu.c
-@@ -27,10 +27,7 @@ static int regex_init(void)
- if (is_initialized)
- return 1;
-
-- char *regex =
-- "\\b(https?://|ftps?://|news://|mailto:|file://|www\\.)"
-- "[-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*"
-- "(\\([-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*\\)|[-[:alnum:]_\\@;/?:&=%$+*~])+";
-+ char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]";
- int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE);
- if (ret != 0) {
- fputs("failed to compile regex", stderr);
No comments:
Post a Comment