[gtk-osx] Change pycairo and pygobject3 to build with meson.



commit 93bcabedb5188221965a36b30a8d1642358721a7
Author: John Ralls <jralls ceridwen us>
Date:   Tue Apr 7 12:20:40 2020 -0700

    Change pycairo and pygobject3 to build with meson.
    
    Because distutils doesn't work anymore.

 modulesets-stable/gtk-osx-python.modules   |  8 ++++----
 modulesets-unstable/gtk-osx-python.modules |  8 ++++----
 modulesets/gtk-osx-python.modules          | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 573103d..8f4abbb 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -118,7 +118,7 @@
     </after>
   </distutils>
 
-  <distutils id="pycairo" autogen-sh="configure" python-command="python3">
+  <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"/>
@@ -132,7 +132,7 @@
       <dep package="meta-gtk-osx-gtk3.14"/>
       <dep package="meta-gtk-osx-core"/>
     </after>
-  </distutils>
+  </meson>
 
 <!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation
      with later versions it installs as pygobject2 and PyGObject 3
@@ -155,7 +155,7 @@
     </after>
   </autotools>
 
-   <distutils id="pygobject3" >
+   <meson id="pygobject3" >
     <branch version="3.32.2" module="pygobject/3.32/pygobject-3.32.2.tar.xz"
            hash="sha256:c39ca2a28364b57fa00549c6e836346031e6b886c3ceabfd8ab4b4fed0a83611"/>
     <dependencies>
@@ -165,7 +165,7 @@
       <dep package="python"/>
       <dep package="python3"/>
     </after>
-   </distutils>
+   </meson>
 
 <!-- Pygtk is discontinued, this is the last release -->
  <autotools id="pygtk" autogen-sh="configure"
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 1d518a9..d1c8f8b 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -101,7 +101,7 @@
     </after>
   </distutils>
 
- <distutils id="pycairo" >
+ <meson id="pycairo" >
     <branch module="pygobject/pycairo" repo="github" />
     <dependencies>
       <dep package="cairo"/>
@@ -112,7 +112,7 @@
       <dep package="meta-gtk-osx-core"/>
       <dep package="meta-gtk-osx-gtk3"/>
     </after>
- </distutils>
+ </meson>
 
   <autotools id="pygobject" autogenargs="--disable-introspection"
             supports-non-srcdir-builds="no">
@@ -123,7 +123,7 @@
    </dependencies>
   </autotools>
 
-  <distutils id="pygobject3" >
+  <meson id="pygobject3" >
     <branch module="pygobject" checkoutdir="pygobject3"/>
     <dependencies>
       <dep package="pycairo"/>
@@ -133,7 +133,7 @@
      <dep package="python3"/>
       <dep package="python"/>
    </after>
-  </distutils>
+  </meson>
 
   <autotools id="pygtk" autogenargs="--disable-introspection">
     <branch />
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 705ab90..c8c31cd 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -118,7 +118,7 @@
     </dependencies>
   </distutils>
 
-  <distutils id="pycairo" autogen-sh="configure" python-command="python3">
+  <meson id="pycairo">
     <branch module="pygobject/pycairo" repo="github"/>
     <dependencies>
       <dep package="cairo"/>
@@ -129,7 +129,7 @@
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="meta-gtk-osx"/>
     </after>
-  </distutils>
+  </meson>
 
   <autotools id="pygobject" autogenargs="--disable-introspection">
     <branch tag="pygobject-2-28"/>
@@ -141,8 +141,8 @@
     </after>
   </autotools>
 
-  <distutils id="pygobject3">
-    <branch tag="pygobject-3-28" module="pygobject" checkoutdir="pygobject3"/>
+  <meson id="pygobject3">
+    <branch tag="pygobject-3-32" module="pygobject" checkoutdir="pygobject3"/>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
     </dependencies>
@@ -150,7 +150,7 @@
       <dep package="python"/>
       <dep package="python3"/>
     </after>
-  </distutils>
+  </meson>
 
 <!-- PyGtk is discontinued. -->
   <autotools id="pygtk" autogenargs="--disable-introspection">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]