[gtk-osx] Update gtk-osx-gtkmm.modules

[John Ralls <jralls src gnome org>]

commit ff50dc6de0f020ee7c7ad25363bed6e700009b97
Author: John Ralls <jralls ceridwen us>
Date:   Sat Apr 3 10:58:55 2021 -0700

    Update gtk-osx-gtkmm.modules

 modulesets-stable/gtk-osx-gtkmm.modules            | 154 +++++++++++++--------
 .../gtkmm-3-bad-const-property-background.patch    |  13 ++
 2 files changed, 109 insertions(+), 58 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-gtkmm.modules b/modulesets-stable/gtk-osx-gtkmm.modules
index 808d0a8e..2da9a817 100644
--- a/modulesets-stable/gtk-osx-gtkmm.modules
+++ b/modulesets-stable/gtk-osx-gtkmm.modules
@@ -9,104 +9,142 @@
   <repository type="tarball" name="cairographics"
               href="http://cairographics.org/releases/"/>
 
-  <metamodule id="meta-gtk-osx-gtkmm2">
-    <dependencies>
-      <dep package="gtkmm2"/>
-    </dependencies>
-  </metamodule>
 
-  <metamodule id="meta-gtk-osx-gtkmm3">
+  <meson id="mm-common">
+    <branch module="mm-common/1.0/mm-common-1.0.2.tar.xz" version="1.0.2"
+            hash="sha256:a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d"/>
+  </meson>
+
+  <!-- Libsigc++ was rewritten to use C++17 variadic templates for version 3, and adopting that has created 
substantial API breaks for the whole "mm" stack. gtkmm2 and gtkmm3 use the older versions, gtkmm4 the new 
ones.
+       Note that C++17 is supported only on macOS-10.13 and later.
+  -->
+ <meson id="cairomm-1.14">
+   <branch module="cairomm-1.14.2.tar.xz" version="1.14.2"
+           repo="cairographics"
+           hash="sha256:0126b9cc295dc36bc9c0860d5b720cb5469fd78d5620c8f10cc5f0c07b928de3"/>
     <dependencies>
-      <dep package="gtkmm3"/>
+      <dep package="cairo"/>
     </dependencies>
-  </metamodule>
-
-  <autotools id="mm-common" autogen-sh="configure">
-    <branch module="mm-common/0.9/mm-common-0.9.12.tar.xz" version="0.9.12"
-            hash="sha256:ceffdcce1e5b52742884c233ec604bf6fded12eea9da077ce7a62c02c87e7c0b"/>
-  </autotools>
+ </meson>
 
-  <!-- Cairomm 1.15 has been around since the end of 2016 but they
-       renamed their pc files because of an ABI change and neither
-       pangomm nor gtkmm have adopted the new pc files, so stay with
-       cairomm-1.13. -->
-  <autotools id="cairomm" autogen-sh="configure">
-    <branch module="cairomm-1.13.1.tar.gz" version="1.13.1"
-           hash="sha1:63cd9eab40686f368a8edd3e6912ac18b3048ecf"
-            repo="cairographics">
-      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/cairomm-Bug-100894-Cairomm-compile-failure-if-no-cairo-ft.patch";
 strip="1"/>
-    </branch>
+  <meson id="cairomm">
+    <branch module="cairomm-1.16.0.tar.xz" version="1.16.0"
+            repo="cairographics"
+            hash="sha256:7e881492c5f9f546688c31160deb742c166fc4c68b6b8eb9920c00a0f0f144f9"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
-  </autotools>
+  </meson>
 
-  <autotools id="glibmm" autogen-sh="autoreconf">
+ <autotools id="glibmm-2.4" autogen-sh="autoreconf">
     <branch module="glibmm/2.60/glibmm-2.60.0.tar.xz" version="2.60.0"
-            hash="sha256:a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc">
-    </branch>
+            hash="sha256:a3a1b1c9805479a16c0018acd84b3bfff23a122aee9e3c5013bb81231aeef2bc"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsigc++2"/>
       <dep package="mm-common"/>
     </dependencies>
-  </autotools>
+ </autotools>
+ 
+ <meson id="glibmm">
+    <branch module="glibmm/2.68/glibmm-2.68.0.tar.xz" version="2.68.0"
+            hash="sha256:c1f38573191dceed85a05600888cf4cf4695941f339715bd67d51c2416f4f375">
+    </branch>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libsigc++3"/>
+      <dep package="mm-common"/>
+    </dependencies>
+  </meson>
+
+   <meson id="pangomm-1.4">
+     <branch module="pangomm/2.42/pangomm-2.42.2.tar.xz" version="2.42.2"
+             hash="sha256:1b24c92624ae1275ccb57758175d35f7c39ad3342d8c0b4ba60f0d9849d2d08a"/>
+     <dependencies>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.14"/>
+      <dep package="pango"/>
+    </dependencies>
+   </meson>
 
-  <autotools id="pangomm" autogen-sh="configure">
-    <branch module="pangomm/2.42/pangomm-2.42.0.tar.xz" version="2.42.0"
-            hash="sha256:ca6da067ff93a6445780c0b4b226eb84f484ab104b8391fb744a45cbc7edbf56"/>
+  <meson id="pangomm">
+    <branch module="pangomm/2.48/pangomm-2.48.0.tar.xz" version="2.48.0"
+            hash="sha256:9e0ed474c33f8c2002ca9e2b61ca0d1f3d8e409e09e99f4d8c19eeafccf55b78"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
       <dep package="pango"/>
     </dependencies>
