GNOME.org
 

[gtk-osx] Rename modules involving python2 and gtk2

commit c7a2a73561fecd1e5b211ed256da75d2b9a052d1
Author: John Ralls <jralls ceridwen us>
Date:   Fri Apr 2 13:51:23 2021 -0700

    Rename modules involving python2 and gtk2
    
    These used to be a sort of default, where python meant python2 and gtk+
    meant gtk2. That doesn't make sense now that both are no longer
    supported, so rename the modules and the associated metamodules.
    
    python -> python2
    gtk+ -> gtk+-2.0
    gtkmm -> gtkmm2
    meta-gtk-osx-python -> meta-gtk-osx-python2-gtk2
    meta-gtk-osx-python-gtk3 -> meta-gtk-osx-python2-gtk3
    meta-gtk-osx-core -> meta-gtk-osx-gtk2

 modulesets-stable/gtk-osx-bootstrap.modules     |  2 +-
 modulesets-stable/gtk-osx-gtkmm.modules         |  8 ++++----
 modulesets-stable/gtk-osx-javascript.modules    |  2 +-
 modulesets-stable/gtk-osx-network.modules       |  2 +-
 modulesets-stable/gtk-osx-python.modules        | 21 +++++++++++----------
 modulesets-stable/gtk-osx-random.modules        | 16 ++++++++--------
 modulesets-stable/gtk-osx-themes.modules        |  2 +-
 modulesets-stable/gtk-osx-unsupported.modules   |  2 +-
 modulesets-stable/gtk-osx.modules               | 11 ++++++-----
 modulesets-unstable/gtk-osx-gtkmm.modules       | 12 ++++++------
 modulesets-unstable/gtk-osx-network.modules     |  2 +-
 modulesets-unstable/gtk-osx-python.modules      | 12 ++++++------
 modulesets-unstable/gtk-osx-random.modules      | 16 ++++++++--------
 modulesets-unstable/gtk-osx-themes.modules      |  2 +-
 modulesets-unstable/gtk-osx-unsupported.modules |  2 +-
 modulesets-unstable/gtk-osx.modules             | 10 +++++-----
 modulesets/gtk-osx-gtkmm.modules                | 10 +++++-----
 modulesets/gtk-osx-network.modules              |  2 +-
 modulesets/gtk-osx-python.modules               |  8 ++++----
 modulesets/gtk-osx-random.modules               | 18 +++++++++---------
 modulesets/gtk-osx-themes.modules               |  2 +-
 modulesets/gtk-osx-unsupported.modules          |  2 +-
 modulesets/gtk-osx.modules                      | 10 +++++-----
 23 files changed, 88 insertions(+), 86 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 671c4dc1..6057f750 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -68,7 +68,7 @@
             hash="sha256:94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"
            repo="xmlsoft.org"/>
     <after>
-      <dep package="python"/>
+      <dep package="python2"/>
       <dep package="python3"/>
     </after>
   </autotools>
diff --git a/modulesets-stable/gtk-osx-gtkmm.modules b/modulesets-stable/gtk-osx-gtkmm.modules
index b96cd1bd..808d0a8e 100644
--- a/modulesets-stable/gtk-osx-gtkmm.modules
+++ b/modulesets-stable/gtk-osx-gtkmm.modules
@@ -9,9 +9,9 @@
   <repository type="tarball" name="cairographics"
               href="http://cairographics.org/releases/"/>
 
-  <metamodule id="meta-gtk-osx-gtkmm">
+  <metamodule id="meta-gtk-osx-gtkmm2">
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm2"/>
     </dependencies>
   </metamodule>
 
@@ -97,7 +97,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtkmm" autogen-sh="configure">
+  <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>
@@ -105,7 +105,7 @@
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-stable/gtk-osx-javascript.modules b/modulesets-stable/gtk-osx-javascript.modules
index cf9efbff..fcab60b3 100644
--- a/modulesets-stable/gtk-osx-javascript.modules
+++ b/modulesets-stable/gtk-osx-javascript.modules
@@ -38,7 +38,7 @@
       <dep package="nspr"/>
     </dependencies>
     <after>
-      <dep package="python"/>
+      <dep package="python2"/>
       <dep package="zlib"/>
     </after>
   </autotools>
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 84471a66..d1c8614e 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -20,7 +20,7 @@
   <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
   <metamodule id="meta-gtk-osx-webkit">
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="webkit"/>
     </dependencies>
   </metamodule>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index b6cef854..503bda1e 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -16,19 +16,19 @@
   <repository type="tarball" name="github-tarball"
               href="https://github.com"/>
 
-  <metamodule id="meta-gtk-osx-python">
+  <metamodule id="meta-gtk-osx-python2-gtk2">
     <dependencies>
       <dep package="pycairo"/>
