From 9edd5e633b39ca4982291f365a44a00d2ad701c5 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackware-id.org>
Date: Sat, 28 Nov 2020 08:04:25 +0700
Subject: [PATCH] cinnamon: Fix build.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
---
 cinnamon/cinnamon.SlackBuild | 38 ++++++++++++++----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/cinnamon/cinnamon.SlackBuild b/cinnamon/cinnamon.SlackBuild
index 4eea100..caaf721 100644
--- a/cinnamon/cinnamon.SlackBuild
+++ b/cinnamon/cinnamon.SlackBuild
@@ -74,34 +74,26 @@ 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 {} \;
 
-# Use cinnamon theme by default
-patch -p1 < $CWD/default-theme.patch
-
 # Patch to use Slackware Logo, thanks to Skaendo
 patch -p1 < $CWD/logo.patch
 
-# Remove broken symlink
-rm files/etc/xdg/menus/cinnamon-applications-merged
-
 patch -p1 < $CWD/7382.patch
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-introspection=yes \
-  --enable-compile-warnings=no \
-  --disable-schemas-compile \
-  --disable-gtk-doc \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
 
 # Use custom Slackware logo
 mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps/