Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.

[DragonGhost7 <DragonGhost7@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

There is an updated pull request by DragonGhost7 against master on the void-packages repository

https://github.com/DragonGhost7/void-packages conky
https://github.com/void-linux/void-packages/pull/40237

Conky: update to 1.15.0, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**



- I built this PR locally for my native architecture, (x86_64)



A patch file from https://github.com/void-linux/void-packages/pull/40237.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-conky-40237.patch --]
[-- Type: text/x-diff, Size: 9843 bytes --]

From c87a6398c54f43a751f9e07897a667da287b2d40 Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Mon, 21 Nov 2022 21:42:57 -0500
Subject: [PATCH] conky: update to 1.15.0, merge with conky-cli, adopt.

---
 srcpkgs/conky-cli          |   1 +
 srcpkgs/conky-cli/template |  37 --------
 srcpkgs/conky-cli/update   |   2 -
 srcpkgs/conky/template     | 174 ++++++++++++++++++++++++++++++++++---
 4 files changed, 165 insertions(+), 49 deletions(-)
 create mode 120000 srcpkgs/conky-cli
 delete mode 100644 srcpkgs/conky-cli/template
 delete mode 100644 srcpkgs/conky-cli/update

diff --git a/srcpkgs/conky-cli b/srcpkgs/conky-cli
new file mode 120000
index 000000000000..50b610ce4a24
--- /dev/null
+++ b/srcpkgs/conky-cli
@@ -0,0 +1 @@
+conky
\ No newline at end of file
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
deleted file mode 100644
index 3eeec06dd1eb..000000000000
--- a/srcpkgs/conky-cli/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'conky-cli'
-# Keep in sync with 'conky'
-pkgname=conky-cli
-version=1.13.1
-revision=1
-build_style=cmake
-conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
-configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
- -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF
- -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON
- -DBUILD_DOCS=ON"
-hostmakedepends="libtool pkg-config docbook2x man-db"
-makedepends="libcurl-devel libglib-devel libxml2-devel lua53-devel
- ncurses-devel wireless_tools-devel"
-short_desc="Conky command line without X11"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause, GPL-3.0-or-later"
-homepage="https://github.com/brndnmtthws/conky"
-distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
-
-provides="conky-${version}_${revision}"
-conflicts="conky>=0"
-
-post_extract() {
-	sed -i -e '1iinclude(CheckIncludeFile)' \
-		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
-		cmake/ConkyPlatformChecks.cmake
-}
-
-post_install() {
-	vmkdir etc/conky
-	mv ${DESTDIR}/usr/share/doc/conky-cli/conky.conf ${DESTDIR}/etc/conky/
-	mv ${DESTDIR}/usr/share/doc/conky-cli/conky_no_x11.conf ${DESTDIR}/etc/conky/
-	rm ${DESTDIR}/usr/share/doc/conky-cli/convert.lua
-	vlicense COPYING
-}
diff --git a/srcpkgs/conky-cli/update b/srcpkgs/conky-cli/update
deleted file mode 100644
index 38312d141904..000000000000
--- a/srcpkgs/conky-cli/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname="conky"
-ignore=1.999
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..a1e6f632e114 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,30 +1,184 @@
 # Template file for 'conky'
 # Keep in sync with 'conky-cli'
 pkgname=conky
-version=1.13.1
+version=1.15.0
 revision=1
+create_wrksrc=yes
 build_style=cmake
 conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
 configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
- -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON
- -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON
- -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON
- -DBUILD_XSHAPE=ON -DBUILD_DOCS=ON"
+ -DDOC_PATH=share/doc/${pkgname} -DBUILD_CURL=ON
+ -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_WLAN=ON"
 hostmakedepends="libtool pkg-config docbook2x man-db toluapp"
 makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel
  libXinerama-devel libcurl-devel librsvg-devel lua53-devel ncurses-devel
  toluapp-devel wireless_tools-devel"
 short_desc="Lightweight system monitor for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
 license="BSD-3-Clause, GPL-3.0-or-later"
 homepage="https://github.com/brndnmtthws/conky"
-distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
+distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz
+ https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
+checksum="bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2
+ 0c3eb754352c5861bcac530629e75caab1014df9f8edda163c4fe7a4aaef5cc4"
+_x11_args="-DBUILD_X11=ON -DBUILD_XDBE=ON -DBUILD_IMLIB2=ON
+ -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON"
+_no_x11_args=" -DBUILD_X11=OFF -DBUILD_XDBE=OFF -DBUILD_IMLIB2=OFF"
 
-post_install() {
+post_extract() {
+	cp -r ${pkgname}-${version} ${pkgname}-cli-${version}
+	sed -i -e '1iinclude(CheckIncludeFile)' \
+		-e 's/NCURSES ncurses/NCURSES ncursesw/' \
+		${pkgname}-cli-${version}/cmake/ConkyPlatformChecks.cmake
+}
+
+do_configure() {
+	cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc"
+	cd ${pkgname}-${version}
+	mkdir -p build; cd build
+
+		cat >bootstrap.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+			aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+			arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+			mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+			ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+			ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+			ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+		esac
+		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+	fi
+
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args}  -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake \
+		${configure_args} ${_x11_args} ..
+	sed -i -e 's/-isystem/-I/g' build.ninja
+
+	cd ${wrksrc}/${pkgname}-cli-${version}
+	mkdir -p build; cd build
+
+		cat >bootstrap.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+		configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake"
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
+			i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
+			aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
+			arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
+			mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
+			ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
+			ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
+			ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
+			ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
+			*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
+		esac
+		cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(CMAKE_C_COMPILER   ${CC})
+SET(CMAKE_CXX_COMPILER ${CXX})
+SET(CMAKE_CROSSCOMPILING TRUE)
+
+SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
+
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+_EOF
+	fi
+
+
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+	cmake ${cmake_args} -DCMAKE_TOOLCHAIN_FILE=${wrksrc}/${pkgname}-cli-${version}/build/cross_${XBPS_CROSS_TRIPLET}.cmake \
+		${configure_args} ${_no_x11_args} ..
+	sed -i -e 's/-isystem/-I/g' build.ninja
+}
+
+do_build() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	cd ${pkgname}-${version}/build
+	ninja ${makejobs} test
+	cd ${wrksrc}/${pkgname}-cli-${version}/build
+	ninja ${makejobs} test
+}
+
+do_install() {
+	cd ${pkgname}-${version}/build
+	DESTDIR=${DESTDIR} ninja ${make_install_args} install
 	vmkdir etc/conky
 	mv ${DESTDIR}/usr/share/doc/conky/conky.conf ${DESTDIR}/etc/conky/
 	mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/
 	rm ${DESTDIR}/usr/share/doc/conky/convert.lua
-	vlicense COPYING
+	vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+	vman ${wrksrc}/conky.1
+}
+
+conky-cli_package() {
+	short_desc="Conky command line without X11"
+	provides="conky-${version}_${revision}"
+	conflicts="conky>=0"
+	pkg_install() {
+		cd ${wrksrc}/${pkgname}-${version}/build
+		DESTDIR=${PKGDESTDIR} ninja ${make_install_args} install
+		vmkdir etc/conky
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky.conf ${PKGDESTDIR}/etc/conky/
+		mv ${PKGDESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${PKGDESTDIR}/etc/conky/
+		rm ${PKGDESTDIR}/usr/share/doc/conky/convert.lua
+		vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+		vman ${wrksrc}/conky.1
+	}
 }