[gtk-osx: 3/48] Convert core modules to meson.

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-osx: 3/48] Convert core modules to meson.
Date: Tue, 14 May 2019 23:56:45 +0000 (UTC)
commit a45a35269e7a0275d00cab3a2b582c3f40e973e0
Author: John Ralls <jralls ceridwen us>
Date:   Thu Nov 1 14:58:32 2018 -0700

    Convert core modules to meson.

 modulesets-stable/gtk-osx-bootstrap.modules   | 25 ++++++++++++++--
 modulesets-stable/gtk-osx-themes.modules      | 30 ++++---------------
 modulesets-stable/gtk-osx.modules             | 43 +++++++++++++--------------
 modulesets-unstable/gtk-osx-bootstrap.modules | 26 ++++++++++++++--
 modulesets-unstable/gtk-osx-themes.modules    | 19 ++----------
 modulesets-unstable/gtk-osx.modules           | 41 +++++++++++++------------
 modulesets/gtk-osx-bootstrap.modules          | 24 +++++++++++++--
 modulesets/gtk-osx-themes.modules             | 24 ++++-----------
 modulesets/gtk-osx.modules                    | 36 +++++++++++++---------
 9 files changed, 145 insertions(+), 123 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 10d2f6d..5b469a2 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -96,7 +96,28 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-doc" autogen-sh="configure">
+  <autotools id="yelp-xsl">
+    <branch version="3.20.1" module="yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz"
+            hash="sha256:dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="yelp-tools">
+    <branch version="3.18.0" module="yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
+            hash="sha256:c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+      <dep package="yelp-xsl"/>
+    </dependencies>
+  </autotools>
+
+  <meson id="gtk-doc">
     <branch version="1.29" module="gtk-doc/1.29/gtk-doc-1.29.tar.xz"
             hash="sha256:14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1"/>
     <dependencies>
@@ -104,7 +125,7 @@
       <dep package="itstool"/>
       <dep package="python3"/>
     </dependencies>
-  </autotools>
+  </meson>
 
   <autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
              makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index 31ad980..19f6e90 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -53,8 +53,8 @@
   </autotools>
 
   <autotools id="adwaita-icon-theme" autogen-sh="configure">
-    <branch module="adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz"
-            version="3.24.0" hash="sha256:ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a"/>
+    <branch module="adwaita-icon-theme/3.30/adwaita-icon-theme-3.30.0.tar.xz"
+            version="3.30.0" hash="sha256:9106729174a3e6cc183d14f74454987f5378b46f213e698a6ab2702f70e4e64b"/>
     <dependencies>
       <dep package="librsvg"/>
       <dep package="hicolor-icon-theme"/>
@@ -62,10 +62,10 @@
     </dependencies>
   </autotools>
 
- <autotools id="gnome-themes-standard" autogen-sh="configure"
+ <autotools id="gnome-themes-extra" autogen-sh="configure"
            autogenargs='--disable-gtk2-engine'>
-    <branch module="gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz"
-            version="3.22.3" hash="sha256:61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"/>
+    <branch module="gnome-themes-standard/3.28/gnome-themes-standard-3.28.tar.xz"
+            version="3.28" hash="sha256:7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819"/>
     <dependencies>
       <dep package="librsvg"/>
       <dep package="adwaita-icon-theme"/>
@@ -108,23 +108,5 @@
     <branch module="libcroco/0.6/libcroco-0.6.12.tar.xz" version="0.6.12"
            hash="sha256:ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860"/>
   </autotools>
-
-  <autotools id="libccss" autogenargs="--disable-examples">
-    <branch module="ccss" repo="freedesktop.git"/>
-    <dependencies>
-      <dep package="libcroco"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk-css-engine" >
-    <branch module="gtk-css-engine/0.3/gtk-css-engine-0.3.1.tar.bz2"
-           version="0.3.1" hash="sha256:c1d0000e00516b50f976db7726cd3f5e6318182704ad04be980d4ec7731e75d4"/>
-    <dependencies>
-      <dep package="libccss"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
-
+ 
 </moduleset>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 31599ad..a49bfa6 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -103,11 +103,10 @@
             version="3.2.1"/>
   </autotools>
 
-
-  <autotools id="gobject-introspection" autogen-sh="configure">
-    <branch module="gobject-introspection/1.60/gobject-introspection-1.60.0.tar.xz"
-            version="1.60.0"
-            hash="sha256:9efe4090cb59717126701e97062e784773f800b8d47af14c4d278ebf194df35d">
+  <meson id="gobject-introspection">
+    <branch module="gobject-introspection/1.60/gobject-introspection-1.60.1.tar.xz"
+            version="1.60.1"
+            hash="sha256:d844d1499ecd36f3ec8a3573616186d36626ec0c9a7981939e99aa02e9c824b3">
       <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/girscanner-objc.patch"; 
