Update with PKGBUILD changes

2 files changed, 42 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75c7f258193b..6bbb2f1b166f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = conky-git
 	pkgdesc = Lightweight system monitor for X (from git)
-	pkgver = 1.12.1.r14.g33aa5060
+	pkgver = 1.12.1.r16.gbb3d66ad
 	pkgrel = 1
 	url = https://github.com/brndnmtthws/conky
 	arch = x86_64
@@ -9,18 +9,27 @@ pkgbase = conky-git
 	makedepends = cmake
 	makedepends = docbook2x
 	makedepends = docbook-xsl
-	makedepends = git
 	makedepends = man-db
-	depends = alsa-lib
-	depends = imlib2
+	makedepends = git
+	depends = glibc
+	depends = glib2
+	depends = lua
+	depends = wireless_tools
 	depends = libxdamage
-	depends = libxft
 	depends = libxinerama
+	depends = libxft
+	depends = imlib2
 	depends = libxml2
-	depends = librsvg
-	depends = lua53
-	depends = tolua++
-	depends = wireless_tools
+	depends = libpulse
+	depends = libxnvctrl
+	depends = systemd-libs
+	depends = ncurses
+	depends = curl
+	depends = libncursesw.so
+	depends = libXNVCtrl.so
+	depends = libsystemd.so
+	depends = libpulse.so
+	depends = libcurl.so
 	provides = conky
 	conflicts = conky
 	source = git+https://github.com/brndnmtthws/conky.git
diff --git a/PKGBUILD b/PKGBUILD
index 8df879f8f074..adfd79e97fb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,18 +5,20 @@
 # Contributor: Partha Chowdhury <kira.laucas@gmail.com>
 
 pkgname=conky-git
-pkgver=1.12.1.r14.g33aa5060
+pkgver=1.12.1.r16.gbb3d66ad
 pkgrel=1
 pkgdesc="Lightweight system monitor for X (from git)"
-arch=('x86_64')
 url="https://github.com/brndnmtthws/conky"
 license=('BSD' 'GPL')
-depends=('alsa-lib' 'imlib2' 'libxdamage' 'libxft' 'libxinerama'
-         'libxml2' 'librsvg' 'lua53' 'tolua++' 'wireless_tools')
-makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'git' 'man-db')
+arch=('x86_64')
+makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git')
+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)
 provides=('conky')
 conflicts=('conky')
-source=("git+$url.git")
+source=("git+https://github.com/brndnmtthws/conky.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -26,36 +28,32 @@ pkgver() {
 
 build() {
   cd conky
-
   cmake \
+    -B build \
     -D CMAKE_BUILD_TYPE=Release \
     -D MAINTAINER_MODE=ON \
-    -D RELEASE=ON \
-    -D BUILD_X11=ON \
-    -D BUILD_CURL=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_IMLIB2=ON \
-    -D BUILD_WLAN=ON \
-    -D BUILD_LUA_CAIRO=ON \
-    -D BUILD_LUA_IMLIB2=ON \
-    -D BUILD_LUA_RSVG=ON \
-    -D BUILD_XSHAPE=ON \
-    -D BUILD_DOCS=ON \
+    -D BUILD_PULSEAUDIO=ON \
+    -D BUILD_JOURNAL=ON \
     -D CMAKE_INSTALL_PREFIX=/usr \
-    .
+    -Wno-dev \
+    -S .
 
-  make
+  make -C build
 }
 
 package() {
   cd conky
-  make DESTDIR="$pkgdir" install
-
-  install -Dt "$pkgdir"/usr/share/licenses/$pkgname -m644 COPYING
-  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
+  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
 }