[gtk-osx: 6/6] Make modulesets package versions coherent with modulesets-stable.

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-osx: 6/6] Make modulesets package versions coherent with modulesets-stable.
Date: Thu, 9 Jan 2020 19:35:33 +0000 (UTC)
commit 3122d62147cc4fdbad60ffeb5c5abc4c12d3b863
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jan 9 11:02:58 2020 -0800

    Make modulesets package versions coherent with modulesets-stable.

 modulesets-stable/gtk-osx-bootstrap.modules   |  2 +-
 modulesets-unstable/gtk-osx-gstreamer.modules |  2 +-
 modulesets/gtk-osx-bootstrap.modules          | 28 ++++++++-------------------
 modulesets/gtk-osx-gstreamer.modules          | 19 +++++++-----------
 modulesets/gtk-osx-gtkmm.modules              | 13 +++++++------
 modulesets/gtk-osx.modules                    | 10 +++++-----
 6 files changed, 29 insertions(+), 45 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index ea02380..c42db0e 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -149,9 +149,9 @@
     <dependencies>
       <dep package="ragel"/>
       <dep package="glib"/>
-      <dep package="icu"/>
     </dependencies>
     <after>
+      <dep package="icu"/>
       <dep package="icu55"/>
     </after>
   </autotools>
diff --git a/modulesets-unstable/gtk-osx-gstreamer.modules b/modulesets-unstable/gtk-osx-gstreamer.modules
index 0d3fcf1..78b3f97 100644
--- a/modulesets-unstable/gtk-osx-gstreamer.modules
+++ b/modulesets-unstable/gtk-osx-gstreamer.modules
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
  <repository type="git" name="gstreamer" default="yes"
-              href="git://anongit.freedesktop.org/gstreamer/"/>
+              href="git://gitlab.freedesktop.org/gstreamer/"/>
   <repository type="tarball" name="sourceforge"
               href="http://iweb.dl.sf.net/project/"/>
   <repository type="tarball" name="liboil"
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index d855c96..871f8f6 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -36,7 +36,7 @@
   </autotools>
 
 <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch version="1.6.29" module="libpng/libpng-1.6.29.tar.xz"
+    <branch version="1.6.34" module="libpng/libpng-1.6.34.tar.xz"
             repo="sourceforge"/>
   </autotools>
 
@@ -72,7 +72,7 @@
   </autotools>
 
   <autotools id="libxslt" autogen-sh="configure">
-    <branch version="1.1.29" module="libxslt-1.1.29.tar.gz"
+    <branch version="1.1.32" module="libxslt-1.1.32.tar.gz"
            repo="xmlsoft.org"/>
     <dependencies>
       <dep package="libxml2"/>
@@ -80,10 +80,7 @@
   </autotools>
 
   <autotools id="itstool">
-    <branch module="itstool/itstool-2.0.6.tar.bz2" version="2.0.6"
-            repo="itstool">
-    </branch>
-    <!--branch repo="github" module="itstool/itstool" tag="2.0.5"/-->
+    <branch repo="github" module="itstool/itstool" tag="2.0.6"/>
     <dependencies>
       <dep package="libxml2"/>
     </dependencies>
@@ -110,7 +107,7 @@
   </autotools>
 
   <autotools id="gtk-doc">
-    <branch repo="git.gnome.org" version="1.29" tag="GTK_DOC_1_29"/>
+    <branch repo="git.gnome.org" version="1.30" tag="GTK_DOC_1_30"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="itstool"/>
@@ -133,29 +130,20 @@
 
   <autotools id="harfbuzz"
              autogenargs="--with-coretext --with-freetype --with-icu">
-    <branch repo="freedesktop" tag="1.4.5"/>
+    <branch repo="github" module="harfbuzz/harfbuzz" tag="2.5.3"/>
     <dependencies>
-      <dep package="freetype-no-harfbuzz"/>
       <dep package="ragel"/>
       <dep package="glib"/>
