diff --git a/app-admin/conky/conky-1.11.6_pre.recipe b/app-admin/conky/conky-1.19.2.recipe similarity index 80% rename from app-admin/conky/conky-1.11.6_pre.recipe rename to app-admin/conky/conky-1.19.2.recipe index 1220758fa..3f42d4b06 100644 --- a/app-admin/conky/conky-1.11.6_pre.recipe +++ b/app-admin/conky/conky-1.19.2.recipe @@ -20,16 +20,15 @@ Conky can display information either as text, or using simple progress bars and graph widgets, with different fonts and colours." HOMEPAGE="https://github.com/brndnmtthws/conky" COPYRIGHT="2004 Hannu Saransaari and Lauri Hakkarainen - 2005-2020 Brenden Matthews, Philip Kovacs, et. al." + 2005-2023 Brenden Matthews, Philip Kovacs, et. al." LICENSE="GNU GPL v3 GNU LGPL v3 MIT" -REVISION="3" -srcGitRev="6ad788b78d8b0cf384e97dac5cabd052cb8a53f2" -SOURCE_URI="https://github.com/brndnmtthws/conky/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="2efa3f40626ee910de8f638d8c4648eda33c6565aea4905bfd4f2de742bf69ee" -SOURCE_FILENAME="conky-$portVersion-$srcGitRev.tar.gz" -SOURCE_DIR="conky-$srcGitRev" +REVISION="1" +SOURCE_URI="$HOMEPAGE/archive/refs/tags/v$portVersion.tar.gz" +CHECKSUM_SHA256="8ad2050665bcaff3010d90df5a17197647a7b74e9d1793fb888b83e3a4b80d31" +SOURCE_FILENAME="conky-v$portVersion.tar.gz" +PATCHES="conky-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -52,6 +51,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + xlibe${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:liblua$secondaryArchSuffix >= 5.3 @@ -68,16 +68,17 @@ BUILD_PREREQUIRES=" BUILD() { - cmake -DCMAKE_INSTALL_PREFIX=$prefix \ + 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 $jobArgs + -DBUILD_X11=false + make -C build $jobArgs } INSTALL() { - make install + make -C build install mv $docDir/conky_no_x11.conf $settingsDir } diff --git a/app-admin/conky/patches/conky-1.19.2.patchset b/app-admin/conky/patches/conky-1.19.2.patchset new file mode 100644 index 000000000..89a9ec2e7 --- /dev/null +++ b/app-admin/conky/patches/conky-1.19.2.patchset @@ -0,0 +1,52 @@ +From c8f2ab5db601154770853eea10198c59670a9f54 Mon Sep 17 00:00:00 2001 +From: begasus +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 +