Merge branch '3.6' into 3.7

3 files changed, 21 insertions, 19 deletions

diff --git a/glib/.footprint b/glib/.footprint
index 55494e3d2..23fb62b06 100644
--- a/glib/.footprint
+++ b/glib/.footprint
@@ -20,7 +20,6 @@ drwxr-xr-x	root/root	usr/include/gio-unix-2.0/
 drwxr-xr-x	root/root	usr/include/gio-unix-2.0/gio/
 -rw-r--r--	root/root	usr/include/gio-unix-2.0/gio/gdesktopappinfo.h
 -rw-r--r--	root/root	usr/include/gio-unix-2.0/gio/gfiledescriptorbased.h
--rw-r--r--	root/root	usr/include/gio-unix-2.0/gio/gunixfdlist.h
 -rw-r--r--	root/root	usr/include/gio-unix-2.0/gio/gunixfdmessage.h
 -rw-r--r--	root/root	usr/include/gio-unix-2.0/gio/gunixinputstream.h
 -rw-r--r--	root/root	usr/include/gio-unix-2.0/gio/gunixmounts.h
@@ -177,6 +176,7 @@ drwxr-xr-x	root/root	usr/include/glib-2.0/gio/
 -rw-r--r--	root/root	usr/include/glib-2.0/gio/gtlsserverconnection.h
 -rw-r--r--	root/root	usr/include/glib-2.0/gio/gunixconnection.h
 -rw-r--r--	root/root	usr/include/glib-2.0/gio/gunixcredentialsmessage.h
+-rw-r--r--	root/root	usr/include/glib-2.0/gio/gunixfdlist.h
 -rw-r--r--	root/root	usr/include/glib-2.0/gio/gunixsocketaddress.h
 -rw-r--r--	root/root	usr/include/glib-2.0/gio/gvfs.h
 -rw-r--r--	root/root	usr/include/glib-2.0/gio/gvolume.h
@@ -303,20 +303,20 @@ drwxr-xr-x	root/root	usr/lib/glib-2.0/
 drwxr-xr-x	root/root	usr/lib/glib-2.0/include/
 -rw-r--r--	root/root	usr/lib/glib-2.0/include/glibconfig.h
 lrwxrwxrwx	root/root	usr/lib/libgio-2.0.so -> libgio-2.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libgio-2.0.so.0 -> libgio-2.0.so.0.7200.3
--rwxr-xr-x	root/root	usr/lib/libgio-2.0.so.0.7200.3
+lrwxrwxrwx	root/root	usr/lib/libgio-2.0.so.0 -> libgio-2.0.so.0.7400.0
+-rwxr-xr-x	root/root	usr/lib/libgio-2.0.so.0.7400.0
 lrwxrwxrwx	root/root	usr/lib/libglib-2.0.so -> libglib-2.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.7200.3
--rwxr-xr-x	root/root	usr/lib/libglib-2.0.so.0.7200.3
+lrwxrwxrwx	root/root	usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.7400.0
+-rwxr-xr-x	root/root	usr/lib/libglib-2.0.so.0.7400.0
 lrwxrwxrwx	root/root	usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.7200.3
--rwxr-xr-x	root/root	usr/lib/libgmodule-2.0.so.0.7200.3
+lrwxrwxrwx	root/root	usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.7400.0
+-rwxr-xr-x	root/root	usr/lib/libgmodule-2.0.so.0.7400.0
 lrwxrwxrwx	root/root	usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.7200.3
--rwxr-xr-x	root/root	usr/lib/libgobject-2.0.so.0.7200.3
+lrwxrwxrwx	root/root	usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.7400.0
+-rwxr-xr-x	root/root	usr/lib/libgobject-2.0.so.0.7400.0
 lrwxrwxrwx	root/root	usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.7200.3
--rwxr-xr-x	root/root	usr/lib/libgthread-2.0.so.0.7200.3
+lrwxrwxrwx	root/root	usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.7400.0
+-rwxr-xr-x	root/root	usr/lib/libgthread-2.0.so.0.7400.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gio-2.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gio-unix-2.0.pc
@@ -326,6 +326,8 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gmodule-no-export-2.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gobject-2.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gthread-2.0.pc
+drwxr-xr-x	root/root	usr/libexec/
+-rwxr-xr-x	root/root	usr/libexec/gio-launch-desktop
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/glib-2.0.m4
@@ -335,8 +337,8 @@ drwxr-xr-x	root/root	usr/share/gdb/
 drwxr-xr-x	root/root	usr/share/gdb/auto-load/
 drwxr-xr-x	root/root	usr/share/gdb/auto-load/usr/
 drwxr-xr-x	root/root	usr/share/gdb/auto-load/usr/lib/
--rw-r--r--	root/root	usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7200.3-gdb.py
--rw-r--r--	root/root	usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7200.3-gdb.py
+-rw-r--r--	root/root	usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7400.0-gdb.py
+-rw-r--r--	root/root	usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7400.0-gdb.py
 drwxr-xr-x	root/root	usr/share/gettext/
 drwxr-xr-x	root/root	usr/share/gettext/its/
 -rw-r--r--	root/root	usr/share/gettext/its/gschema.its
diff --git a/glib/.signature b/glib/.signature
index a7f53c5e7..c14e5b972 100644
--- a/glib/.signature
+++ b/glib/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/caIkNdNq20SMOoxmFrH8rZbVNg6iNDuWRvgbwDUUT8K75R5ijIJavdmOWC6EgRVkFZ0/ZY/9MZs+o7oSYya6Q0=
-SHA256 (Pkgfile) = 996e937b9a97427e0e22992281eae79b6eff63e24599fce680f24d6b3b7e8fd1
-SHA256 (.footprint) = a5647c6eeebc1c6a5d2eb4fdc83c4d156fdad0b9c595eaa584320a0f7e42801d
-SHA256 (glib-2.72.3.tar.xz) = 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0
+RWSE3ohX2g5d/aBCdQ1CDbg9c+avveaSriYYl8swTl+mW3E64+f4/Ifwd4Y6WEAMkM9BFG4vAWjglA1bl1OJHwUfKnwQDLaxiws=
+SHA256 (Pkgfile) = af09d161b2e089b94c0dfe6caf284078577867c8d4582389c4762b2d1b4d9478
+SHA256 (.footprint) = 8b6ae0c8a33f12e7b4d18ed02e09eed8c4669a60453d7b797f30ca92dccc533b
+SHA256 (glib-2.74.0.tar.xz) = 3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
 SHA256 (gschemas.compiled) = f2ca328db96bf936e677d53b3e89fc4bf57ada9a1d5e2466cb0afe85307a1e75
diff --git a/glib/Pkgfile b/glib/Pkgfile
index c9e07b8b2..78eee006d 100644
--- a/glib/Pkgfile
+++ b/glib/Pkgfile
@@ -1,10 +1,10 @@
 # Description: Low-level data structure handling, portability wrappers, and interfaces for runtime functionality
 # URL: https://www.gtk.org/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Depends on: libpcre util-linux meson ninja
+# Depends on: elfutils libffi libpcre2 meson ninja util-linux
 
 name=glib
-version=2.72.3
+version=2.74.0
 release=1
 source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz \
 	gschemas.compiled)