-      <dep package="icu"/>
     </dependencies>
     <after>
+      <dep package="icu"/>
       <dep package="icu55"/>
     </after>
   </autotools>
 
-  <autotools id="freetype-no-harfbuzz" skip-autogen="never" autogenargs="--without-bzip2 --without-harfbuzz"
-            autogen-template="pushd %(srcdir)s &amp;&amp; ./%(autogen-sh)s &amp;&amp; popd &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
-    <branch module="freetype/freetype2" tag="VER-2-7-1" repo="nongnu"/>
-    <dependencies>
-      <dep package="zlib"/>
-    </dependencies>
- </autotools>
-
   <autotools id="freetype" skip-autogen="never" autogenargs="--without-bzip2"
             autogen-template="if test -f Makefile; then make distclean; fi &amp;&amp; pushd %(srcdir)s 
&amp;&amp; ./autogen.sh &amp;&amp; popd &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
-    <branch module="freetype/freetype2" tag="VER-2-7-1" repo="nongnu"/>
+    <branch module="freetype/freetype2" tag="VER-2-9-1" repo="nongnu"/>
     <dependencies>
       <dep package="harfbuzz"/>
       <dep package="zlib"/>
@@ -163,7 +151,7 @@
  </autotools>
 
   <autotools id="fontconfig" autogenargs="--disable-docs">
-    <branch repo="freedesktop" tag="2.12.1"/>
+    <branch repo="freedesktop" tag="2.13.1"/>
     <dependencies>
       <dep package="freetype"/>
       <dep package="pylxml"/>
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index 0160874..d4de348 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -3,19 +3,14 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
  <repository type="git" name="gstreamer" default="yes"
-              href="git://anongit.freedesktop.org/gstreamer/"/>
+              href="git://gitlab.freedesktop.org/gstreamer/"/>
   <repository type="tarball" name="sourceforge"
               href="http://iweb.dl.sf.net/project/"/>
   <repository type="tarball" name="liboil"
               href="http://liboil.freedesktop.org/download/"/>
 
-  <!-- The GStreamer project maintains its own moduleset at
-       git://anongit.freedesktop.org/gstreamer/jhbuild/. The modules
-       are unversioned and haven't been tested for gtk-osx
-       compatibility. -->
-
   <autotools id="liborc">
-    <branch repo="gstreamer" module="orc" tag="orc-0.4.22"/>
+    <branch repo="gstreamer" module="orc" tag="orc-0.4.28"/>
   </autotools>
 
   <autotools id="faad2" autogen-sh="autoreconf"
@@ -41,7 +36,7 @@
   <autotools id="gst-plugins-base" supports-non-srcdir-builds="no"
              autogenargs="--disable-tests --disable-x --disable-xvideo"
              makeargs="ERROR_CFLAGS=" >
-    <branch revision="1.10"/>
+    <branch revision="1.12"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="liboil"/>
@@ -53,7 +48,7 @@
   <autotools id="gst-plugins-good" supports-non-srcdir-builds="no"
              autogenargs="--disable-tests --disable-x --disable-xvideo --disable-osx-video"
              makeargs="ERROR_CFLAGS=" >
-    <branch revision="1.10"/>
+    <branch revision="1.12"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -62,7 +57,7 @@
 
   <autotools id="gst-plugins-ugly" autogenargs="--disable-tests"
             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
-    <branch revision="1.10"/>
+    <branch revision="1.12"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -71,7 +66,7 @@
 
   <autotools id="gst-plugins-bad" autogenargs="--disable-tests --disable-x --disable-xvid"
             supports-non-srcdir-builds="no" makeargs="ERROR_CFLAGS=" >
-    <branch revision="1.10"/>
+    <branch revision="1.12"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -84,7 +79,7 @@
   version of libav on master (10.3) does not.) -->
   <autotools id="gst-libav" supports-non-srcdir-builds="no"
              autogenargs="--disable-tests --disable-mmx --with-libav-extra-configure='--disable-yasm'">