-      <dep package="pygobject"/>
+      <dep package="pygobject2"/>
       <dep package="pygtk"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
   </metamodule>
 
-  <metamodule id="meta-gtk-osx-python-gtk3">
+  <metamodule id="meta-gtk-osx-python2-gtk3">
     <dependencies>
       <dep package="pycairo"/>
-      <dep package="pygobject3"/>
+      <dep package="pygobject3-2"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
     <after>
@@ -125,7 +125,7 @@
     </dependencies>
     <after>
       <dep package="python3"/>
-      <dep package="python"/>
+      <dep package="python2"/>
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="meta-gtk-osx-gtk2"/>
     </after>
@@ -135,7 +135,7 @@
      with later versions it installs as pygobject2 and PyGObject 3
      installs as pygobject3. Introspection is disabled here, because
      gir-scanner isn't smart enough to co-install them. -->
-  <autotools id="pygobject" autogen-sh="configure"
+  <autotools id="pygobject2" autogen-sh="configure"
             autogenargs="--disable-introspection"
             supports-non-srcdir-builds="no">
     <branch version="2.28.7" module="pygobject/2.28/pygobject-2.28.7.tar.xz"
@@ -145,10 +145,10 @@
                      strip="1"/>
     </branch>
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </dependencies>
     <after>
-      <dep package="python"/>
+      <dep package="python2"/>
     </after>
   </autotools>
 
@@ -159,7 +159,7 @@
       <dep package="pycairo"/>
     </dependencies>
     <after>
-      <dep package="python"/>
+      <dep package="python2"/>
       <dep package="python3"/>
     </after>
    </meson>
@@ -171,10 +171,11 @@
             hash="sha256:cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/pygtk-libtool.patch"; strip="1"/>
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/pygtk-pango1.4x.patch"; 
strip="1"/>
+      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/pygtk-pango-decls.patch"; 
strip="1"/>
     </branch>
     <dependencies>
       <dep package="pygobject"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="pycairo"/>
     </dependencies>
     <after>
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 38811ae2..10bdf755 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -50,7 +50,7 @@ Libglade itself is deprecated. This is the last release. -->
     </branch>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -60,7 +60,7 @@ Libglade itself is deprecated. This is the last release. -->
             hash="sha256:13f4a3f99d983bf76e8d9dd736021ecc95f53ec1f9582423aa4b4be87455aa07"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -72,7 +72,7 @@ Libglade itself is deprecated. This is the last release. -->
       <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libunique-663913-sockaddr-un.patch"; 
strip="1"/>
     </branch>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
     </dependencies>
   </autotools>
 
@@ -86,7 +86,7 @@ Libglade itself is deprecated. This is the last release. -->
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
     <dependencies>
       <dep package="WebKit"/>
@@ -120,7 +120,7 @@ Libglade itself is deprecated. This is the last release. -->
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -150,7 +150,7 @@ Libglade itself is deprecated. This is the last release. -->
     </branch>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -201,7 +201,7 @@ Libglade itself is deprecated. This is the last release. -->
     <branch module="goocanvas/1.0/goocanvas-1.0.0.tar.bz2" version="1.0.0"
            hash="sha256:1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
     </dependencies>
   </autotools>
 
@@ -222,7 +222,7 @@ Libglade itself is deprecated. This is the last release. -->
              version="2.3.21" 
hash="sha256:fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index fea63803..ac7c04f2 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -48,7 +48,7 @@
     <branch module="gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2"
             version="2.20.2" hash="sha256:15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"/>
     <after>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index d5837c05..20a2ec6f 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -83,7 +83,7 @@
              version="3.20.0"
              hash="sha256:bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="libgcrypt"/>
       <dep package="libtasn1"/>
     </dependencies>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 6047c26e..84284b62 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -60,9 +60,9 @@ configurations of WebKit.
     <branch repo="system"/>
   </systemmodule>
 
-  <metamodule id="meta-gtk-osx-core">
+  <metamodule id="meta-gtk-osx-gtk2">
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk-mac-integration"/>
     </dependencies>
     <after>
@@ -245,7 +245,8 @@ configurations of WebKit.
     </after>
   </meson>
 
-  <autotools id="gtk+" autogen-sh="autoreconf"
+  <!-- gtk2 has reached its end-of-life as of December 2020 and 2.24.33 is the final release. -->
+  <autotools id="gtk+-2.0" autogen-sh="autoreconf"
              autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection 
--disable-visibility">
     <branch module="gtk+/2.24/gtk+-2.24.32.tar.xz" version="2.24.32"
             hash="sha256:b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e">
@@ -313,7 +314,7 @@ configurations of WebKit.
     <dependencies>
     </dependencies>
     <after>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk+-3.0"/>
       <dep package="gtk+-3.14"/>
       <dep package="meta-gtk-osx-bootstrap"/>
