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

[John Ralls <jralls src gnome org>]

commit 921d336a5f1c47b29bde3b80dc2ca02f6702c3d1
Author: John Ralls <jralls ceridwen us>
Date:   Fri Apr 2 13:56:08 2021 -0700

    Update gtk-osx-python.modules

 jhbuildrc-gtk-osx                               |  2 +
 modulesets-stable/gtk-osx-python.modules        | 64 +++++++++++--------------
 patches/pygobject-gdesktopappinfo-missing.patch | 19 ++++++++
 patches/pygtk-pango-decls.patch                 | 12 +++++
 4 files changed, 62 insertions(+), 35 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 9d1980af..f6903a7c 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -620,6 +620,8 @@ else:
     environ_append('PYTHONPATH', _python_install_path, ':')
     os.environ['PYTHON'] = sys.executable
 
+module_extra_env["pygtk"] = {'PYTHON':os.path.join(prefix, 'bin', 'python2')}
+module_extra_env["pygobject2"] = {'PYTHON':os.path.join(prefix, 'bin', 'python2')}
 # Unset this so we don't mess with the check for not starting
 # recursively.
 os.unsetenv("JHB")
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index b65b2463..9421602c 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -53,8 +53,8 @@
   <autotools id="python2" autogenargs="--enable-shared"
             supports-non-srcdir-builds="no" autogen-sh="autoreconf">
        <branch repo="python"
-               module="2.7.17/Python-2.7.17.tgz" version="2.7.17"
-               hash="sha256:f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde">
+               module="2.7.18/Python-2.7.18.tgz" version="2.7.18"
+               hash="sha256:da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814">
   <!-- related to https://bugs.python.org/issue11445 -->
   <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/python-ldflags.patch"; strip="1"/>
     </branch>
@@ -64,32 +64,18 @@
   </autotools>
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch repo="python" module="3.8.5/Python-3.8.5.tar.xz" version="3.8.5"
-            hash="md5:35b5a3d0254c1c59be9736373d429db7"
-            />
+    <branch repo="python" module="3.9.2/Python-3.9.2.tar.xz" version="3.9.2"
+            hash="sha256:3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d"/>
     <dependencies>
       <dep package='readline'/>
       <dep package="openssl"/> <!-- For hashlib -->
     </dependencies>
   </autotools>
 
-  <distutils id="pybsddb">
-    <branch module="8d/9b/c3b01ff14e19254b2e031d8ae5ebe472e5523a47acc6f7d49300960d406d/bsddb3-6.2.4.tar.gz"
-           hash="md5:eec77d104c5981366701c6b0de585504" repo="pymodules"
-           version="6.2.4"/>
-    <dependencies>
-      <dep package="python3"/>
-    </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-      <dep package="berkeleydb-nonsrctree"/>
-    </after>
-  </distutils>
-
   <meson id="pycairo">
-    <branch module="/pygobject/pycairo/releases/download/v1.18.1/pycairo-1.18.1.tar.gz" repo="github-tarball"
-            version="1.18.1"
-           hash="sha256:70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786"/>
+    <branch module="/pygobject/pycairo/releases/download/v1.20.0/pycairo-1.20.0.tar.gz" repo="github-tarball"
+            version="1.20.0"
+           hash="sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
@@ -101,6 +87,23 @@
     </after>
   </meson>
 
+  <!-- PyGObject 3.36 is the last version of PyGObject that supports
+       Python2. It's provided here for those laggards who haven't yet
+       migrated their projects to Python3. Don't expect it to stay
+       forever, migrate now! -->
+
+   <meson id="pygobject3-2" >
+    <branch version="3.36.1" module="pygobject/3.36/pygobject-3.36.1.tar.xz"
+           hash="sha256:d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"/>
+    <dependencies>
+      <dep package="pycairo"/>
+    </dependencies>
+    <after>
+      <dep package="python2"/>
+      <dep package="python3"/>
+    </after>
+   </meson>
+
   <!-- PyGObject 3.36 is the last version of PyGObject that supports
        Python2. It's provided here for those laggards who haven't yet
        migrated their projects to Python3. Don't expect it to stay