strip="1"/>
             <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gi_cairo_library_path.patch"; strip="1"/>
     </branch>
@@ -116,17 +115,17 @@
       <dep package="cairo"/>
       <dep package='python3'/>
     </dependencies>
-  </autotools>
+  </meson>
 
-  <autotools id="fribidi" autogenargs="--disable-docs">
+  <meson id="fribidi" mesonargs="-Ddocs=false">
     <branch module="fribidi/fribidi/releases/download/v1.0.5/fribidi-1.0.5.tar.bz2"
             repo="github-tarball" version="1.0.5"/>
     <dependencies>
       <!--dep package="c2man"/ -->
     </dependencies>
-  </autotools>
+  </meson>
 
-  <autotools id="pango"  autogen-sh="autoreconf">
+  <meson id="pango">
     <branch version="1.42.4" module="pango/1.42/pango-1.42.4.tar.xz"
             hash="sha256:1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d">
     </branch>
@@ -140,11 +139,11 @@
       <dep package="meta-gtk-osx-freetype"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
-  </autotools>
-<!-- atk-2-30 is meson-only, so it has to wait until pipenv is merged. -->
- <autotools id="atk" autogen-sh="configure">
-    <branch module="atk/2.28/atk-2.28.1.tar.xz" version="2.28.1"
-            hash="sha256:cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc"/>
+  </meson>
+  
+ <meson id="atk">
+    <branch module="atk/2.30/atk-2.30.0.tar.xz" version="2.30.0"
+            hash="sha256:dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b"/>
     <dependencies>
     </dependencies>
     <after>
@@ -152,17 +151,16 @@
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="gobject-introspection"/>
     </after>
-  </autotools>
+  </meson>
 
-  <!-- 2.38.0 requires meson -->
-  <autotools id="gdk-pixbuf" autogen-sh="configure">
-    <branch module="gdk-pixbuf/2.36/gdk-pixbuf-2.36.12.tar.xz" version="2.36.12"
-            hash="sha256:fff85cf48223ab60e3c3c8318e2087131b590fd6f1737e42cb3759a3b427a334"/>
+  <meson id="gdk-pixbuf">
+    <branch module="gdk-pixbuf/2.38/gdk-pixbuf-2.38.0.tar.xz" version="2.38.0"
+            hash="sha256:dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47"/>
     <after>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
     </after>
-  </autotools>
+  </meson>
 
   <autotools id="gtk+" autogen-sh="autoreconf"
              autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection">
@@ -230,9 +228,8 @@
 
   <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.24/gtk+-3.24.7.tar.xz" version="3.24.7"
-            hash="sha256:52121144a2df4babed75eb5f34de130a46420101fde3ae216d3142df8a481520">
-      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master//patches/gtk3-quartz-3-24-7-fixes.patch"; strip="1"/>
+    <branch module="gtk+/3.24/gtk+-3.24.8.tar.xz" version="3.24.8"
+            hash="sha256:666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799">
     </branch>
     <dependencies>
       <dep package="glib"/>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index a1a41ce..19b86e3 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -89,15 +89,35 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtkdoc" autogen-sh="configure">
-    <branch repo="git.gnome.org" module="gtk-doc-stub"/>
+  <autotools id="yelp-xsl">
+    <branch repo="git.gnome.org" revision="gnome-3-20"/>
     <dependencies>
       <dep package="libxml2"/>
+      <dep package="libxslt"/>
       <dep package="itstool"/>
-      <dep package="python3"/>
     </dependencies>
   </autotools>
 
+  <!-- Yelp tools is releasing from the master branch. -->
+  <autotools id="yelp-tools">
+    <branch repo="git.gnome.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+      <dep package="yelp-xsl"/>
+    </dependencies>
+  </autotools>
+
+  <meson id="gtk-doc">
+    <branch repo="git.gnome.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="itstool"/>
+      <dep package="yelp-tools"/>
+    </dependencies>
+  </meson>
+
   <autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
              makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
     <branch repo="icu" version="58.2" checkoutdir="icu"
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index b11c964..3b34ed0 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -5,6 +5,8 @@
   <repository type="git" name="git.gnome.org" default="yes" 
               href="https://gitlab.gnome.org/GNOME"/>
   <repository type="git" name="freedesktop.org"
