From 29879bc6da52a576b29622c256ee5e5cf751d90e Mon Sep 17 00:00:00 2001
From: John Vogel <jvogel4@stny.rr.com>
Date: Sat, 27 Jul 2024 09:25:43 -0400
Subject: local/conky: upgrade to 1.21.5

fix deps and disallow texrels on riscv64
---
 conky/APKBUILD | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'conky/APKBUILD')

diff --git a/conky/APKBUILD b/conky/APKBUILD
index 2f62f8f..a428b15 100644
--- a/conky/APKBUILD
+++ b/conky/APKBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: John Vogel <jvogel4@stny.rr.com>
 pkgname=conky
-pkgver=1.19.2
-pkgrel=1
+pkgver=1.21.5
+pkgrel=0
 pkgdesc="Advanced, highly configurable system monitor for X based on torsmo"
 url="https://github.com/brndnmtthws/conky"
 arch="all"
@@ -13,16 +14,18 @@ makedepends="
 	curl-dev
 	gawk
 	glib-dev
+	gperf
 	imlib2-dev
 	libxdamage-dev
 	libxext-dev
 	libxft-dev
+	libxi-dev
 	libxinerama-dev
 	libxml2-dev
 	linux-headers
 	lua5.4-dev
 	ncurses-dev
-	pandoc
+	pandoc-cli
 	pango-dev
 	py3-jinja2
 	py3-yaml
@@ -34,14 +37,7 @@ makedepends="
 	"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz"
-
-# temp allow textrels on riscv64
-[ "$CARCH" = "riscv64" ] && options="$options textrels"
-
-prepare() {
-	sed -i -e '32 iinclude(CheckIncludeFile)' CMakeLists.txt
-	default_prepare
-}
+options="!check"
 
 build() {
 	cmake -B build -G Ninja \
@@ -58,12 +54,9 @@ build() {
 		-DBUILD_WAYLAND=ON \
 		-DBUILD_INTEL_BACKLIGHT=ON \
 		-DBUILD_DOCS=ON \
-		-DLUA_LIBRARIES="/usr/lib/lua5.4/liblua.so"
+		-DLUA_LIBRARIES="/usr/lib/lua5.4/liblua.so" \
+		-DVc_ENABLE_INSTALL=OF
 	cmake --build build
-
-	#cd doc
-	#./render.py man.md.j2 > man.md
-	#pandoc --standalone -f markdown -t man man.md > conky.1
 }
 
 package() {
@@ -72,5 +65,5 @@ package() {
 }
 
 sha512sums="
-a9b565ab2e6b92efe8a10db69e88fb720ba00f09e63b21a5741f95c8a05c78dd58aa23fdbf34f8f0c9137e04ce76b1fe197594ebc1b2ad99d7fd9bf8e6127ad3  conky-1.19.2.tar.gz
+6b10b3ceaf65b63515fbb5ff44a42225693f6c208ed349b8d44c3caf23afae163446eb60362228c6757c2b98515373259d996fc1407d5f5234587fd9fb008212  conky-1.21.5.tar.gz
 "
-- 
cgit v1.2.3