From 96d9a8d1fdd397b5a42453d90185cf78a2c2383c Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Tue, 3 May 2022 01:25:00 -0400
Subject: [conky]: upgrade to v1.12.2

---
 libre/conky/PKGBUILD | 70 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 21 deletions(-)

(limited to 'libre/conky/PKGBUILD')

diff --git a/libre/conky/PKGBUILD b/libre/conky/PKGBUILD
index df5d9f282..db7e6149f 100644
--- a/libre/conky/PKGBUILD
+++ b/libre/conky/PKGBUILD
@@ -1,30 +1,53 @@
-# Maintainer: Freemor <freemor2freemor.ca>
-# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Partha Chowdhury <kira.laucas@gmail.com>
+# Maintainer: Freemor <freemor2freemor.ca>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+
+# parabola changes and rational:
+#  - arch package depends on blacklisted 'libxnvctrl'
+#  - arch package is built from VCS
+#  - FTBS with glibc 2.34 - add 'MAINTAINER_MODE=OFF' cmake option
+#    https://github.com/brndnmtthws/conky/issues/1179
 
-# Rational: Remove nonfree libxnvcrtl depend
 
 pkgname=conky
-pkgver=1.11.5
-pkgrel=3
+pkgver=1.12.2
+pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
-license=('BSD' 'GPL')
-arch=('x86_64' 'i686' 'armv7h')
+license=('BSD' 'GPL3' 'ISC' 'LGPL')
+arch=('x86_64')
+arch+=('armv7h' 'i686')
 makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git')
-depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
-         'imlib2' 'libxml2' 'libpulse')
-source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz")
-sha256sums=('4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13')
-options=('!strip' 'debug')
+depends=(
+  'glibc' 'glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' 'imlib2'
+  'libxml2' 'libpulse' 'libxnvctrl' 'systemd-libs' 'ncurses' 'curl'
+  libncursesw.so libXNVCtrl.so libsystemd.so libpulse.so libcurl.so)
+depends=( ${depends[*]/libxnvctrl/} )
+depends=( ${depends[*]/libXNVCtrl.so/} )
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz")
+sha512sums=('55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a')
+b2sums=('b8d1b40dc4b547679b5ab4bf0328aabaac868025433729f48baf572c536da4a527a073a6d47f36c179851aecef58535dccb956e3a695700f06bf8e6ab170ae1f')
+validpgpkeys=(
+  'EB2E847572A71BE20F59AFBEB49ABB7270D9D4FD' # Brenden Matthews
+)
 
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+mksource() {
+  cd ${pkgname}-${pkgver}
+
+  # prepare missing ISC license
+  head  -n 17 src/prss.h > LICENSE.ISC
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
 	cmake \
+    -B build \
 		-D CMAKE_BUILD_TYPE=Release \
 		-D MAINTAINER_MODE=ON \
 		-D BUILD_DOCS=ON \
@@ -34,19 +57,24 @@ build() {
 		-D BUILD_IMLIB2=ON \
 		-D BUILD_CURL=ON \
 		-D BUILD_RSS=ON \
+    -D BUILD_NVIDIA=OFF \
 		-D BUILD_WEATHER_METAR=ON \
 		-D BUILD_PULSEAUDIO=ON \
 		-D BUILD_JOURNAL=ON \
 		-D CMAKE_INSTALL_PREFIX=/usr \
-		.
+    -D MAINTAINER_MODE=OFF \
+    -Wno-dev \
+    -S .
 
-	make
+  make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
-	install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
+  cd ${pkgname}-${pkgver}
+  make -C build DESTDIR="${pkgdir}" install
+  install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 644 LICENSE.BSD -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 644 LICENSE.ISC -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 644 extras/vim/syntax/conkyrc.vim -t "${pkgdir}"/usr/share/vim/vimfiles/syntax
+  install -Dm 644 extras/vim/ftdetect/conkyrc.vim -t "${pkgdir}"/usr/share/vim/vimfiles/ftdetect
 }
-- 
cgit v1.2.3