+  <repository type="git" name="archive.gnome.org" default="yes" 
+              href="https://gitlab.gnome.org/Archive"/>
               href="git://anongit.freedesktop.org/"/>
   <repository type="git" name="github.com" href="git://github.com/"/>
 
@@ -61,7 +63,7 @@ cgit    <after>
        is the last one before that change and has actually gotten a
        maintenance change. -->
   <autotools id="gtk-engines">
-    <branch revision="gtk-engines-2-22"/>
+    <branch revision="gtk-engines-2-22" repo="archive.gnome.org"/>
     <after>
       <dep package="meta-gtk-osx-core"/>
     </after>
@@ -89,19 +91,4 @@ cgit    <after>
     <branch/>
   </autotools>
 
-  <!-- Unmaintained since September 2009. -->
-  <autotools id="libcss" autogenargs="--disable-examples">
-    <branch module="ccss" repo="freedesktop.org" />
-    <dependencies>
-      <dep package="libcroco"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk-css-engine">
-    <branch />
-    <after>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
-
 </moduleset>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index c4bbc1e..94c56c2 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -77,25 +77,24 @@
     <branch module="atgreen/libffi" repo="github"/>
   </autotools>
 
-  <autotools id="gobject-introspection">
-    <branch revision='72c670ce' /> <!-- Next one drops autotools -->
+  <meson id="gobject-introspection">
+    <branch/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package='python3'/>
     </dependencies>
-  </autotools>
+  </meson>
 
-      <!-- c2man is required only for documentation. There used to be a -\-disable-docs flag but it was 
removed. This will of course fail, so shell in and do 'git revert 095d885' and then rerun configuration. -->
-  <autotools id="fribidi" autogenargs="--disable-docs">
+  <meson id="fribidi" mesonargs="-Ddocs=false">
     <branch module="fribidi/fribidi" repo="github"/>
     <dependencies>
       <!--dep package="c2man"/ -->
     </dependencies>
-  </autotools>
+  </meson>
 
-  <autotools id="pango">
-    <branch tag="1.42.4"/>
+  <meson id="pango">
+    <branch />
     <dependencies>
       <dep package="cairo"/>
       <dep package="glib"/>
@@ -106,10 +105,10 @@
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-freetype"/>
     </after>
-  </autotools>
+  </meson>
 
- <autotools id="atk" supports-non-srcdir-builds="no">
-    <branch revision="gnome-3-28"/>
+ <meson id="atk">
+    <branch />
     <dependencies>
     </dependencies>
     <after>
@@ -117,26 +116,26 @@
       <dep package="gobject-introspection"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
-  </autotools>
+ </meson>
 
-  <autotools id="gdk-pixbuf">
-    <branch revision="gdk-pixbuf-2-36"/>
+  <meson id="gdk-pixbuf" mesonargs="-Dx11=false">
+    <branch />
     <after>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
     </after>
-  </autotools>
+  </meson>
 
   <autotools id="xorg-util-macros">
     <branch repo="freedesktop" module="xorg/util/macros"/>
   </autotools>
 
-  <autotools id="libepoxy">
+  <meson id="libepoxy">
     <branch repo="github" module="anholt/libepoxy"/>
     <dependencies>
       <dep package="xorg-util-macros"/>
     </dependencies>
-  </autotools>
+  </meson>
 
   <autotools id="graphene">
     <branch module="ebassi/graphene" repo="github" checkoutdir="graphene"/>
@@ -178,9 +177,9 @@
     </after>
   </autotools>
 
-  <autotools id="gtk+-4.0"
-             autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord">
-    <branch module="gtk+" checkoutdir="gtk+-4.0"/>
+  <meson id="gtk+-4.0"
+             mesonargs="-Dquartz-backend=true -Dx11-backend=false -Dmedia=none">
+    <branch module="gtk" checkoutdir="gtk+-4.0"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
@@ -192,7 +191,7 @@
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
-  </autotools>
+  </meson>
 
   <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx">
     <branch repo="freedesktop" module="pixman" />
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index c69dc16..71a6c9c 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -91,14 +91,34 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-doc">
+  <autotools id="yelp-xsl">
+    <branch repo="git.gnome.org" revision="gnome-3-20"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+    </dependencies>
+  </autotools>
+
+  <!-- Yelp tools is releasing from the master branch. -->
+  <autotools id="yelp-tools">
+    <branch repo="git.gnome.org"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+      <dep package="itstool"/>
+      <dep package="yelp-xsl"/>
+    </dependencies>
+  </autotools>
+
+  <meson id="gtk-doc">
     <branch repo="git.gnome.org" version="1.29" tag="GTK_DOC_1_29"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="itstool"/>
       <dep package="python3"/>
     </dependencies>
