5 files changed, 21 insertions, 63 deletions
diff --git a/sysutils/conky/files/extra-patch-src_CMakeLists.txt b/sysutils/conky/files/extra-patch-src_CMakeLists.txt
index f059640294b9..163458f3f1c7 100644
--- a/sysutils/conky/files/extra-patch-src_CMakeLists.txt
+++ b/sysutils/conky/files/extra-patch-src_CMakeLists.txt
@@ -1,11 +1,11 @@
---- src/CMakeLists.txt.orig	2019-02-23 02:12:15 UTC
-+++ src/CMakeLists.txt
-@@ -124,7 +124,7 @@ if(OS_LINUX)
- endif(OS_LINUX)
- 
- if(OS_FREEBSD)
--  set(freebsd freebsd.cc freebsd.h bsdapm.cc bsdapm.h)
-+  set(freebsd freebsd.cc freebsd.h)
-   set(optional_sources ${optional_sources} ${freebsd})
+--- src/CMakeLists.txt.orig	2025-03-16 13:37:37.000000000 +0100
++++ src/CMakeLists.txt	2025-03-26 08:43:07.729405000 +0100
+@@ -165,8 +165,6 @@
+   set(freebsd_sources
+     data/os/freebsd.cc
+     data/os/freebsd.h
+-    data/hardware/bsdapm.cc
+-    data/hardware/bsdapm.h
+   )
+   set(optional_sources ${optional_sources} ${freebsd_sources})
  endif(OS_FREEBSD)
- 
diff --git a/sysutils/conky/files/patch-CMakeLists.txt b/sysutils/conky/files/patch-CMakeLists.txt
index 6f3f5c0807f3..96f293f00010 100644
--- a/sysutils/conky/files/patch-CMakeLists.txt
+++ b/sysutils/conky/files/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
---- CMakeLists.txt.orig	2024-02-26 18:33:49 UTC
+--- CMakeLists.txt.orig	2024-05-30 14:36:45 UTC
 +++ CMakeLists.txt
-@@ -74,12 +74,15 @@ if(NOT DEFINED DOC_PATH)
+@@ -79,12 +79,15 @@ if(NOT DEFINED DOC_PATH)
  endif()
  
  if(NOT DEFINED DOC_PATH)
--  set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}")
+-  set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${RELEASE_VERSION}")
 +  set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}")
  endif(NOT DEFINED DOC_PATH)
  
diff --git a/sysutils/conky/files/patch-lua_CMakeLists.txt b/sysutils/conky/files/patch-lua_CMakeLists.txt
index 16473e5f4093..72858b2abd11 100644
--- a/sysutils/conky/files/patch-lua_CMakeLists.txt
+++ b/sysutils/conky/files/patch-lua_CMakeLists.txt
@@ -1,11 +1,11 @@
---- lua/CMakeLists.txt.orig	2024-04-17 02:04:14 UTC
+--- lua/CMakeLists.txt.orig	2024-04-24 13:56:28 UTC
 +++ lua/CMakeLists.txt
-@@ -30,6 +30,8 @@ if(BUILD_X11)
-     get_filename_component(X11_SM_LIB_PATH ${X11_SM_LIB} DIRECTORY)
-     link_directories(${X11_SM_LIB_PATH})
+@@ -28,6 +28,8 @@ if(BUILD_LUA_CAIRO)
+ if(BUILD_LUA_CAIRO)
+   include_directories(${luacairo_includes} ${CMAKE_CURRENT_SOURCE_DIR})
  
-+    link_directories(${LIBS})
++  link_directories(${LIBS})
 +
-     # cairo_set_dash() needs this special hack to work properly if you have a
-     # better solution, please let me know
-     wrap_tolua(luacairo_src cairo.pkg libcairo.patch)
+   # cairo_set_dash() needs this special hack to work properly if you have a
+   # better solution, please let me know
+   wrap_tolua(luacairo_src cairo.pkg libcairo.patch)
diff --git a/sysutils/conky/files/patch-src_display-x11.cc b/sysutils/conky/files/patch-src_display-x11.cc
deleted file mode 100644
index 6daaa35ff2d6..000000000000
--- a/sysutils/conky/files/patch-src_display-x11.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/display-x11.cc.orig	2024-04-17 02:04:14 UTC
-+++ src/display-x11.cc
-@@ -762,7 +762,9 @@ bool handle_event<x_event_handler::BORDER_CROSSING>(
-     conky::display_output_x11 *surface, Display *display, XEvent &ev,
-     bool *consumed, void **cookie) {
-   if (ev.type != EnterNotify && ev.type != LeaveNotify) return false;
-+#ifdef BUILD_XINPUT
-   if (window.xi_opcode != 0) return true;  // handled by mouse_input already
-+#endif
- 
-   bool not_over_conky = ev.xcrossing.x_root <= window.x ||
-                         ev.xcrossing.y_root <= window.y ||
-@@ -771,11 +773,13 @@ bool handle_event<x_event_handler::BORDER_CROSSING>(
- 
-   if ((not_over_conky && ev.xcrossing.type == LeaveNotify) ||
-       (!not_over_conky && ev.xcrossing.type == EnterNotify)) {
-+#ifdef BUILD_MOUSE_EVENTS
-     llua_mouse_hook(mouse_crossing_event(
-         ev.xcrossing.type == EnterNotify ? mouse_event_t::AREA_ENTER
-                                          : mouse_event_t::AREA_LEAVE,
-         ev.xcrossing.x, ev.xcrossing.y, ev.xcrossing.x_root,
-         ev.xcrossing.y_root));
-+#endif
-   }
-   return true;
- }
diff --git a/sysutils/conky/files/patch-src_x11.h b/sysutils/conky/files/patch-src_x11.h
deleted file mode 100644
index 24e397f56352..000000000000
--- a/sysutils/conky/files/patch-src_x11.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/x11.h.orig	2024-04-17 02:04:14 UTC
-+++ src/x11.h
-@@ -22,6 +22,7 @@
-  *
-  */
- 
-+#ifdef BUILD_X11
- #pragma once
- 
- #include "config.h"
-@@ -246,3 +247,5 @@ extern priv::use_xpmdb_setting use_xpmdb;
- #else
- extern priv::use_xpmdb_setting use_xpmdb;
- #endif
-+
-+#endif /* BUILD_X11 */