From 6a3e81bf5492c61dfe14b5e1485b9adb034ce4e8 Mon Sep 17 00:00:00 2001
From: Daniel Lang <dalang@gmx.at>
Date: Tue, 9 May 2023 14:47:20 +0200
Subject: [PATCH] package/gtkmm3: bump to version 3.24.7

https://gitlab.gnome.org/GNOME/gtkmm/-/blob/3.24.7/NEWS

README [0] states:

    It's easiest to build with Meson, if the tarball was made with Meson,
    and to build with Autotools, if the tarball was made with Autotools.
    Then you don't have to use maintainer-mode.
    How do you know how the tarball was made? If it was made with Meson,
    it contains files in untracked/gdk/gdkmm/, untracked/gtk/gtkmm/ and
    other subdirectories of untracked/.

This is the case, therefore switch to meson build system.

gtkmm3 tries to detect if X11 is enabled for gtk.
Switch to explicit definition to be safe.

Also disable tests and demos.

[0]: https://gitlab.gnome.org/GNOME/gtkmm/-/blob/3.24.7/README

Signed-off-by: Daniel Lang <dalang@gmx.at>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
 package/gtkmm3/gtkmm3.hash |  4 ++--
 package/gtkmm3/gtkmm3.mk   | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/package/gtkmm3/gtkmm3.hash b/package/gtkmm3/gtkmm3.hash
index fc7e33339e..c54862de67 100644
--- a/package/gtkmm3/gtkmm3.hash
+++ b/package/gtkmm3/gtkmm3.hash
@@ -1,5 +1,5 @@
-# From https://download.gnome.org/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum
-sha256  05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5  gtkmm-3.22.0.tar.xz
+# From https://download.gnome.org/sources/gtkmm/3.24/gtkmm-3.24.7.sha256sum
+sha256  1d7a35af9c5ceccacb244ee3c2deb9b245720d8510ac5c7e6f4b6f9947e6789c  gtkmm-3.24.7.tar.xz
 # Locally computed
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING.tools
diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk
index 8bbcf224e6..f5a2fee6b9 100644
--- a/package/gtkmm3/gtkmm3.mk
+++ b/package/gtkmm3/gtkmm3.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GTKMM3_VERSION_MAJOR = 3.22
-GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0
+GTKMM3_VERSION_MAJOR = 3.24
+GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).7
 GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz
 GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR)
 GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
@@ -13,4 +13,14 @@ GTKMM3_LICENSE_FILES = COPYING COPYING.tools
 GTKMM3_INSTALL_STAGING = YES
 GTKMM3_DEPENDENCIES = atkmm2_28 cairomm1_14 glibmm2_66 libgtk3 libsigc2 pangomm2_46 host-pkgconf
 
-$(eval $(autotools-package))
+GTKMM3_CONF_OPTS = \
+	-Dbuild-demos=false \
+	-Dbuild-tests=false
+
+ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
+GTKMM3_CONF_OPTS += -Dbuild-x11-api=true
+else
+GTKMM3_CONF_OPTS += -Dbuild-x11-api=false
+endif
+
+$(eval $(meson-package))