@@ -338,7 +339,7 @@ configurations of WebKit.
     </dependencies>
     <after>
       <!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk+-3.0"/>
       <dep package="gtk+-3.14"/>
     </after>
diff --git a/modulesets-unstable/gtk-osx-gtkmm.modules b/modulesets-unstable/gtk-osx-gtkmm.modules
index 7d06e1bc..85d56c65 100644
--- a/modulesets-unstable/gtk-osx-gtkmm.modules
+++ b/modulesets-unstable/gtk-osx-gtkmm.modules
@@ -9,9 +9,9 @@
   <repository type="git" name="cairographics" 
               href="git://anongit.freedesktop.org/git/"/>
 
-  <metamodule id="meta-gtk-osx-gtkmm">
+  <metamodule id="meta-gtk-osx-gtkmm2">
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm2"/>
     </dependencies>
   </metamodule>
 
@@ -111,19 +111,19 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtkmm" >
+  <autotools id="gtkmm2" >
     <branch revision="gtkmm-2-24"/>
     <dependencies>
       <dep package="glibmm3"/>
       <dep package="cairomm3"/>
       <dep package="pangomm3"/>
       <dep package="atkmm"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
     </dependencies>
   </autotools>
 
   <autotools id="gtkmm3">
-    <branch module="gtkmm" revision="gtkmm-3-22"/>
+    <branch module="gtkmm2" revision="gtkmm-3-22"/>
     <dependencies>
       <dep package="glibmm3"/>
       <dep package="cairomm3"/>
@@ -134,7 +134,7 @@
   </autotools>
 
   <autotools id="gtkmm4" >
-    <branch module="gtkmm"/>
+    <branch module="gtkmm2"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index ff93815c..311637d3 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -24,7 +24,7 @@
   <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
   <metamodule id="meta-gtk-osx-webkit">
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="WebKit"/>
     </dependencies>
   </metamodule>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 1b757910..2c4ecfd4 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -14,9 +14,9 @@
   <repository type="tarball" name="pymodules"
              href="http://pypi.python.org/packages/"/>
 
-  <metamodule id="meta-gtk-osx-python">
+  <metamodule id="meta-gtk-osx-python2-gtk2">
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="pycairo"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
@@ -106,7 +106,7 @@
     <after>
       <dep package="python3"/>
       <dep package="python"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="meta-gtk-osx-gtk3"/>
     </after>
  </meson>
@@ -116,7 +116,7 @@
     <branch revision="pygobject-2-28"/>
     <dependencies>
       <dep package="python"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
    </dependencies>
   </autotools>
 
@@ -136,7 +136,7 @@
     <branch />
     <dependencies>
       <dep package="pygobject"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="pycairo"/>
     </dependencies>
     <after>
@@ -155,7 +155,7 @@
     <branch module="gtk-mac-integration"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk+-3.0"/>
       <dep package="pygobject"/>
       <dep package="pygobject3"/>
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index d074fc44..028afc17 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -46,7 +46,7 @@
     <branch />
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -61,7 +61,7 @@
             hash="sha256:13f4a3f99d983bf76e8d9dd736021ecc95f53ec1f9582423aa4b4be87455aa07"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -80,7 +80,7 @@
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
     <dependencies>
       <dep package="webkit2gtk3"/>
@@ -96,7 +96,7 @@
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -116,7 +116,7 @@
     <branch />
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -150,7 +150,7 @@
     <branch />
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
     <dependencies>
       <dep package="lcms"/>
@@ -181,7 +181,7 @@
     <branch repo="git.freedesktop.org" module="poppler/poppler" />
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -196,7 +196,7 @@
   <autotools id="goocanvas">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index cf09f693..861e0066 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -49,7 +49,7 @@ cgit    <after>
   <autotools id="gtk-engines">
     <branch revision="gtk-engines-2-22" repo="archive.gnome.org"/>
     <after>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 84ca8459..fae9a88c 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -70,7 +70,7 @@
              autogenargs="--disable-pam --without-root-certs">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="libgcrypt"/>
       <dep package="libtasn1"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index bfe1a1ec..72f56a1e 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -55,9 +55,9 @@
     <branch repo="system"/>
   </systemmodule>
   
-  <metamodule id="meta-gtk-osx-core">
+  <metamodule id="meta-gtk-osx-gtk2">
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk-mac-integration"/>
     </dependencies>
     <after>
@@ -231,7 +231,7 @@
     </dependencies>
   </meson>
  
-  <autotools id="gtk+"
+  <autotools id="gtk+-2.0"
             autogenargs="--with-gdktarget=quartz --enable-introspection=no --enable-quartz-relocation 
--disable-visibility">
     <branch module="gtk" revision="gtk-2-24" checkoutdir="gtk+-2.0"/>
     <dependencies>
@@ -282,7 +282,7 @@
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
     <branch/>
     <after>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk+-3.0"/>
     </after>
   </autotools>
