GNOME.org
 

[gtk-osx] Regularize & clean up gtk-osx-python.modules

commit c8d3afd4ee191b5b7da371dee0334244d0f2e719
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 1 11:12:03 2016 -0800

    Regularize & clean up gtk-osx-python.modules
    
    Change python2.7 to python in modulesets-unstable so that it's like the
    other two.
    Remove pycairo from modulesets stable and modulesets, renaming
    pycairo-python2.6 to py2cairo and pycairo-python3 to pycairo, reflecting
    modulesets-unstable and the reality of pycairo's repository and
    tarballs.

 modulesets-stable/gtk-osx-python.modules      |   29 ++++-------------
 modulesets-unstable/gtk-osx-bootstrap.modules |    2 +-
 modulesets-unstable/gtk-osx-python.modules    |   26 +++++++++++----
 modulesets-unstable/gtk-osx-random.modules    |    2 +-
 modulesets-unstable/gtk-osx.modules           |    2 +-
 modulesets/gtk-osx-python.modules             |   41 +++++++++----------------
 6 files changed, 44 insertions(+), 58 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index fd3a81c..b2c4c5f 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -16,7 +16,7 @@
 
   <metamodule id="meta-gtk-osx-python">
     <dependencies>
-      <dep package="pycairo-python2.6"/>
+      <dep package="py2cairo"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
       <dep package="gtk-mac-integration-python"/>
@@ -26,7 +26,7 @@
   <metamodule id="meta-gtk-osx-python-gtk3">
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="pycairo-python2.6"/>
+      <dep package="py2cairo"/>
       <dep package="pygobject3"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
@@ -35,7 +35,7 @@
   <metamodule id="meta-gtk-osx-python3-gtk3">
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="pycairo-python3"/>
+      <dep package="pycairo"/>
       <dep package="pygobject3"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
@@ -109,23 +109,8 @@
     </after>
   </distutils>
 
-<!-- Pycairo 1.8.4+ requires Python 2.6. Leopard comes only with 2.5,
-     so pycairo is by default held at 1.8.2. Use pycairo-python2.6 if
-     you want a more recent version. -->
-  <autotools id="pycairo" autogen-sh="configure">
-    <branch module="pycairo-1.8.2.tar.gz" repo="cairographics.org"
-            version="1.8.2" md5sum="bbfc0c2fef08dfb0c5b8baa5f0b67a87"/>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-    <after>
-      <dep package="python"/>
-     <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
-
 <!-- Cairographics have changed the name to py2cairo for python 2 holdouts. -->
-  <waf id="pycairo-python2.6">
+  <waf id="py2cairo">
     <branch module="py2cairo-1.10.0.tar.bz2" repo="cairographics.org"
             version="1.10.0"
            hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb">
@@ -141,8 +126,8 @@
     </after>
   </waf>
 
-<!-- Pycairo-python3 for those who've made the leap. -->
-  <waf id="pycairo-python3" autogen-sh="configure" python-command="python3">
+<!-- Pycairo is for those who've made the leap. -->
+  <waf id="pycairo" autogen-sh="configure" python-command="python3">
     <branch module="pycairo-1.10.0.tar.bz2" repo="cairographics.org"
             version="1.10.0"
            hash="sha1:b4283aa1cc9aafd12fd72ad371303a486da1d014"/>
@@ -194,7 +179,7 @@
     <dependencies>
       <dep package="pygobject"/>
       <dep package="meta-gtk-osx-core"/>
-      <dep package="pycairo-python2.6"/>
+      <dep package="py2cairo"/>
     </dependencies>
     <after>
       <dep package="libglade"/>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 60b9583..5f0e193 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -67,7 +67,7 @@
   <autotools id="libxml2" autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
     <branch repo="git.gnome.org"/>
     <after>
-      <dep package="python2.7"/>
+      <dep package="python"/>
       <dep package="python3"/>
     </after>
   </autotools>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 1fd5331..42b8a44 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -16,6 +16,7 @@
 
   <metamodule id="meta-gtk-osx-python">
     <dependencies>
+      <dep package="meta-gtk-osx-core"/>
       <dep package="py2cairo"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
@@ -26,12 +27,22 @@
   <metamodule id="meta-gtk-osx-python-gtk3">
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="py2cairo"/>
       <dep package="pygobject3"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
   </metamodule>
 
-<!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
+  <metamodule id="meta-gtk-osx-python3-gtk3">
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="pycairo"/>
+      <dep package="pygobject3"/>
+      <dep package="gtk-mac-integration-python"/>
+    </dependencies>
+  </metamodule>
+
+  <!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
    <autotools id="berkeleydb4.8" autogen-sh="dist/configure"
          autogen-template="cd .;cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s" 
makeargs="-C build_unix"
          makeinstallargs="-C build_unix install"
