From 38412f2624474207a9f8dba574feccab65712a73 Mon Sep 17 00:00:00 2001 From: volker Date: Mon, 8 Jun 2026 17:34:02 +0000 Subject: [PATCH] x11/dunst: Update to 1.13.2 From Maintainer Timo Myyra, thanks --- x11/dunst/Makefile | 2 +- x11/dunst/distinfo | 4 ++-- x11/dunst/patches/patch-config_mk | 8 ++++---- x11/dunst/patches/patch-docs_dunst_1_pod_in | 2 +- x11/dunst/patches/patch-dunstrc | 4 ++-- x11/dunst/patches/patch-src_utils_c | 10 +++++----- x11/dunst/patches/patch-test_rules_c | 21 --------------------- 7 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 x11/dunst/patches/patch-test_rules_c diff --git a/x11/dunst/Makefile b/x11/dunst/Makefile index 8cb4377740f..410666ddd66 100644 --- a/x11/dunst/Makefile +++ b/x11/dunst/Makefile @@ -2,7 +2,7 @@ COMMENT = customizable and lightweight notification-daemon GH_ACCOUNT = dunst-project GH_PROJECT = dunst -GH_TAGNAME = v1.13.1 +GH_TAGNAME = v1.13.2 CATEGORIES = x11 diff --git a/x11/dunst/distinfo b/x11/dunst/distinfo index 30ef885c782..045fc725ed9 100644 --- a/x11/dunst/distinfo +++ b/x11/dunst/distinfo @@ -1,2 +1,2 @@ -SHA256 (dunst-1.13.1.tar.gz) = pXjlws21RhhzVccQ8aqExHLm4jgo5pL+HLDruWNbEaY= -SIZE (dunst-1.13.1.tar.gz) = 4666210 +SHA256 (dunst-1.13.2.tar.gz) = xoZFzs70pFhAzWfBmhijoh7K5rMx6YZMK3RcMa7l/IU= +SIZE (dunst-1.13.2.tar.gz) = 4685829 diff --git a/x11/dunst/patches/patch-config_mk b/x11/dunst/patches/patch-config_mk index 021bf44fa57..4bab725fbd2 100644 --- a/x11/dunst/patches/patch-config_mk +++ b/x11/dunst/patches/patch-config_mk @@ -1,13 +1,13 @@ Index: config.mk --- config.mk.orig +++ config.mk -@@ -52,8 +52,8 @@ endif +@@ -59,8 +59,8 @@ endif # flags - DEFAULT_CPPFLAGS = -Wno-gnu-zero-variadic-macro-arguments -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\" ${ENABLE_WAYLAND} ${ENABLE_X11} --DEFAULT_CFLAGS = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Wno-expansion-to-defined -Os ${EXTRA_CFLAGS} + DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\" ${ENABLE_WAYLAND} ${ENABLE_X11} +-DEFAULT_CFLAGS = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Wno-expansion-to-defined -Os -DEFAULT_LDFLAGS = -lm -lrt -+DEFAULT_CFLAGS = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Wno-expansion-to-defined ${EXTRA_CFLAGS} ++DEFAULT_CFLAGS = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Wno-expansion-to-defined +DEFAULT_LDFLAGS = -lm CPPFLAGS_DEBUG := diff --git a/x11/dunst/patches/patch-docs_dunst_1_pod_in b/x11/dunst/patches/patch-docs_dunst_1_pod_in index 453260654b6..21dbc0b2f57 100644 --- a/x11/dunst/patches/patch-docs_dunst_1_pod_in +++ b/x11/dunst/patches/patch-docs_dunst_1_pod_in @@ -1,7 +1,7 @@ Index: docs/dunst.1.pod.in --- docs/dunst.1.pod.in.orig +++ docs/dunst.1.pod.in -@@ -92,9 +92,9 @@ Set notification timeout time. +@@ -59,9 +59,9 @@ Display a notification on startup. =head1 CONFIGURATION diff --git a/x11/dunst/patches/patch-dunstrc b/x11/dunst/patches/patch-dunstrc index 63769af994f..314eb907827 100644 --- a/x11/dunst/patches/patch-dunstrc +++ b/x11/dunst/patches/patch-dunstrc @@ -1,7 +1,7 @@ Index: dunstrc --- dunstrc.orig +++ dunstrc -@@ -240,7 +240,7 @@ +@@ -247,7 +247,7 @@ max_icon_size = 128 # Paths to default icons (only necessary when not using recursive icon lookup) @@ -10,7 +10,7 @@ Index: dunstrc ### History ### -@@ -254,10 +254,10 @@ +@@ -261,10 +261,10 @@ ### Misc/Advanced ### # dmenu path. diff --git a/x11/dunst/patches/patch-src_utils_c b/x11/dunst/patches/patch-src_utils_c index 75f20a35473..179cf08d4bf 100644 --- a/x11/dunst/patches/patch-src_utils_c +++ b/x11/dunst/patches/patch-src_utils_c @@ -1,16 +1,16 @@ Index: src/utils.c --- src/utils.c.orig +++ src/utils.c -@@ -13,7 +13,6 @@ +@@ -18,7 +18,6 @@ #include #include #include -#include + #include "utils.h" #include "log.h" - #include "settings_data.h" -@@ -180,34 +179,13 @@ int string_array_length(char **s) - /* see utils.h */ +@@ -177,34 +176,13 @@ int string_array_length(char **s) + char *string_to_path(char *string) { - ASSERT_OR_RET(string, string); @@ -48,4 +48,4 @@ Index: src/utils.c + return string; } - /* see utils.h */ + bool safe_string_to_long_long(long long *in, const char *str) { diff --git a/x11/dunst/patches/patch-test_rules_c b/x11/dunst/patches/patch-test_rules_c deleted file mode 100644 index ce100af2389..00000000000 --- a/x11/dunst/patches/patch-test_rules_c +++ /dev/null @@ -1,21 +0,0 @@ -Index: test/rules.c ---- test/rules.c.orig -+++ test/rules.c -@@ -41,7 +41,7 @@ TEST test_pattern_match(void) { - ASSERT(rule_field_matches_string("ffffasd", ".*asd")); - - // Substring matching -- ASSERT(rule_field_matches_string("asd", "")); -+ ASSERT_FALSE(rule_field_matches_string("asd", "")); - ASSERT(rule_field_matches_string("asd", "sd")); - ASSERT(rule_field_matches_string("asd", "a")); - ASSERT(rule_field_matches_string("asd", "d")); -@@ -54,7 +54,7 @@ TEST test_pattern_match(void) { - ASSERT_FALSE(rule_field_matches_string("azd", "asd|dfg|ghj")); - - // Special characters -- ASSERT_FALSE(rule_field_matches_string("{", "{")); -+ ASSERT(rule_field_matches_string("{", "{")); - ASSERT(rule_field_matches_string("{", "\\{")); - ASSERT(rule_field_matches_string("a", "(a)")); - } else {