@@ -301,7 +301,7 @@
       <dep package="freetype"/>
     </dependencies>
     <after>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk+-3.0"/>
     </after>
   </autotools>
diff --git a/modulesets/gtk-osx-gtkmm.modules b/modulesets/gtk-osx-gtkmm.modules
index 509a0345..0f46b754 100644
--- a/modulesets/gtk-osx-gtkmm.modules
+++ b/modulesets/gtk-osx-gtkmm.modules
@@ -8,9 +8,9 @@
   <repository type="git" name="cairographics"
               href="git://anongit.freedesktop.org/git/"/>
 
-  <metamodule id="meta-gtk-osx-gtkmm">
+  <metamodule id="meta-gtk-osx-gtkmm2">
     <dependencies>
-      <dep package="gtkmm"/>
+      <dep package="gtkmm2"/>
     </dependencies>
   </metamodule>
 
@@ -78,19 +78,19 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtkmm" >
+  <autotools id="gtkmm2" >
     <branch revision="gtkmm-2-24"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
     </dependencies>
   </autotools>
 
   <autotools id="gtkmm3" >
-    <branch module="gtkmm" revision="gtkmm-3-24"/>
+    <branch module="gtkmm2" revision="gtkmm-3-24"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index 688b1c36..e8ff809d 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -24,7 +24,7 @@
   <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
   <metamodule id="meta-gtk-osx-webkit">
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="WebKit"/>
     </dependencies>
   </metamodule>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 63e1baa9..64dae40b 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -17,9 +17,9 @@
              href="http://pypi.python.org/packages/"/>
   <repository type="git" name="github" href="git://github.com/"/>
 
-  <metamodule id="meta-gtk-osx-python">
+  <metamodule id="meta-gtk-osx-python2-gtk2">
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="pycairo"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
@@ -132,7 +132,7 @@
   <autotools id="pygobject" autogenargs="--disable-introspection">
     <branch tag="pygobject-2-28"/>
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </dependencies>
     <after>
       <dep package="python"/>
@@ -155,7 +155,7 @@
     <branch tag="master"/>
     <dependencies>
       <dep package="pygobject"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="pycairo"/>
     </dependencies>
     <after>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index be88a6e5..78e0b833 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -40,7 +40,7 @@
     <branch tag="LIBGLADE_2_6_4"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -65,7 +65,7 @@
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
     <dependencies>
       <dep package="WebKit"/>
@@ -94,7 +94,7 @@
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -103,7 +103,7 @@
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-themes"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -111,7 +111,7 @@
     <branch revision="gnome-2-30"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -153,7 +153,7 @@
     <branch revision="gimp-2-8"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
     <dependencies>
       <dep package="lcms"/>
@@ -184,7 +184,7 @@
     <branch repo="git.freedesktop.org" module="poppler/poppler" />
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
@@ -200,7 +200,7 @@
   <autotools id="goocanvas">
     <branch revision="goocanvas-1.0"/>
     <dependencies>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </dependencies>
   </autotools>
 
@@ -218,7 +218,7 @@
     <branch/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index a031bd32..bf331333 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -44,7 +44,7 @@
   <autotools id="gtk-engines">
     <branch revision="gtk-engines-2-22" repo="archive.gnome.org"/>
     <after>
-      <dep package="meta-gtk-osx-core"/>
+      <dep package="meta-gtk-osx-gtk2"/>
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 5d03eff5..fd5dc508 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -70,7 +70,7 @@
   <autotools id="gnome-keyring" autogenargs="--disable-pam --without-root-certs">
     <branch revision="gnome-3-20"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="libgcrypt"/>
       <dep package="libtasn1"/>
     </dependencies>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index bec4babe..a7feb901 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -53,9 +53,9 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <metamodule id="meta-gtk-osx-core">
+  <metamodule id="meta-gtk-osx-gtk2">
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk-mac-integration"/>
     </dependencies>
     <after>
@@ -223,7 +223,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk+" autogenargs="--with-gdktarget=quartz --enable-introspection=no 
--enable-quartz-relocation --disable-visibility">
+  <autotools id="gtk+-2.0" autogenargs="--with-gdktarget=quartz --enable-introspection=no 
--enable-quartz-relocation --disable-visibility">
     <branch module="gtk" revision="gtk-2-24"/>
     <dependencies>
       <dep package="glib"/>
@@ -259,7 +259,7 @@
     <dependencies>
     </dependencies>
     <after>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk+-3.0"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
@@ -283,7 +283,7 @@
     </dependencies>
     <after>
 <!-- Circular dependency if we depend on meta-gtk-osx or meta-gtk-osx-gtk3 -->
-      <dep package="gtk+"/>
+      <dep package="gtk+-2.0"/>
       <dep package="gtk+-3.0"/>
     </after>
   </autotools>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]