From e362d4a0153b24119ebf770ca20f595dbb2bc041 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 24 Oct 2023 06:04:36 +0000
Subject: [PATCH] conky, bump version (#9666)

---
 ...onky-1.19.2.recipe => conky-1.19.6.recipe} |  8 ++-
 app-admin/conky/patches/conky-1.19.2.patchset | 52 -------------------
 2 files changed, 3 insertions(+), 57 deletions(-)
 rename app-admin/conky/{conky-1.19.2.recipe => conky-1.19.6.recipe} (90%)
 delete mode 100644 app-admin/conky/patches/conky-1.19.2.patchset

diff --git a/app-admin/conky/conky-1.19.2.recipe b/app-admin/conky/conky-1.19.6.recipe
similarity index 90%
rename from app-admin/conky/conky-1.19.2.recipe
rename to app-admin/conky/conky-1.19.6.recipe
index 3f42d4b06..a843d1fb6 100644
--- a/app-admin/conky/conky-1.19.2.recipe
+++ b/app-admin/conky/conky-1.19.6.recipe
@@ -26,9 +26,8 @@ LICENSE="GNU GPL v3
 	MIT"
 REVISION="1"
 SOURCE_URI="$HOMEPAGE/archive/refs/tags/v$portVersion.tar.gz"
-CHECKSUM_SHA256="8ad2050665bcaff3010d90df5a17197647a7b74e9d1793fb888b83e3a4b80d31"
+CHECKSUM_SHA256="1bf5868da44056badd4718a3c8dcc6905f7118a9f86e785b354a8ecdb157a59e"
 SOURCE_FILENAME="conky-v$portVersion.tar.gz"
-PATCHES="conky-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -51,10 +50,10 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	xlibe${secondaryArchSuffix}_devel
+#	xlibe${secondaryArchSuffix}_devel
 	devel:libcurl$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
-	devel:liblua$secondaryArchSuffix >= 5.3
+	devel:liblua$secondaryArchSuffix >= 5.4
 	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -71,7 +70,6 @@ BUILD()
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$prefix \
 		-DDOC_PATH=$docDir \
-		-DMAN_PATH=$manDir \
 		-DXDG_CONFIG_FILE=$settingsDir/conky_no_x11.conf \
 		-DBUILD_X11=false
 	make -C build $jobArgs
diff --git a/app-admin/conky/patches/conky-1.19.2.patchset b/app-admin/conky/patches/conky-1.19.2.patchset
deleted file mode 100644
index 89a9ec2e7..000000000
--- a/app-admin/conky/patches/conky-1.19.2.patchset
+++ /dev/null
@@ -1,52 +0,0 @@
-From c8f2ab5db601154770853eea10198c59670a9f54 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Fri, 26 May 2023 12:27:38 +0200
-Subject: Build fixes
-
-
-diff --git a/src/common.cc b/src/common.cc
-index fb02215..b8279d9 100644
---- a/src/common.cc
-+++ b/src/common.cc
-@@ -640,10 +640,12 @@ void print_battery_time(struct text_object *obj, char *p,
-   get_battery_stuff(p, p_max_size, obj->data.s, BATTERY_TIME);
- }
- 
-+#ifndef __HAIKU__
- void battery_power_draw(struct text_object *obj, char *p,
-                         unsigned int p_max_size) {
-   get_battery_power_draw(p, p_max_size, obj->data.s);
- }
-+#endif /* __HAIKU__ */
- 
- uint8_t battery_percentage(struct text_object *obj) {
-   return get_battery_perct(obj->data.s);
-diff --git a/src/core.cc b/src/core.cc
-index 99bbffb..a8c0ea6 100644
---- a/src/core.cc
-+++ b/src/core.cc
-@@ -541,7 +541,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
-   obj->callbacks.barval = &wireless_link_barval;
- #endif /* BUILD_WLAN */
- 
--#ifndef __OpenBSD__
-+#if !defined(__OpenBSD__) && !defined(__HAIKU__)
-   END OBJ(acpifan, nullptr) obj->callbacks.print = &print_acpifan;
-   END OBJ(battery, nullptr) char bat[64];
- 
-diff --git a/src/timeinfo.cc b/src/timeinfo.cc
-index ed9983e..2c0aa11 100644
---- a/src/timeinfo.cc
-+++ b/src/timeinfo.cc
-@@ -27,6 +27,8 @@
-  *
-  */
- 
-+#define _GNU_SOURCE
-+
- #include "config.h"
- 
- #include "timeinfo.h"
--- 
-2.37.3
-