Change dbus fix

Minor edits.

2 files changed, 14 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb24728ffd31..0512f7ab3bfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,18 @@
-# Generated by mksrcinfo v8
-# Sat Jun 24 07:24:25 UTC 2017
 pkgbase = desktopnova
 	pkgdesc = Changes your desktop wallpaper automatically after a preset period of time
 	pkgver = 0.8.1
-	pkgrel = 5
+	pkgrel = 6
 	url = https://launchpad.net/desktopnova
-	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = intltool
 	makedepends = python2
-	depends = gconf
-	depends = gtk-update-icon-cache
+	depends = gtk2
 	depends = libdbusmenu-gtk2
 	depends = libxml2
 	depends = xfconf
 	source = https://launchpad.net/desktopnova/0.8/0.8.1/+download/desktopnova-0.8.1.tar.gz
-	md5sums = f1ce5cc731ddcb999ac09ff8461228b9
+	sha256sums = b408c01a9cdae3308d9b9e67a8076408514d8b70c722144c94bd53bcef4b9375
 
 pkgname = desktopnova
-
diff --git a/PKGBUILD b/PKGBUILD
index 1f23cc910580..d655b73be54c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,16 @@
 
 pkgname=desktopnova
 pkgver=0.8.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Changes your desktop wallpaper automatically after a preset period of time"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://launchpad.net/desktopnova"
 license=('GPL')
-depends=('gconf' 'gtk-update-icon-cache' 'libdbusmenu-gtk2' 'libxml2' 'xfconf')
+#'gconf'
+depends=('gtk2' 'libdbusmenu-gtk2' 'libxml2' 'xfconf')
 makedepends=('cmake' 'intltool' 'python2')
-source=(https://launchpad.net/desktopnova/0.8/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('f1ce5cc731ddcb999ac09ff8461228b9')
+source=("https://launchpad.net/desktopnova/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz")
+sha256sums=('b408c01a9cdae3308d9b9e67a8076408514d8b70c722144c94bd53bcef4b9375')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -19,17 +20,13 @@ prepare() {
 }
 
 build() {
-  cd $pkgname-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-
-  # Fix "dbus-server-bindings.h: No such file or directory"
-  make asciis-to-headers desktopnova-general desktopnova-module
-
-  make
+  # Avoid error "dbus-server-bindings.h: No such file or directory" by disabling tray which requires dbus
+  cmake -B build -S $pkgname-$pkgver -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev \
+                                     -DENABLE_TRAY= -DENABLE_DBUS= -DENABLE_MODULE_GNOME= -DENABLE_MODULE_XFCE=
+  make -C build desktopnova-module-xfce-xfconf
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  make -C build DESTDIR="$pkgdir/" install
 }