@@ -44,7 +55,7 @@
   </autotools>
 
 <!-- Python-2.7.5's hashlib doesn't build correctly with gcc-4.2, though it does fine with Clang (and 
probably later gccs as well). -->
-  <autotools id="python2.7" autogenargs="--enable-shared" supports-non-srcdir-builds="no"
+  <autotools id="python" autogenargs="--enable-shared" supports-non-srcdir-builds="no"
             autogen-sh="configure">
     <branch repo="python"
            module="2.7.11/Python-2.7.11.tar.xz" version="2.7.11">
@@ -109,7 +120,7 @@
       <dep package="cairo"/>
     </dependencies>
     <after>
-      <dep package="python2.7"/>
+      <dep package="python"/>
       <dep package="meta-gtk-osx-core"/>
       <dep package="meta-gtk-osx-gtk3"/>
     </after>
@@ -121,7 +132,7 @@
       <dep package="cairo"/>
     </dependencies>
     <after>
-      <dep package="python2.7"/>
+      <dep package="python3"/>
       <dep package="meta-gtk-osx-core"/>
       <dep package="meta-gtk-osx-gtk3"/>
     </after>
@@ -131,7 +142,7 @@
             supports-non-srcdir-builds="no">
     <branch revision="pygobject-2-28"/>
     <dependencies>
-      <dep package="python2.7"/>
+      <dep package="python"/>
       <dep package="meta-gtk-osx-core"/>
    </dependencies>
   </autotools>
@@ -139,9 +150,9 @@
   <autotools id="pygobject3" >
     <branch module="pygobject" checkoutdir="pygobject3"/>
     <dependencies>
-      <dep package="py2cairo"/>
-      <dep package="python2.7"/>
+      <dep package="pycairo"/>
       <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="python3"/>
    </dependencies>
   </autotools>
 
@@ -172,6 +183,7 @@
       <dep package="gtk+"/>
       <dep package="gtk+-3.0"/>
       <dep package="pygobject"/>
+      <dep package="pygobject3"/>
     </after>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 3fe3190..dc5dc80 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -166,7 +166,7 @@
            repo="dbus.freedesktop.org">
     </branch>
     <dependencies>
-      <dep package="python2.7"/>
+      <dep package="python"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 2c1af94..32689c5 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -97,7 +97,7 @@
       <dep package="cairo"/>
     </dependencies>
     <after>
-      <dep package='python2.7'/>
+      <dep package='python'/>
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 436b739..394c26c 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -19,7 +19,8 @@
 
   <metamodule id="meta-gtk-osx-python">
     <dependencies>
-      <dep package="pycairo-python2.6"/>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="py2cairo"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
       <dep package="gtk-mac-integration-python"/>
@@ -29,7 +30,16 @@
   <metamodule id="meta-gtk-osx-python-gtk3">
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="pycairo-python2.6"/>
+      <dep package="py2cairo"/>
+      <dep package="pygobject3"/>
+      <dep package="gtk-mac-integration-python"/>
+    </dependencies>
+  </metamodule>
+
+  <metamodule id="meta-gtk-osx-python3-gtk3">
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="pycairo"/>
       <dep package="pygobject3"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
@@ -76,29 +86,8 @@
     </after>
   </autotools>
 
- <!-- Pycairo 1.8.4+ requires Python 2.6. Leopard comes only with 2.5,
-     so pycairo is by default held at 1.8.2. Use pycairo-python2.6 if
-     you want a more recent version. -->
-<!-- PyCairo moved their repo from cvs.freedesktop.org to
-     git.freedesktop.org after the release of 1.8.6 without copying
-     history, so releases before that are available only as
-     tarballs. Moreover, they don't use branches nor do they
-     tag. There's no point in using repos here, so we don't. -->
-  <autotools id="pycairo" autogen-sh="configure">
-    <branch module="pycairo-1.8.2.tar.gz" repo="cairographics"
-            version="1.8.2" md5sum="bbfc0c2fef08dfb0c5b8baa5f0b67a87"/>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-    <after>
-      <dep package="python"/>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
-
 <!-- Cairographics have changed the name to py2cairo for python 2 holdouts. -->
-<!-- They also broke configure (left install-sh out of the tarball) but waf works -->
-  <waf id="pycairo-python2.6">
+  <waf id="py2cairo">
     <branch module="py2cairo-1.10.0.tar.bz2" repo="cairographics"
             version="1.10.0"
             hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb">
@@ -115,7 +104,7 @@
   </waf>
 
 <!-- Pycairo-python3 for those who've made the leap. -->
-  <waf id="pycairo-python3" python-command="python3">
+  <waf id="pycairo" python-command="python3">
     <branch module="pycairo-1.10.0.tar.bz2" repo="cairographics"
             version="1.10.0"
            hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb"/>
@@ -167,7 +156,7 @@
     <dependencies>
       <dep package="pygobject"/>
       <dep package="meta-gtk-osx-core"/>
-      <dep package="pycairo-python2.6"/>
+      <dep package="py2cairo"/>
     </dependencies>
     <after>
       <dep package="libglade"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]