Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 May 2026 21:40:45 +0000
From:      Fernando Apeste=?utf-8?Q?gu=C3=ADa?= <fernape@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ff0628cc99cd - main - sysutils/conky{-awesome}: Update to 1.23.0
Message-ID:  <6a1a07dd.396cc.7f1896ba@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by fernape:

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

commit ff0628cc99cd10c9542983c9951917c6e392334e
Author:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
AuthorDate: 2026-05-17 16:45:17 +0000
Commit:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
CommitDate: 2026-05-29 21:39:50 +0000

    sysutils/conky{-awesome}: Update to 1.23.0
    
    ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.23.0
    
    Add 2 cherry-picked commits to:
     * Allow the specific options of conky-awesome to build
     * Fix an issue with mouse events repropagation
    
    Features
     * feat(lua): add conky_surface() for creating Cairo surface on Wayland; update
       conky_window.width/height from Wayland
     * Improve logging and termination
    
    Bug fixes
    
     * fix(x11): mouse event handling - scroll direction, hit testing, XInput2
       performance
     * fix(settings): simplify background alpha settings (#2109)
     * Fix #2333: implement hash-based caching for execp to persist scroll state
     * Update stale width and height values
     * fix: various tiny followups
     * Fix double free; coalesce free(obj/free_at_crash) into core.cc; fix graph
       leak
     * fix(conky): parse XDG_CURRENT_DESKTOP as colon-separated list
    
    Miscellaneous
    
     * chore: bump version
     * fix(lua): fix build error caused by Lua 5.5 GC API changes
     * fix: Fixed rendering of gradients in graphs
     * fix: delete web dependabot
     * build(deps): bump the actions group across 1 directory with 11 updates
     * Fix journal.cc issues
     * chore: bump version
---
 sysutils/conky/Makefile                 |  6 +++++-
 sysutils/conky/distinfo                 | 10 +++++++---
 sysutils/conky/files/patch-src_conky.cc | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 7049596577d5..ef1a86a38198 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,8 +1,12 @@
 PORTNAME=	conky
-PORTVERSION=	1.22.3
+PORTVERSION=	1.23.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
+PATCH_SITES=	https://github.com/brndnmtthws/conky/commit/
+PATCHFILES=	e99ea4174dbafe753ac002567f0d6dbf2356a279.patch:-p1 \
+		cd1e291560ddc5e6ad52e9ca227ee8ffa1f32d4a.patch:-p1
+
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT?=	Advanced, highly configurable system monitor for X11
 WWW=		https://github.com/brndnmtthws/conky
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index 8157ab95c89a..dd9002848633 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1772715003
-SHA256 (brndnmtthws-conky-v1.22.3_GH0.tar.gz) = 645af6bbd3b1f8ad44cb427b3e3d6a97db05687aeee33021d4348c39215ab28f
-SIZE (brndnmtthws-conky-v1.22.3_GH0.tar.gz) = 2227352
+TIMESTAMP = 1779821212
+SHA256 (brndnmtthws-conky-v1.23.0_GH0.tar.gz) = 039bdc6d14a355586b462cb0a6ffdeb3e2f9b354a5348dd88f8ad22d4538b783
+SIZE (brndnmtthws-conky-v1.23.0_GH0.tar.gz) = 2285190
+SHA256 (e99ea4174dbafe753ac002567f0d6dbf2356a279.patch) = caff9cd7286a202131c1614f45e484ca38e312503b52304478d8fec8f0179938
+SIZE (e99ea4174dbafe753ac002567f0d6dbf2356a279.patch) = 2062
+SHA256 (cd1e291560ddc5e6ad52e9ca227ee8ffa1f32d4a.patch) = c1faaf79aced1e0f19c2bcb7dd291ff4faf557897872ee75b2294bf9d882dfd3
+SIZE (cd1e291560ddc5e6ad52e9ca227ee8ffa1f32d4a.patch) = 1180
diff --git a/sysutils/conky/files/patch-src_conky.cc b/sysutils/conky/files/patch-src_conky.cc
new file mode 100644
index 000000000000..72e99d556646
--- /dev/null
+++ b/sysutils/conky/files/patch-src_conky.cc
@@ -0,0 +1,19 @@
+--- src/conky.cc.orig	2026-05-17 15:16:39 UTC
++++ src/conky.cc
+@@ -1857,10 +1857,12 @@ void get_system_details() {
+   }
+ #endif
+ 
+-  if (info.system.wm_name != nullptr) {
+-    LOG_INFO("'{}' {} session running", info.system.wm_name, session_ty);
+-  } else {
+-    LOG_INFO("unknown {} session running", session_ty);
++  if (session_ty != nullptr) {
++    if (info.system.wm_name != nullptr) {
++      LOG_INFO("'{}' {} session running", info.system.wm_name, session_ty);
++    } else {
++      LOG_INFO("unknown {} session running", session_ty);
++    }
+   }
+ }
+ 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1a07dd.396cc.7f1896ba>