XXX - hard component/glib: Version up

Changes:

 * drop incorporated patch
 * switch to pkg-config, meson and ninja for build process

Requires possible rework of gtk2.

component/glib/2a9ddc630341789c629c17c17565f5a7a7db8a8e.diff

-In Ubuntu 19.10, we use GCC 9.2.1 and glib was failing to compile with
-the following message:
-
-  CC       libgio_2_0_la-gdbusauth.lo
-gdbusauth.c: In function '_g_dbus_auth_run_server':
-gdbusauth.c:1302:11: error: '%s' directive argument is null [-Werror=format-overflow=]
- 1302 |           debug_print ("SERVER: WaitingForBegin, read '%s'", line);
-      |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-cc1: some warnings being treated as errors
-
-So we apply this MR:
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/626
-corresponding to this commit:
-https://gitlab.gnome.org/GNOME/glib/-/commit/2a9ddc630341789c629c17c17565f5a7a7db8a8e
-
-"gdbus: Avoid printing null strings"
-
-
-
-This patch should then be removed when we upgrade glib version.
-
-
-
-diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
-index 1f8ea80570cf910a45f3c7f4bb678789145b5d33..752ec23fccaec4b67ec470a9f04c1f2ce99e9809 100644
---- a/gio/gdbusauth.c
-+++ b/gio/gdbusauth.c
-@@ -1272,9 +1272,9 @@ _g_dbus_auth_run_server (GDBusAuth              *auth,
-                                                     &line_length,
-                                                     cancellable,
-                                                     error);
--          debug_print ("SERVER: WaitingForBegin, read '%s'", line);
-           if (line == NULL)
-             goto out;
-+          debug_print ("SERVER: WaitingForBegin, read '%s'", line);
-           if (g_strcmp0 (line, "BEGIN") == 0)
-             {
-               /* YAY, done! */
-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
-index 3221b925d3ef4eff0b063f5f56cc0629131faf42..3a1a1f9e9101a3773620403d2cb6faf6209a1b64 100644
---- a/gio/gdbusmessage.c
-+++ b/gio/gdbusmessage.c
-@@ -2731,7 +2731,6 @@ g_dbus_message_to_blob (GDBusMessage          *message,
-   if (message->body != NULL)
-     {
-       gchar *tupled_signature_str;
--      tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
-       if (signature == NULL)
-         {
-           g_set_error (error,
-@@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage          *message,
-                        G_IO_ERROR_INVALID_ARGUMENT,
-                        _("Message body has signature “%s” but there is no signature header"),
-                        signature_str);
--          g_free (tupled_signature_str);
-           goto out;
-         }
--      else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
-+      tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
-+      if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
-         {
-           g_set_error (error,
-                        G_IO_ERROR,

component/glib/buildout.cfg

@@ -2,37 +2,28 @@
 extends =
   ../gettext/buildout.cfg
   ../libffi/buildout.cfg
-  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
+  ../meson/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../ninja/buildout.cfg
+
 parts =
   glib
 
 [glib]
 recipe = slapos.recipe.cmmi
-patches =
-  ${:_profile_base_location_}/2a9ddc630341789c629c17c17565f5a7a7db8a8e.diff
-patch-options = -p1
 shared = true
-url = https://ftp.gnome.org/pub/gnome/sources/glib/2.56/glib-2.56.4.tar.xz
-md5sum = 17c3dca43d99a4882384f1a7b530b80b
-configure-options =
-  --disable-libmount
-  --disable-static
-  --disable-selinux
-  --disable-fam
-  --disable-xattr
-  --disable-man
+url = https://download.gnome.org/sources/glib/2.70/glib-2.70.0.tar.xz
+md5sum = 4b08228707d28a9f23f7369902f4b166
+configure-command = meson builddir --wrap-mode=nofallback --libdir=lib -Dprefix=@@LOCATION@@
+make-binary = ninja -C builddir
 environment =
-  PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-  LIBFFI_CFLAGS=-I${libffi:location}/include
-  LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
-  PCRE_CFLAGS=-I${pcre:location}/include
-  PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre
+  PATH=${pkgconfig:location}/bin:${ninja:location}/bin:${meson:location}/bin:${gettext:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${gettext:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libffi:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:{xz-utils:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libffi:location}/lib
 post-install = rm %(location)s/bin/gtester-report
 
 [x86-cygwin-glib]

component/gtk-2/buildout.cfg

@@ -8,11 +8,14 @@ extends =
   ../gettext/buildout.cfg
   ../glib/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../libffi/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
   ../libtool/buildout.cfg
+  ../meson/buildout.cfg
   ../m4/buildout.cfg
+  ../ninja/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
@@ -71,38 +74,44 @@ configure-options =
   --enable-shared
   --disable-static
 
+[json-glib]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://download.gnome.org/sources/json-glib/1.6/json-glib-1.6.6.tar.xz
+md5sum = 9c40fcd8cdbf484dd1704480afefae14
+pkg_config_depends = ${bzip2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${harfbuzz:location}/lib/pkgconfig:${libffi:location}/lib/pkgconfig
+configure-command =
+  meson builddir --wrap-mode=nofallback --libdir=lib -Dprefix=@@LOCATION@@ -Dintrospection=disabled -Dgtk_doc=disabled
+make-binary = ninja -C builddir
+environment =
+  PATH=${meson:location}/bin:${ninja:location}/bin:${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+
 [pango]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.gnome.org/sources/pango/1.42/pango-1.42.4.tar.xz
-md5sum = deb171a31a3ad76342d5195a1b5bbc7c
-pkg_config_depends = ${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
-configure-options =
-  --disable-static
-  --disable-gtk-doc-html
+url = https://download.gnome.org/sources/pango/1.49/pango-1.49.4.tar.xz
+md5sum = 190bd00327ba5cff928ca06f13756d4f
+pkg_config_depends = ${bzip2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${harfbuzz:location}/lib/pkgconfig:${libffi:location}/lib/pkgconfig:${json-glib:location}/lib/pkgconfig
+configure-command =
+  meson builddir --wrap-mode=nofallback --libdir=lib -Dprefix=@@LOCATION@@ -Dintrospection=disabled -Dgtk_doc=false -Dcairo=enabled
+make-binary = ninja -C builddir
 environment =
-  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${meson:location}/bin:${ninja:location}/bin:${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${harfbuzz:location}/lib -Wl,-rpath=${harfbuzz:location}/lib
 
 [gdk-pixbuf]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.gnome.org/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.7.tar.xz
-md5sum = 04ca1535f3fab7070db48009ed1e93f6
-pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${pcre:location}/lib/pkgconfig
-configure-options =
-  --disable-static
-  --disable-gtk-doc-html
-  --without-libintl-prefix
-  --with-x11
+url = https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz
+md5sum = 7cd2fdaa3c55e2302316fe36968f7425
+pkg_config_depends = ${libpng:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${gettext:location}/lib/pkconfig:${libtiff:location}/lib/pkconfig:${zlib:location}/lib/pkgconfig:${libffi:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${pcre:location}/lib/pkgconfig
+configure-command =
+  meson builddir --wrap-mode=nofallback --libdir=lib -Dprefix=@@LOCATION@@ -Dintrospection=disabled -Dgio_sniffing=false -Dman=false
+make-binary = ninja -C builddir
 environment =
-  PATH=${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${meson:location}/bin:${ninja:location}/bin:${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
 
 [atk]
 recipe = slapos.recipe.cmmi