[cygport - the Cygwin packaging tool] branch master, updated. 0.33.1-41-g4d946da

[cygport - the Cygwin packaging tool] branch master, updated. 0.33.1-41-g4d946da

[Yaakov Selkowitz]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=4d946dabbc5913e0fe72b689bb9fb1e17907bcb8

commit 4d946dabbc5913e0fe72b689bb9fb1e17907bcb8
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date:   Sun May 10 13:58:13 2020 -0400

    CI: enable ocaml/dune test

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=d7f0ea1b3a104def44a5acf9e6bea28510613893

commit d7f0ea1b3a104def44a5acf9e6bea28510613893
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date:   Sun May 10 13:57:44 2020 -0400

    testsuite: fix dependencies of python/wheel

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=52fd083e9fd6095e7da4fc989f3ab9053a030103

commit 52fd083e9fd6095e7da4fc989f3ab9053a030103
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date:   Sun May 10 13:49:49 2020 -0400

    CI: re-enable autotools/gtkmm test
    
    glibmm2.4 has been rebuilt with a fix for GCC 9.
    
    This reverts commit d088423b5a306cae18541abd7bf094691ca71f98.


Diff:
---
 .github/workflows/cygwin.yml | 2 ++
 testsuite/python/meson.build | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 0fa4f15..9104dc5 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -63,6 +63,7 @@ jobs:
         libexif-devel,^
         libgdk_pixbuf2.0-devel,^
         libgirepository1.0-devel,^
+        libglibmm2.4-devel,^
         libicu-devel,^
         libkdecore4-devel,^
         libkdecore5-devel,^
@@ -87,6 +88,7 @@ jobs:
         monotone,^
         ninja,^
         ocaml,^
+        ocaml-dune,^
         ocaml-findlib,^
         patch,^
         perl,^
diff --git a/testsuite/python/meson.build b/testsuite/python/meson.build
index 8c554cb..94a48a8 100644
--- a/testsuite/python/meson.build
+++ b/testsuite/python/meson.build
@@ -1,5 +1,6 @@
-pip2 = find_program('pip2', required: false)
-pip3 = find_program('pip3', required: false)
+pip27 = find_program('pip2.7', required: false)
+pip37 = find_program('pip3.7', required: false)
+pip38 = find_program('pip3.8', required: false)
 pygtk2 = find_program('pygtk-codegen-2.0', required: false)
 
 if python2.found()
@@ -10,6 +11,6 @@ if pygtk2.found()
 tests += [['python/pygtk', 480]]
 endif
 
-if pip2.found() and pip3.found()
+if pip27.found() and pip37.found() and pip38.found()
 tests += [['python/wheel']]
 endif