sysutils/conky: update to 1.21.1

ChangeLog: https://github.com/brndnmtthws/conky/releases/tag/v1.21.1

 * Bug fixes

	* Disable Vc_ENABLE_INSTALL
	* Remove _member_access from geometry
	* Fix build with specific option combination.
	* Disable Xinput

 * Miscellaneous

	* Bump version
	* Refactor the CMake 3rdparty/Vc-related bits
	* Fix dockerhub login
	* build(deps): bump DeterminateSystems/magic-nix-cache-action from 4 to 6
	* build(deps): bump DeterminateSystems/nix-installer-action from 10 to 11
	* Group all actions dependabot updates

5 files changed, 16 insertions, 31 deletions

diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index e991646e9e4b..6a84d03b15e5 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	conky
-PORTVERSION=	1.21.0
+PORTVERSION=	1.21.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -28,8 +28,7 @@ CMAKE_ARGS=	-DAPP_SED=${LOCALBASE}/bin/gsed \
 CONFLICTS?=	conky-awesome
 
 SLAVEDIRS=	sysutils/conky-awesome
-PLIST_FILES=	bin/conky \
-		lib/libVc.a
+PLIST_FILES=	bin/conky
 PORTDOCS=	config_settings.yaml lua.yaml variables.yaml
 PORTEXAMPLES=	conky.conf conky_no_x11.conf convert.lua
 
@@ -164,8 +163,4 @@ post-install-DOCS-on:
 	${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-post-install:
-	${RM} -rf ${STAGEDIR}${PREFIX}/include
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/cmake
-
 .include <bsd.port.mk>
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index 28921e65f13d..fd4e7cac4151 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715452113
-SHA256 (brndnmtthws-conky-v1.21.0_GH0.tar.gz) = fff08ee35c15caf85ca62119c2694b9392f770eb4a8f1b5e07738d96edd0e5ac
-SIZE (brndnmtthws-conky-v1.21.0_GH0.tar.gz) = 2146867
+TIMESTAMP = 1716140477
+SHA256 (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = dccfee01fc208c4fde2bfb7c39c0fdc692d82de0f94e733ddf22e1199969bc5d
+SIZE (brndnmtthws-conky-v1.21.1_GH0.tar.gz) = 2146994
diff --git a/sysutils/conky/files/patch-src_llua.h b/sysutils/conky/files/patch-src_llua.h
deleted file mode 100644
index f5486ed1186f..000000000000
--- a/sysutils/conky/files/patch-src_llua.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/llua.h.orig	2024-05-07 20:02:47 UTC
-+++ src/llua.h
-@@ -31,6 +31,7 @@ extern "C" {
- }
- 
- #include <config.h>
-+#include "geometry.h"
- 
- #ifdef BUILD_MOUSE_EVENTS
- #include "mouse-events.h"
diff --git a/sysutils/conky/files/patch-src_x11-settings.cc b/sysutils/conky/files/patch-src_x11-settings.cc
index d5602d3839a7..b91b3e469084 100644
--- a/sysutils/conky/files/patch-src_x11-settings.cc
+++ b/sysutils/conky/files/patch-src_x11-settings.cc
@@ -1,11 +1,11 @@
---- src/x11-settings.cc.orig	2024-05-07 20:02:47 UTC
+--- src/x11-settings.cc.orig	2024-05-19 17:48:45 UTC
 +++ src/x11-settings.cc
 @@ -77,7 +77,7 @@ bool use_xpmdb_setting::set_up(lua::state &l) {
    if (!out_to_x.get(l)) return false;
  
    window.back_buffer =
--      XCreatePixmap(display, window.window, window.width + 1, window.height + 1,
-+      XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1,
+-      XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1,
++      XCreatePixmap(display, window.window, window.geometry.width() + 1, window.geometry.height() + 1,
                      DefaultDepth(display, screen));
    if (window.back_buffer != None) {
      window.drawable = window.back_buffer;
diff --git a/sysutils/conky/files/patch-src_x11.cc b/sysutils/conky/files/patch-src_x11.cc
index b341e374a623..8ecbb03b3840 100644
--- a/sysutils/conky/files/patch-src_x11.cc
+++ b/sysutils/conky/files/patch-src_x11.cc
@@ -1,16 +1,16 @@
---- src/x11.cc.orig	2024-05-14 16:06:21 UTC
+--- src/x11.cc.orig	2024-05-19 17:48:25 UTC
 +++ src/x11.cc
-@@ -1215,10 +1215,10 @@ void xpmdb_swap_buffers(void) {
+@@ -1219,10 +1219,10 @@ void xpmdb_swap_buffers(void) {
  void xpmdb_swap_buffers(void) {
    if (use_xpmdb.get(*state)) {
      XCopyArea(display, window.back_buffer, window.window, window.gc, 0, 0,
--              window.width, window.height, 0, 0);
-+              window.geometry.get_width(), window.geometry.get_height(), 0, 0);
+-              window.geometry.get_width(), window.geometry.get_height(), 0, 0);
++              window.geometry.width(), window.geometry.height(), 0, 0);
      XSetForeground(display, window.gc, 0);
--    XFillRectangle(display, window.drawable, window.gc, 0, 0, window.width,
--                   window.height);
-+    XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.get_width(),
-+                   window.geometry.get_height());
+-    XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.get_width(),
+-                   window.geometry.get_height());
++    XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.width(),
++                   window.geometry.height());
      XFlush(display);
    }
  }