git: d0654a3fb626 - main - x11-wm/obconf: fix crash on theme change

The branch main has been updated by novel:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d0654a3fb62625e87dae24308ebdfebda6e088a8

commit d0654a3fb62625e87dae24308ebdfebda6e088a8
Author:     Roman Bogorodskiy <novel@FreeBSD.org>
AuthorDate: 2026-06-09 07:58:59 +0000
Commit:     Roman Bogorodskiy <novel@FreeBSD.org>
CommitDate: 2026-06-09 08:02:18 +0000

    x11-wm/obconf: fix crash on theme change
    
    Fix crashing on theme change caused by incorrect
    error handling.
    
    PR:             295921
    Reported by:    fernape
---
 x11-wm/obconf/Makefile               |  2 +-
 x11-wm/obconf/files/patch-src_tree.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 83e9a1cd282b..64a258a90ffb 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	obconf
 PORTVERSION=	2.0.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/obconf/
 
diff --git a/x11-wm/obconf/files/patch-src_tree.c b/x11-wm/obconf/files/patch-src_tree.c
new file mode 100644
index 000000000000..705d6fba1bec
--- /dev/null
+++ b/x11-wm/obconf/files/patch-src_tree.c
@@ -0,0 +1,20 @@
+--- src/tree.c.orig	2026-06-08 11:58:29 UTC
++++ src/tree.c
+@@ -88,7 +88,7 @@ void tree_apply()
+ void tree_apply()
+ {
+     gchar *p, *d;
+-    gboolean err;
++    gboolean err = FALSE;
+ 
+     if (obc_config_file)
+         p = g_strdup(obc_config_file);
+@@ -102,6 +102,8 @@ void tree_apply()
+ 
+     if (!obt_xml_save_file(parse_i, p, TRUE)) {
+         gchar *s;
++
++        err = TRUE;
+         s = g_strdup_printf("An error occured while saving the "
+                             "config file '%s'", p);
+         obconf_error(s, FALSE);