all: switch to meson

2 files changed, 21 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 313f087bf36d..6df11fb32286 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
-# Generated by mksrcinfo v8
-# Tue Jan 22 16:16:31 UTC 2019
 pkgbase = vala-panel-applets-gpl-git
 	pkgdesc = Cyclically spawns a script/program, captures its output and displays the resulting string in the panel
-	pkgver = r9.875f24f
-	pkgrel = 3
+	pkgver = r46.d4c5a6d
+	pkgrel = 1
 	url = https://gitlab.com/vala-panel-project/vala-panel-applets-gpl
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = cmake
 	makedepends = vala
 	makedepends = gtk3
 	makedepends = vala-panel>=0.4.62
 	makedepends = libwnck3
+	makedepends = meson
+	makedepends = ninja
+	makedepends = git
 	source = git+https://gitlab.com/vala-panel-project/vala-panel-applets-gpl.git
-	source = git+https://gitlab.com/vala-panel-project/cmake-vala.git
-	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = vala-panel-applets-xembed-git
diff --git a/PKGBUILD b/PKGBUILD
index f77c6ec995a3..cdce0fa50056 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,24 +6,21 @@ _opts=(
 	-DCMAKE_INSTALL_LIBEXECDIR=lib
 )
 
-makedepends=('cmake' 'vala' 'gtk3' 'vala-panel>=0.4.62' 'libwnck3')
+makedepends=('vala' 'gtk3' 'vala-panel>=0.4.62' 'libwnck3' 'meson' 'ninja' 'git')
 pkgname=(
 'vala-panel-applets-xembed-git'
 'vala-panel-applets-icontasks-git'
 )
 pkgbase=vala-panel-applets-gpl-git
 _pkgbase=vala-panel-applets-gpl
-_cmakename=cmake-vala
-pkgver=r9.875f24f
-pkgrel=3
+pkgver=r46.d4c5a6d
+pkgrel=1
 pkgdesc="Cyclically spawns a script/program, captures its output and displays the resulting string in the panel"
 url="https://gitlab.com/vala-panel-project/vala-panel-applets-gpl"
 arch=('i686' 'x86_64')
 license=('GPL')
-source=("git+https://gitlab.com/vala-panel-project/${_pkgbase}.git"
-        "git+https://gitlab.com/vala-panel-project/${_cmakename}.git")
-sha256sums=('SKIP'
-            'SKIP')
+source=("git+https://gitlab.com/vala-panel-project/${_pkgbase}.git")
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${_pkgbase}"
@@ -33,29 +30,28 @@ pkgver() {
   )
 }
 
-prepare() {
-  cd "${srcdir}/${_cmakename}"
-  cp -r . "${srcdir}/${_pkgbase}/cmake"
-}
-
 build(){
-	cd "${srcdir}/${_pkgbase}"
-	cmake ./ "${_opts[@]}"
-	make
+	meson build "${srcdir}/${_pkgbase}" --prefix=/usr
+	meson compile -C build
 }
 
 package_vala-panel-applets-xembed-git(){
 	pkgdesc="Old XEmbed system tray for vala-panel"
 	depends=('gtk3' 'vala-panel>=0.4.62' 'libx11' 'libxrender')
-	cd "${srcdir}/${_pkgbase}"
-	make -C "xembed" DESTDIR="${pkgdir}" install
+	DESTDIR="${pkgdir}" meson install -C build
+	rm -rf ${pkgdir}/usr/share/{vala-panel-applets,glib-2.0,locale}
+	rm -rf ${pkgdir}/usr/share/vala-panel/applets/{com.solus.icontasks,org.valapanel.flowtasks}.plugin
+	rm -rf ${pkgdir}/usr/lib/vala-panel/applets/{libicontasks,libflowtasks}.so
 }
 
 package_vala-panel-applets-icontasks-git(){
 	pkgdesc="Budgie's icontasks for vala-panel"
 	depends=('gtk3' 'vala-panel>=0.4.62' 'libwnck3')
-	cd "${srcdir}/${_pkgbase}"
-	make -C "icontasks" DESTDIR="${pkgdir}" install
+	DESTDIR="${pkgdir}" meson install -C build
+	rm -rf ${pkgdir}/usr/share/vala-panel-applets
+	rm -rf ${pkgdir}/usr/share/glib-2.0/schemas/org.valapanel.flowtasks.gschema.xml
+	rm -rf ${pkgdir}/usr/share/vala-panel/applets/{org.valapanel.xembed,org.valapanel.flowtasks}.plugin
+	rm -rf ${pkgdir}/usr/lib/vala-panel/applets/{libflowtasks,libxembed}.so
 }