-  </autotools>
+  </meson>
 
   <autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
              makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index 9481cd2..d0a1cab 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -4,6 +4,8 @@
 <moduleset>
   <repository type="git" name="git.gnome.org" default="yes" 
               href="https://gitlab.gnome.org/GNOME"/>
+  <repository type="git" name="archive.gnome.org" default="yes" 
+              href="https://gitlab.gnome.org/Archive"/>
   <repository type="git" name="freedesktop.org"
               href="git://anongit.freedesktop.org/"/>
   <repository type="git" name="github.com" href="git://github.com/"/>
@@ -40,7 +42,7 @@
   </autotools>
 
   <autotools id="adwaita-icon-theme">
-    <branch revision="gnome-3-24"/>
+    <branch revision="gnome-3-30"/>
     <dependencies>
       <dep package="librsvg"/>
       <dep package="hicolor-icon-theme"/>
@@ -48,8 +50,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-themes-extra" autogenargs="--disable-gtk2-engine">
-    <branch revision="gnome-3-22"/> 
+  <autotools id="gnome-themes-extra">
+    <branch revision="gnome-3-28"/> 
     <dependencies>
       <dep package="librsvg"/>
       <dep package="adwaita-icon-theme"/>
@@ -57,7 +59,7 @@
   </autotools>
 
   <autotools id="gtk-engines">
-    <branch revision="gtk-engines-2-22"/>
+    <branch revision="gtk-engines-2-22" repo="archive.gnome.org"/>
     <after>
       <dep package="meta-gtk-osx-core"/>
     </after>
@@ -87,18 +89,4 @@
     <branch/>
   </autotools>
 
-  <autotools id="libcss" autogenargs="--disable-examples">
-    <branch module="ccss" repo="freedesktop.org" tag="ccss-0.5.0"/>
-    <dependencies>
-      <dep package="libcroco"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gtk-css-engine">
-    <branch />
-    <after>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </autotools>
-
 </moduleset>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 18578cc..c8dbd13 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -80,8 +80,8 @@
     <branch module="atgreen/libffi" repo="github" tag="v3.2.1"/>
   </autotools>
 
-  <autotools id="gobject-introspection">
-    <branch tag="1.60.0" module="gobject-introspection"/>
+  <meson id="gobject-introspection">
+    <branch tag="gnome-3-30" module="gobject-introspection"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -89,8 +89,15 @@
     </dependencies>
   </autotools>
 
-  <!-- Last autotools release -->
-  <autotools id="pango.">
+  <meson id="fribidi" mesonargs="-Ddocs=false">
+    <branch module="fribidi/fribidi" repo="github" tag="v1.0.5"/>
+    <dependencies>
+      <!--dep package="c2man"/ -->
+    </dependencies>
+  </meson>
+
+  <!-- Pango seems to be releasing from master these days. -->
+  <meson id="pango">
     <branch tag="1.42.4"/>
     <dependencies>
       <dep package="glib"/>
@@ -101,10 +108,10 @@
       <dep package="meta-gtk-osx-freetype"/>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
-  </autotools>
+  </meson>
 
-  <autotools id="atk">
-    <branch tag="gnome-3-28"/>
+  <meson id="atk">
+    <branch tag="gnome-3-30"/>
     <dependencies>
     </dependencies>
     <after>
@@ -112,16 +119,17 @@
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="gobject-introspection"/>
     </after>
-  </autotools>
+  </meson>
 
-  <autotools id="gdk-pixbuf">
-    <branch revision="gdk-pixbuf-2-36"/>
+  <meson id="gdk-pixbuf">
+    <!--gdk-pixbuf is releasing from master-->
+    <branch/>
     <dependencies>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
       <dep package="shared-mime-info"/>
     </dependencies>
-  </autotools>
+  </meson>
 
   <autotools id="xorg-util-macros">
     <branch repo="freedesktop" module="xorg/util/macros"/>
@@ -135,7 +143,7 @@
   </autotools>
 
   <autotools id="gtk+" autogenargs="--with-gdktarget=quartz --enable-introspection=no 
--enable-quartz-relocation">
-    <branch revision="gtk-2-24"/>
+    <branch module="gtk" revision="gtk-2-24"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
@@ -149,8 +157,8 @@
   </autotools>
 
   <autotools id="gtk+-3.0"
-            autogenargs="--enable-quartz-backend --disable-colord  --enable-quartz-relocation">
-    <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-24"/>
+         autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord">
+    <branch module="gtk" checkoutdir="gtk+-3.0" revision="gtk-3-24"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="pango"/>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]