From nobody Sat Jun 13 11:21:42 2026 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gcv923V6Wz6hwNQ for ; Sat, 13 Jun 2026 11:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcv922lFGz3b80 for ; Sat, 13 Jun 2026 11:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781349702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wM+MSqYJNbM5Gbc3asAKu1XVrxN4BGTOiXNM36JRy6I=; b=ehW8rKrFidlXl8+QI/01SFRQ/bmUz2BxZV9eyTdctwJ7DojYwm07SzFC5d3+oaxTGuXJel Ia6r7jD92CvpgIr9noIxoTc2cwMd+84LXvmZ9XxQj0n4S6jQvd659ux2cnQ+zVnPgnQWU2 dEj+QD8oAX+InMYHQZMYPGVjf8m8iukbnlDIJJhlZXJ1ZGEwoNp+5Rcbnl1Dyf+wgVsIAQ C2HyRd83lrevSzyMbeaM01p+PIMamuHw1QWqB4JKUKlaopI+4Z8+XQq0E3gYFOqT96KRVd 9fR4iFxZlzfqETPcdROQAM+lG4h+M2Jn+A8fCywK8sEN5dMMlpdSCt+i1pPfVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781349702; a=rsa-sha256; cv=none; b=VAo6cwtDkuSh3pabzTLHedeFDxlkCesa1DPF4S5Xns6z/bx1qjATfawSxqsZoni/VIDIJ8 50W0ghZl5ysUyRpvK2vle2YmXwEDql/qS2WanTtRs++WdpGhjCw2/RwJzpQp3Qmx8L9sak R7RuBPGCRbOdycKBbD3kV+bIzF9Fa63JNQi7dzketnA/k78/dA+WOB+bkWm3+hgd+WeuGu UgqVHDvpwI9dr14FIlODa/pdNfyIMX3ihJQ1j0cUjS3nzlYkuksos1BZSr80/JBZOBYylH vVBCSivDSLa885cuURTA1Y2Wk67e8ajlhogwwgDtp545udN3mXlb7XFhU0a9XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781349702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wM+MSqYJNbM5Gbc3asAKu1XVrxN4BGTOiXNM36JRy6I=; b=p8MB1ija3g+kzRb3ctSG5tg2Skx2G3c0qS/voExmUBXadehsthS4d2kglD1vsEXLDbCiCW 6DzUpqyjmrnT4E4U0xupLq2gze8OkCo02Vp7ZoTVTWyRrLWG1mOpAFcTkQ2z5ExpMU1VSM sWBOfBR+IeDQTS/thYdStTabW+zE7SL9AVu7pcaEYIC5o+jfbx7T2l0bN40/CmJfxp73Y7 DrErqE6uNu6eJMnFd9HTDpooo1KqOdWDHLKbhjUlBjE6/UXXNzJS8licES1xou5T7tMFUK Hh6ACufd/2PjjtDQbXVGEkgS/6DDX3kU678bZ7jhhyfVw+I1k/Cey0AFpJxOLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcv922Lh9z4XS for ; Sat, 13 Jun 2026 11:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40b62 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 11:21:42 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Roman Bogorodskiy Subject: git: 436f729ca814 - 2026Q2 - x11-wm/obconf: fix crash on theme change List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: ports X-Git-Refname: refs/heads/2026Q2 X-Git-Reftype: branch X-Git-Commit: 436f729ca814b5780fda5a417eb38d89e0b9aecb Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 11:21:42 +0000 Message-Id: <6a2d3d46.40b62.36d9c252@gitrepo.freebsd.org> The branch 2026Q2 has been updated by novel: URL: https://cgit.FreeBSD.org/ports/commit/?id=436f729ca814b5780fda5a417eb38d89e0b9aecb commit 436f729ca814b5780fda5a417eb38d89e0b9aecb Author: Roman Bogorodskiy AuthorDate: 2026-06-09 07:58:59 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-06-13 11:20:17 +0000 x11-wm/obconf: fix crash on theme change Fix crashing on theme change caused by incorrect error handling. PR: 295921 Reported by: fernape (cherry picked from commit d0654a3fb62625e87dae24308ebdfebda6e088a8) --- 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);