1 files changed, 19 insertions, 20 deletions
diff --git a/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild b/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild
index 9b8539d4f2..14ca8c3bf9 100644
--- a/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild
+++ b/desktop/vala-panel-appmenu/vala-panel-appmenu.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vala-panel-appmenu
-VERSION=${VERSION:-20191009_060f7ac}
+VERSION=${VERSION:-0.7.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -70,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -79,25 +79,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-sed -i "s|X11\ WAYLAND|X11|" CMakeLists.txt
-sed -i "s|\ \${WAYLAND_INCLUDE}||" subprojects/appmenu-gtk-module/src/CMakeLists.txt
-mkdir -p build
+mkdir build
 cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DENABLE_XFCE=ON \
-    -DENABLE_BUDGIE=OFF \
-    -DENABLE_VALAPANEL=OFF \
-    -DENABLE_MATE=OFF \
-    -DENABLE_JAYATANA=ON \
-    -DENABLE_UNITY_GTK_MODULE=ON \
-    -DMAKE_BOLD_APPNAME=ON \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dxfce=enabled \
+    -Dbudgie=disabled \
+    -Dmate=disabled \
+    -Djayatana=disabled \
+    -Dstrip=true
+  DESTDIR=$PKG "${NINJA:=ninja}" install
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \