Build system changed from waf to cmake

2 files changed, 22 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6492932badd..a51558d6473f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = xfce4-dockbarx-plugin-git
-	pkgdesc = Embed DockbarX in the xfce4-panel
-	pkgver = 0.6+r65+aa9c974
+	pkgdesc = Embed DockbarX in the xfce4-panel (latest git commit)
+	pkgver = 0.7.1+0+g4fe0feb
 	pkgrel = 1
 	epoch = 1
-	url = https://github.com/m7s/xfce4-dockbarx-plugin
+	url = https://github.com/xuzhen/xfce4-dockbarx-plugin
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
 	license = X11
-	makedepends = git
+	makedepends = cmake
 	makedepends = vala
+	makedepends = git
 	depends = dockbarx>=1.0beta
-	depends = xfce4-panel>=4.12
-	provides = xfce4-dockbarx-plugin=0.6+r65+aa9c974
+	depends = xfce4-panel
+	provides = xfce4-dockbarx-plugin=0.7.1+0+g4fe0feb
 	source = xfce4-dockbarx-plugin::git+https://github.com/xuzhen/xfce4-dockbarx-plugin#branch=pygi-python3
 	sha256sums = SKIP
 
 pkgname = xfce4-dockbarx-plugin-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a0bf7490639f..b5d87c1ee8f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,36 +4,39 @@ _pkgname=xfce4-dockbarx-plugin
 pkgname=${_pkgname}-git
 epoch=1
 _pkgver=0.6
-pkgver=0.6+r65+aa9c974
+pkgver=0.7.1+0+g4fe0feb
 pkgrel=1
-pkgdesc="Embed DockbarX in the xfce4-panel"
+pkgdesc="Embed DockbarX in the xfce4-panel (latest git commit)"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
-url="https://github.com/m7s/xfce4-dockbarx-plugin"
+#url="https://github.com/m7s/xfce4-dockbarx-plugin"
+url="https://github.com/xuzhen/xfce4-dockbarx-plugin"
 license=('X11')
-depends=('dockbarx>=1.0beta' 'xfce4-panel>=4.12')
-makedepends=('git' 'vala')
+depends=('dockbarx>=1.0beta' 'xfce4-panel')
+makedepends=('cmake' 'vala' 'git')
 provides=("${_pkgname}=${pkgver}")
 _branch='pygi-python3'
-source=("${_pkgname}::git+https://github.com/xuzhen/${_pkgname}#branch=${_branch}")
+source=("${_pkgname}::git+${url}#branch=${_branch}")
 sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
-  printf "%s+r%s+%s" "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long --tags | sed 's:^v::;s:-:+:g'
 }
 
 prepare() {
   cd "${srcdir}/${_pkgname}"
-  PREFIX=/usr python ./waf configure
+  [ -d build ] && rm -fr build
+  mkdir build
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}"
-  python ./waf build
+  cd "${srcdir}/${_pkgname}"/build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  make  
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}"
-  DESTDIR="${pkgdir}" python ./waf install
+  cd "${srcdir}/${_pkgname}"/build
+  make DESTDIR="${pkgdir}" install
 }