-  </autotools>
+  </meson>
+
+  <meson id="atkmm-1.6">
+    <branch module="atkmm/2.28/atkmm-2.28.1.tar.xz" version="2.28.1"
+            hash="sha256:116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad"/>
+    <dependencies>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.14"/>
+      <dep package="pangomm-1.4"/>
+      <dep package="atk"/>
+    </dependencies>
+  </meson>
 
-  <autotools id="atkmm" autogen-sh="configure">
-    <branch module="atkmm/2.28/atkmm-2.28.0.tar.xz" version="2.28.0"
-           hash="sha256:4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a"/>
+  <meson id="atkmm">
+    <branch module="atkmm/2.36/atkmm-2.36.0.tar.xz" version="2.36.0"
+           hash="sha256:c93fa9f3876536391b54c307a923b7788e79796ace69a5e9141d67398c019973"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atk"/>
     </dependencies>
-  </autotools>
+  </meson>
 
-<!-- libsigc++ depends on doxygen for documentation, but doxygen
-     doesn't build correctly under gtk-osx. It builds fine on its own,
-     of course, and there are OSX binaries available on their
-     website. If you want the docs, install it separately and renable
-     documentation in your jhbuildrc-custom. -->
-  <autotools id="libsigc++2" autogen-sh="configure"
-            autogenargs="--disable-documentation">
-    <branch module="libsigc++/2.10/libsigc++-2.10.2.tar.xz" version="2.10.2"
-            hash="sha256:b1ca0253379596f9c19f070c83d362b12dfd39c0a3ea1dd813e8e21c1a097a98"/>
+  <meson id="libsigc++2" >
+    <branch module="libsigc++/2.10/libsigc++-2.10.6.tar.xz" version="2.10.6"
+            hash="sha256:dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b"/>
+  </meson>
+
+  <meson id="libsigc++3" >
+    <branch module="libsigc++/3.0/libsigc++-3.0.6.tar.xz" version="3.0.6"
+            hash="sha256:b70edcf4611651c54a426e109b17196e1fa17da090592a5000e2d134c03ac5ce"/>
+  </meson>
+
+  <autotools id="gtkmm2" autogen-sh="configure">
+    <branch module="gtkmm/2.24/gtkmm-2.24.5.tar.xz" version="2.24.5"
+            hash="sha256:0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"/>
+    <dependencies>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.14"/>
+      <dep package="pangomm-1.4"/>
+      <dep package="atkmm-1.6"/>
+      <dep package="gtk+-2.0"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="gtkmm3" autogen-sh="configure">
-    <branch module="gtkmm/3.24/gtkmm-3.24.1.tar.xz" version="3.24.1"
-            hash="sha256:ddfe42ed2458a20a34de252854bcf4b52d3f0c671c045f56b42aa27c7542d2fd">
+  <meson id="gtkmm3" >
+    <branch module="gtkmm/3.24/gtkmm-3.24.4.tar.xz" version="3.24.4"
+            hash="sha256:9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743">
+      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtkmm-3-bad-const-property-background.patch"; 
strip="1"/>
     </branch>
     <dependencies>
-      <dep package="glibmm"/>
-      <dep package="cairomm"/>
-      <dep package="pangomm"/>
-      <dep package="atkmm"/>
+      <dep package="glibmm-2.4"/>
+      <dep package="cairomm-1.14"/>
+      <dep package="pangomm-1.4"/>
+      <dep package="atkmm-1.6"/>
       <dep package="gtk+-3.0"/>
     </dependencies>
-  </autotools>
+  </meson>
 
-  <autotools id="gtkmm2" autogen-sh="configure">
-    <branch module="gtkmm/2.24/gtkmm-2.24.5.tar.xz" version="2.24.5"
-            hash="sha256:0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"/>
+  <meson id="gtkmm4">
+    <branch module="gtkmm/4.0/gtkmm-4.0.1.tar.xz" version="4.0.1"
+            hash="sha256:8973d9bc7848e02cb2051e05f3ee3a4baffe2feb4af4a5487f0e3132eec03884"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
-      <dep package="gtk+-2.0"/>
+      <dep package="gtk-4.0"/>
     </dependencies>
-  </autotools>
+  </meson>
 
 </moduleset>
diff --git a/patches/gtkmm-3-bad-const-property-background.patch 
b/patches/gtkmm-3-bad-const-property-background.patch
new file mode 100644
index 00000000..4768b2f9
--- /dev/null
+++ b/patches/gtkmm-3-bad-const-property-background.patch
@@ -0,0 +1,13 @@
+--- a/tests/builder/main.cc    2021-02-23 01:07:04.000000000 -0800
++++ b/tests/builder/main.cc    2021-04-03 10:28:40.000000000 -0700
+@@ -120,7 +120,7 @@
+     }
+   }
+ 
+-  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_background() const { return 
m_property_background.get_proxy(); }
++  //Glib::PropertyProxy_ReadOnly<Glib::ustring> property_background() const { return 
m_property_background.get_proxy(); }
+   Glib::PropertyProxy         <Glib::ustring> property_background()       { return 
m_property_background.get_proxy(); }
+   Glib::ustring get_background() const { return m_property_background.get_value(); }
+   void set_background(const Glib::ustring& background){ m_property_background.set_value(background); }
+
+Diff finished.  Sat Apr  3 10:38:41 2021