[arch-commits] Commit in conky/trunk (PKGBUILD)

[Levente Polyak]

    Date: Sunday, March 28, 2021 @ 01:13:05
  Author: anthraxx
Revision: 411139

upgpkg: conky 1.12.1-1

Modified:
  conky/trunk/PKGBUILD

----------+
 PKGBUILD |   74 ++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-28 00:31:10 UTC (rev 411138)
+++ PKGBUILD	2021-03-28 01:13:05 UTC (rev 411139)
@@ -4,7 +4,8 @@
 # Contributor: Partha Chowdhury <kira.laucas at gmail.com>
 
 pkgname=conky
-pkgver=1.11.6
+pkgver=1.12.1
+_gitcommit=7f84662c2c75dd939b27ce7d9fff95bc1070c1e0
 pkgrel=1
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
@@ -11,39 +12,52 @@
 license=('BSD' 'GPL')
 arch=('x86_64')
 makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git')
-depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
-         'imlib2' 'libxml2' 'libpulse' 'libxnvctrl')
-source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz")
-sha512sums=('f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a')
-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)
+source=("git+https://github.com/brndnmtthws/conky.git#commit=${_gitcommit}?signed")
+sha512sums=('SKIP')
+b2sums=('SKIP')
+validpgpkeys=(
+  'EB2E847572A71BE20F59AFBEB49ABB7270D9D4FD' # Brenden Matthews
+)
 
+pkgver() {
+  cd ${pkgname}
+  git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}
+  cmake \
+    -B build \
+    -D CMAKE_BUILD_TYPE=Release \
+    -D MAINTAINER_MODE=ON \
+    -D BUILD_DOCS=ON \
+    -D BUILD_WLAN=ON \
+    -D BUILD_XDBE=ON \
+    -D BUILD_XSHAPE=ON \
+    -D BUILD_IMLIB2=ON \
+    -D BUILD_CURL=ON \
+    -D BUILD_RSS=ON \
+    -D BUILD_NVIDIA=ON \
+    -D BUILD_WEATHER_METAR=ON \
+    -D BUILD_PULSEAUDIO=ON \
+    -D BUILD_JOURNAL=ON \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -Wno-dev \
+    -S .
 
-	cmake \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D MAINTAINER_MODE=ON \
-		-D BUILD_DOCS=ON \
-		-D BUILD_WLAN=ON \
-		-D BUILD_XDBE=ON \
-		-D BUILD_XSHAPE=ON \
-		-D BUILD_IMLIB2=ON \
-		-D BUILD_CURL=ON \
-		-D BUILD_RSS=ON \
-		-D BUILD_NVIDIA=ON \
-		-D BUILD_WEATHER_METAR=ON \
-		-D BUILD_PULSEAUDIO=ON \
-		-D BUILD_JOURNAL=ON \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		.
-
-	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}
+  make -C build DESTDIR="${pkgdir}" install
+  install -Dm 644 COPYING -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
 }
+
+# vim: ts=2 sw=2 et: