From 746e6f65008123645d80bb06a05dcca956f3bb9d Mon Sep 17 00:00:00 2001 From: zlice Date: Thu, 15 Feb 2024 13:19:32 -0500 Subject: [PATCH] conky: update to 1.19.6 --- srcpkgs/conky-cli | 1 + srcpkgs/conky-cli/template | 37 ---------------------- srcpkgs/conky-cli/update | 2 -- srcpkgs/conky/template | 64 ++++++++++++++++++++++++++++++++------ 4 files changed, 55 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 00000000000..50b610ce4a2 --- /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 3eeec06dd1e..00000000000 --- 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 " -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 38312d14190..00000000000 --- 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 016ddeab5c8..c89d06b3f86 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,25 +1,48 @@ # Template file for 'conky' -# Keep in sync with 'conky-cli' pkgname=conky -version=1.13.1 +version=1.19.6 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=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_WLAN=ON -DBUILD_X11=ON -DBUILD_XDBE=ON + -DBUILD_IMLIB2=ON -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON + -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=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" + toluapp-devel wireless_tools-devel cairo-devel wayland-devel" +short_desc="Lightweight system monitor for X and Wayland" maintainer="Orphaned " 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="1bf5868da44056badd4718a3c8dcc6905f7118a9f86e785b354a8ecdb157a59e + b733aa2a7fcf53b32464defa10b0f15561ec6c9a948a4ed21e76874c693ac570" + +post_extract() { + mv conky-*/* . +} + +post_configure() { # conky-cli + configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON -DDOC_PATH=share/doc/${pkgname} + -DBUILD_X11=OFF -DBUILD_WAYLAND=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF + -DBUILD_RSS=ON -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON" + ( + cmake_builddir="cli-build" + do_configure + ) +} + +post_build() { # conky-cli + ( + DESTDIR=${DESTDIR/conky/conky-cli} + cmake_builddir="cli-build" + do_build + ) +} post_install() { vmkdir etc/conky @@ -27,4 +50,25 @@ post_install() { mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/ rm ${DESTDIR}/usr/share/doc/conky/convert.lua vlicense COPYING + vman conky.1 + ( + DESTDIR=${DESTDIR/conky/conky-cli} + cmake_builddir="cli-build" + do_install + ) +} + +conky-cli_package() { + short_desc="Conky command line without X11 or Wayland" + provides="conky-${version}_${revision}" + conflicts="conky>=0" + pkg_install() { + DESTDIR="${pkgname}-${version}" + mkdir -p ${PKGDESTDIR}/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 COPYING + vman ${wrksrc}/conky.1 + } }