From 3cdc78d1ce66a0de436a903864143b1f3354b7f9 Mon Sep 17 00:00:00 2001 From: DragonGhost7 Date: Sun, 30 Oct 2022 20:33:52 -0400 Subject: [PATCH 1/2] conky-cli: update to 1.15.0, adopt. --- srcpkgs/conky-cli/template | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template index 58279fa4dfb4..2c35f8028be7 100644 --- a/srcpkgs/conky-cli/template +++ b/srcpkgs/conky-cli/template @@ -1,8 +1,9 @@ # Template file for 'conky-cli' # Keep in sync with 'conky' pkgname=conky-cli -version=1.13.1 +version=1.15.0 revision=1 +archs="~i686*" wrksrc="${pkgname/-cli/}-${version}" build_style=cmake conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" @@ -10,15 +11,23 @@ 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" +hostmakedepends="python3 python3-yaml python3-Jinja2 libtool + pkg-config docbook2x man-db $(vopt_if man pandoc)" makedepends="libcurl-devel libglib-devel libxml2-devel lua53-devel ncurses-devel wireless_tools-devel" short_desc="Conky command line without X11" -maintainer="Orphaned " +maintainer="DragonGhost7 " 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 +checksum=bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2 + +build_options="man" +desc_option_man="Use pandoc for manpages" + +case "$XBPS_MACHINE" in + x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;; +esac provides="conky-${version}_${revision}" conflicts="conky>=0" From 34e8177e4ef9ab7b687ac86d056af682c1a638ba Mon Sep 17 00:00:00 2001 From: DragonGhost7 Date: Sun, 30 Oct 2022 20:35:11 -0400 Subject: [PATCH 2/2] conky: update to 1.15.0, adopt. --- srcpkgs/conky/template | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index 016ddeab5c8a..9af8f196f953 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,8 +1,9 @@ # Template file for 'conky' # Keep in sync with 'conky-cli' pkgname=conky -version=1.13.1 +version=1.15.0 revision=1 +archs="~i686*" build_style=cmake conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON @@ -10,16 +11,24 @@ configure_args="-DMAINTAINER_MODE=ON -DRELEASE=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" -hostmakedepends="libtool pkg-config docbook2x man-db toluapp" +hostmakedepends="python3 python3-yaml python3-Jinja2 + libtool pkg-config docbook2x man-db toluapp $(vopt_if man pandoc)" 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 " +maintainer="DragonGhost7 " 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 +checksum=bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2 + +build_options="man" +desc_option_man="Use pandoc for manpages" + +case "$XBPS_MACHINE" in + x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;; +esac post_install() { vmkdir etc/conky