From 0804e6f3816dbefff6599192f263fba8a2c68bc4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Sun, 6 Oct 2019 21:14:03 -0300
Subject: [PATCH] recipes: x-libs/gtk3: switch build system to meson

---
 recipes/x-libs/gtk3/post-install |  6 ++++++
 recipes/x-libs/gtk3/recipe       | 46 ++++++++++++++++++----------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/recipes/x-libs/gtk3/post-install b/recipes/x-libs/gtk3/post-install
index bf6f3b5d..ea7c413b 100644
--- a/recipes/x-libs/gtk3/post-install
+++ b/recipes/x-libs/gtk3/post-install
@@ -13,3 +13,9 @@ unset schema_directory
 # Update GDK pixbuf loaders cache, just in case
 chroot . /usr/bin/gdk-pixbuf-query-loaders --update-cache > /dev/null 2>&1
 
+echo "Updating desktop database: update-desktop-database -q usr/share/applications"
+update-desktop-database -q usr/share/applications
+
+echo "Updating ICON cache: gtk-update-icon-cache -q -f -i usr/share/icons/hicolor"
+gtk-update-icon-cache -q -f -i usr/share/icons/hicolor
+
diff --git a/recipes/x-libs/gtk3/recipe b/recipes/x-libs/gtk3/recipe
index 6563f829..fdce79d3 100644
--- a/recipes/x-libs/gtk3/recipe
+++ b/recipes/x-libs/gtk3/recipe
@@ -55,32 +55,28 @@ build()
     # Set sane permissions
     chmod -R u+w,go-w,a+rX-s .
 
-    ./configure CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS -Wl,--no-keep-memory" \
-     $configure_args \
-     --libdir=/usr/lib${libSuffix} \
+    mkdir -p build
+    cd build
+
+    # TODO: cups: -Dprint_backends="file,lpr,cups"
+
+    CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \
+    meson setup $configure_args \
+     --libdir=lib${libSuffix} \
      --mandir=$mandir \
-     --enable-static=no \
-     --enable-shared=yes \
-     --enable-debug=no \
-     --enable-introspection=yes \
-     --enable-xkb=yes \
-     --enable-xinerama=yes \
-     --enable-xrandr=yes \
-     --enable-xfixes=yes \
-     --enable-xcomposite=yes \
-     --enable-xdamage=yes \
-     --enable-explicit-deps=yes \
-     --enable-broadway-backend \
-     --disable-schemas-compile \
-     --disable-glibtest \
-     --build="$(cc -dumpmachine)"
-
-    make -j${jobs} V=1 \
-     RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false
-
-    make -j${jobs} \
-     RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false \
-     DESTDIR="$destdir" install-strip
+     --buildtype=release \
+     --strip \
+     -Dcolord=no \
+     -Dgtk_doc=false \
+     -Dman=true \
+     -Dbroadway_backend=true \
+     -Dwayland_backend=false \
+     ..
+
+    ninja
+    DESTDIR="$destdir" ninja install
+
+    cd ..
 
     # Add a basic configuration
 cat << EOF > "${destdir}/etc/gtk-3.0/gtkrc"
-- 
2.11.4.GIT