extra/conky to 1.18.1-2

extra/conky/PKGBUILD

@@ -11,20 +11,51 @@
 
 pkgname=conky
 pkgver=1.18.1
-_gitcommit=a21a8f7d26f07f1dc5c144be2120e8bc6721159f
+_gitcommit=87858b6ae8f0b5e195faec5c79048ac4171bfc30  # refs/tags/v1.18.1
-pkgrel=1
+pkgrel=2
-pkgdesc='Lightweight system monitor for X'
+pkgdesc='Light-weight system monitor for X, Wayland, and other things, too'
 url='https://github.com/brndnmtthws/conky'
-license=('BSD' 'GPL')
+license=(
+  'BSD-3-Clause'
+  'GPL-3.0-or-later'
+)
 arch=('x86_64')
-makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git' 'catch2' 'python-yaml' 'python-jinja')
+makedepends=(
+  'catch2'
+  'cmake'
+  'docbook2x'
+  'docbook-xsl'
+  'git'
+  'man-db'
+  'python-yaml'
+  'python-jinja'
+  'wayland-protocols'
+)
 depends=(
-  'glibc' 'glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' 'imlib2'
+  'cairo'
-  'libxml2' 'libpulse' 'systemd-libs' 'ncurses' 'curl'
+  'curl' libcurl.so
-  libncursesw.so libsystemd.so libpulse.so libcurl.so)
+  'fontconfig'
-#source=("git+https://github.com/brndnmtthws/conky.git#commit=${_gitcommit}?signed")
+  'gcc-libs'
-#v1.17.0 commit not signed
+  'glib2'
-source=("git+https://github.com/brndnmtthws/conky.git#tag=v$pkgver?signed")
+  'glibc'
+  'hicolor-icon-theme'
+  'imlib2'
+  'libpulse' libpulse.so
+  'libx11'
+  'libxdamage'
+  'libxext'
+  'libxfixes'
+  'libxft'
+  'libxinerama'
+  'libxml2'
+  'lua'
+  'ncurses' libncursesw.so
+  'pango'
+  'systemd-libs' libsystemd.so
+  'wayland'
+  'wireless_tools'
+)
+source=("git+$url.git#tag=${_gitcommit}?signed")
 sha512sums=('SKIP')
 b2sums=('SKIP')
 validpgpkeys=(
@@ -61,6 +92,7 @@ build() {
     -D BUILD_RSS=ON \
     -D BUILD_PULSEAUDIO=ON \
     -D BUILD_JOURNAL=ON \
+    -D BUILD_WAYLAND=ON \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -Wno-dev \
     -S .