@@ -119,8 +122,8 @@
    </meson>
 
    <meson id="pygobject3" >
-    <branch version="3.32.2" module="pygobject/3.32/pygobject-3.32.2.tar.xz"
-           hash="sha256:c39ca2a28364b57fa00549c6e836346031e6b886c3ceabfd8ab4b4fed0a83611"/>
+    <branch version="3.40.1" module="pygobject/3.40/pygobject-3.40.1.tar.xz"
+           hash="sha256:00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035"/>
     <dependencies>
       <dep package="pycairo"/>
     </dependencies>
@@ -132,9 +135,9 @@
 
   <autotools id="gtk-mac-integration-python" autogen-sh="configure"
              autogenargs="--enable-python">
-    <branch module="gtk-mac-integration/2.1/gtk-mac-integration-2.1.3.tar.xz"
-            version="2.1.3"
-            hash="sha256:d5f72302daad1f517932194d72967a32e72ed8177cfa38aaf64f0a80564ce454">
+    <branch module="gtk-mac-integration/3.0/gtk-mac-integration-3.0.0.tar.xz"
+            version="3.0.0"
+            hash="sha256:af88bb3a284e24c550e15290e07e562fcd2a038ebb0fcc863dd069d3738952ae">
     </branch>
     <dependencies>
     </dependencies>
@@ -144,13 +147,4 @@
     </after>
   </autotools>
 
-  <autotools id="pygtk-extras" autogen-sh="configure">
-    <branch module="gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2"
-           version="2.25.3"/>
-    <dependencies>
-      <dep package="pygtk"/>
-      <dep package="gtkspell"/>
-    </dependencies>
-  </autotools>
-
 </moduleset>
diff --git a/patches/pygobject-gdesktopappinfo-missing.patch b/patches/pygobject-gdesktopappinfo-missing.patch
index 123084e0..6d7e6a21 100644
--- a/patches/pygobject-gdesktopappinfo-missing.patch
+++ b/patches/pygobject-gdesktopappinfo-missing.patch
@@ -327,3 +327,22 @@ index aebc6fca..08e27e92 100644
  #include <gio/gunixinputstream.h>
  #include <gio/gunixmounts.h>
  #include <gio/gunixoutputstream.h>
+--- a/gio/unix.c       2021-04-01 18:13:18.000000000 -0700
++++ b/gio/unix.c       2021-04-01 18:20:45.000000000 -0700
+@@ -648,6 +648,7 @@
+ static PyObject *
+ _wrap_g_desktop_app_info_set_desktop_env(PyObject *self, PyObject *args, PyObject *kwargs)
+ {
++#ifndef __APPLE__
+     static char *kwlist[] = { "desktop_env", NULL };
+     char *desktop_env;
+ 
+@@ -655,7 +656,7 @@
+         return NULL;
+     
+     g_desktop_app_info_set_desktop_env(desktop_env);
+-    
++#endif
+     Py_INCREF(Py_None);
+     return Py_None;
+ }
diff --git a/patches/pygtk-pango-decls.patch b/patches/pygtk-pango-decls.patch
new file mode 100644
index 00000000..4dcfdb28
--- /dev/null
+++ b/patches/pygtk-pango-decls.patch
@@ -0,0 +1,12 @@
+--- a/pango.override   2011-04-01 03:37:25.000000000 -0700
++++ b/pango.override   2021-04-02 11:54:31.000000000 -0700
+@@ -31,6 +31,9 @@
+     PyObject *func, *data;
+ } PyGtkCustomNotify;
+ 
++extern PangoFontMetrics* pango_font_metrics_new(void);
++extern const char* pango_font_map_get_shape_engine_type(PangoFontMap*);
++
+ #ifndef PANGO_TYPE_LAYOUT_LINE
+ # define PANGO_TYPE_LAYOUT_LINE pypango_layout_line_get_type()
+