-    <branch module="gst-libav" revision="1.10"/>
+    <branch module="gst-libav" revision="1.12"/>
     <dependencies>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
diff --git a/modulesets/gtk-osx-gtkmm.modules b/modulesets/gtk-osx-gtkmm.modules
index 4e89bef..509a034 100644
--- a/modulesets/gtk-osx-gtkmm.modules
+++ b/modulesets/gtk-osx-gtkmm.modules
@@ -4,6 +4,7 @@
 <moduleset>
   <repository type="git" name="git.gnome.org" default="yes"
               href="https://gitlab.gnome.org/GNOME"/>
+<!-- As of January 2020 cairographics was still on anongit. -->
   <repository type="git" name="cairographics"
               href="git://anongit.freedesktop.org/git/"/>
 
@@ -21,11 +22,11 @@
 
 <!-- mm-common is C++ glue code needed only to build from git. -->
   <autotools id="mm-common">
-    <branch module="mm-common" tag="0.9.10"/>
+    <branch module="mm-common" tag="0.9.12"/>
   </autotools>
 
   <autotools id="cairomm" >
-    <branch module="cairomm" revision="cairomm-1-14"
+    <branch module="cairomm" revision="v1.15.5"
             repo="cairographics" />
     <dependencies>
       <dep package="cairo"/>
@@ -33,7 +34,7 @@
   </autotools>
 
   <autotools id="glibmm" >
-    <branch revision="glibmm-2-50"/>
+    <branch revision="glibmm-2-60"/>
     <dependencies>
       <dep package="libsigc++2"/>
     </dependencies>
@@ -43,7 +44,7 @@
   </autotools>
 
   <autotools id="pangomm" >
-     <branch revision="pangomm-2-40"/>
+     <branch revision="pangomm-2-42"/>
     <dependencies>
        <dep package="cairomm"/>
     </dependencies>
@@ -55,7 +56,7 @@
   </autotools>
 
   <autotools id="atkmm">
-    <branch module="atkmm" revision="atkmm-2-24"/>
+    <branch module="atkmm" revision="atkmm-2-28"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
@@ -89,7 +90,7 @@
   </autotools>
 
   <autotools id="gtkmm3" >
-    <branch module="gtkmm" revision="gtkmm-3-22"/>
+    <branch module="gtkmm" revision="gtkmm-3-24"/>
     <dependencies>
       <dep package="glibmm"/>
       <dep package="cairomm"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index 4e6a3ea..a31980f 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -74,7 +74,7 @@
   </systemmodule>
 
   <autotools id="glib" autogenargs="--with-pcre=internal">
-    <branch tag="glib-2-58"/>
+    <branch tag="glib-2-62"/>
     <dependencies>
       <dep package="libffi"/>
     </dependencies>
@@ -89,7 +89,7 @@
   </autotools>
 
   <meson id="gobject-introspection">
-    <branch tag="gnome-3-30" module="gobject-introspection"/>
+    <branch tag="gnome-3-34" module="gobject-introspection"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -118,7 +118,7 @@
   </meson>
 
   <meson id="atk">
-    <branch tag="gnome-3-30"/>
+    <branch tag="gnome-3-34"/>
     <dependencies>
     </dependencies>
     <after>
@@ -180,7 +180,7 @@
   </autotools>
 
   <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx">
-    <branch repo="freedesktop" module="pixman" revision="0.34"/>
+    <branch repo="freedesktop" module="pixman" revision="0.38"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
@@ -192,7 +192,7 @@
        dependency. -->
   <autotools id="cairo"
              autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
-    <branch repo="freedesktop" module="cairo" revision="1.14"/>
+    <branch repo="freedesktop" module="cairo" revision="1.16"/>
     <dependencies>
       <dep package="pixman"/>
     </dependencies>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]