Merge branch 'mate-fix' into 'master'

Couple of fixes for mate desktop

See merge request redox-os/redox!1976

config/x11.toml

@@ -16,7 +16,7 @@ dbus = {}
 gtk3 = {}
 mate-common = {}
 mesa-demos-x11 = {}
-webkitgtk3 = {}
+#webkitgtk3 = {} # not compiling
 #xfce4-panel = {}
 #xfwm4 = {}
 x11-full = {}
@@ -68,6 +68,10 @@ data = """
 
 set -ex
 
+# for ice authority and pixbuf
+export HOME=/home/root
+export XDG_DATA_DIRS=/usr/share
+
 # Generate config file
 WIDTH="$((0x$(grep FRAMEBUFFER_WIDTH /scheme/sys/env | cut -d '=' -f 2)))"
 HEIGHT="$((0x$(grep FRAMEBUFFER_HEIGHT /scheme/sys/env | cut -d '=' -f 2)))"
@@ -115,6 +119,8 @@ set -ex
 
 xterm&
 sleep 1
+
+gdk-pixbuf-query-loaders --update-cache
 mate-session&
 """
 

recipes/dev/gdk-pixbuf/recipe.toml

@@ -1,7 +1,6 @@
 [source]
 tar = "https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.44/gdk-pixbuf-2.44.4.tar.xz"
 blake3 = "94db7bebffbd6be84a1b58a05771e411e9f7c16b06d73fcedaf0e6c0e552be9c"
-patches = ["redox.patch"]
 
 [build]
 dependencies = [
@@ -20,4 +19,5 @@ mesonflags = [
     "-Dbuiltin_loaders=all",
     "-Dinstalled_tests=false",
     "-Dman=false",
+    "-Dtests=false",
 ]

recipes/dev/gdk-pixbuf/redox.patch

@@ -1,17 +0,0 @@
-diff -ruwN gdk-pixbuf-2.38.1/gdk-pixbuf/meson.build source/gdk-pixbuf/meson.build
---- gdk-pixbuf-2.38.1/gdk-pixbuf/meson.build	2019-02-28 09:22:57.000000000 -0700
-+++ source/gdk-pixbuf/meson.build	2025-05-01 12:23:46.853375624 -0600
-@@ -290,9 +290,10 @@
- endif
- 
- gdkpixbuf_bin = [
--  [ 'gdk-pixbuf-csource' ],
--  [ 'gdk-pixbuf-pixdata' ],
--  [ 'gdk-pixbuf-query-loaders', [ 'queryloaders.c' ] ],
-+# Broken compilation on Redox
-+#  [ 'gdk-pixbuf-csource' ],
-+#  [ 'gdk-pixbuf-pixdata' ],
-+#  [ 'gdk-pixbuf-query-loaders', [ 'queryloaders.c' ] ],
- ]
- 
- foreach bin: gdkpixbuf_bin

recipes/libs/glib/redox.patch

@@ -1,6 +1,6 @@
 diff -ruwN glib-2.87.0/fuzzing/fuzz_resolver.c source/fuzzing/fuzz_resolver.c
---- glib-2.87.0/fuzzing/fuzz_resolver.c	2025-11-03 05:42:10.000000000 -0700
-+++ source/fuzzing/fuzz_resolver.c	2026-01-15 18:35:07.058788231 -0700
+--- glib-2.87.0/fuzzing/fuzz_resolver.c	2025-11-03 19:42:10.000000000 +0700
++++ source/fuzzing/fuzz_resolver.c	2026-02-19 13:53:45.717898735 +0700
 @@ -29,7 +29,7 @@
                   gint          rrtype)
  {
@@ -11,8 +11,8 @@ diff -ruwN glib-2.87.0/fuzzing/fuzz_resolver.c source/fuzzing/fuzz_resolver.c
  
    /* Data too long? */
 diff -ruwN glib-2.87.0/gio/gcredentialsprivate.h source/gio/gcredentialsprivate.h
---- glib-2.87.0/gio/gcredentialsprivate.h	2025-11-03 05:42:10.000000000 -0700
-+++ source/gio/gcredentialsprivate.h	2026-01-15 18:35:07.058963309 -0700
+--- glib-2.87.0/gio/gcredentialsprivate.h	2025-11-03 19:42:10.000000000 +0700
++++ source/gio/gcredentialsprivate.h	2026-02-19 13:53:45.717995965 +0700
 @@ -104,7 +104,7 @@
   */
  #undef G_CREDENTIALS_HAS_PID
@@ -23,8 +23,8 @@ diff -ruwN glib-2.87.0/gio/gcredentialsprivate.h source/gio/gcredentialsprivate.
  #define G_CREDENTIALS_USE_LINUX_UCRED 1
  #define G_CREDENTIALS_NATIVE_TYPE G_CREDENTIALS_TYPE_LINUX_UCRED
 diff -ruwN glib-2.87.0/gio/glocalfile.c source/gio/glocalfile.c
---- glib-2.87.0/gio/glocalfile.c	2025-11-03 05:42:10.000000000 -0700
-+++ source/gio/glocalfile.c	2026-01-15 18:35:07.058984475 -0700
+--- glib-2.87.0/gio/glocalfile.c	2025-11-03 19:42:10.000000000 +0700
++++ source/gio/glocalfile.c	2026-02-19 13:53:45.718204283 +0700
 @@ -47,6 +47,10 @@
  #include <sys/mount.h>
  #endif
@@ -37,8 +37,8 @@ diff -ruwN glib-2.87.0/gio/glocalfile.c source/gio/glocalfile.c
  #define O_BINARY 0
  #endif
 diff -ruwN glib-2.87.0/gio/gnetworking.h.in source/gio/gnetworking.h.in
---- glib-2.87.0/gio/gnetworking.h.in	2025-11-03 05:42:10.000000000 -0700
-+++ source/gio/gnetworking.h.in	2026-01-15 18:35:07.059494095 -0700
+--- glib-2.87.0/gio/gnetworking.h.in	2025-11-03 19:42:10.000000000 +0700
++++ source/gio/gnetworking.h.in	2026-02-19 13:53:45.718380100 +0700
 @@ -40,13 +40,17 @@
  #include <netdb.h>
  #include <netinet/in.h>
@@ -57,6 +57,19 @@ diff -ruwN glib-2.87.0/gio/gnetworking.h.in source/gio/gnetworking.h.in
  @NAMESER_COMPAT_INCLUDE@
  
  #ifndef __GI_SCANNER__
+diff -ruwN glib-2.87.0/gio/gsocket.c source/gio/gsocket.c
+--- glib-2.87.0/gio/gsocket.c	2025-11-03 19:42:10.000000000 +0700
++++ source/gio/gsocket.c	2026-03-05 11:29:00.807439664 +0700
+@@ -3133,7 +3133,8 @@
+ 	{
+ 	  int errsv = get_socket_errno ();
+ 
+-	  if (errsv == EINTR)
++    // TODO: uds connect() in redox is blocking
++	  if (errsv == EINTR || errsv == EAGAIN)
+ 	    continue;
+ 
+ #ifndef G_OS_WIN32
 diff -ruwN glib-2.87.0/gio/gthreadedresolver.c source/gio/gthreadedresolver.c
 --- glib-2.87.0/gio/gthreadedresolver.c	2025-11-03 05:42:10.000000000 -0700
 +++ source/gio/gthreadedresolver.c	2026-01-15 18:35:07.059664185 -0700
@@ -154,8 +167,8 @@ diff -ruwN glib-2.87.0/gio/gunixmounts.c source/gio/gunixmounts.c
  #else
  #error No g_get_mount_table() implementation for system
 diff -ruwN glib-2.87.0/gio/meson.build source/gio/meson.build
---- glib-2.87.0/gio/meson.build	2025-11-03 05:42:10.000000000 -0700
-+++ source/gio/meson.build	2026-01-15 18:35:07.060812870 -0700
+--- glib-2.87.0/gio/meson.build	2025-11-03 19:42:10.000000000 +0700
++++ source/gio/meson.build	2026-02-19 13:53:45.718994535 +0700
 @@ -18,7 +18,7 @@
  
  gnetworking_h_nameser_compat_include = ''
@@ -175,8 +188,8 @@ diff -ruwN glib-2.87.0/gio/meson.build source/gio/meson.build
    res_query_test = '''#include <resolv.h>
                        int main (int argc, char ** argv) {
 diff -ruwN glib-2.87.0/gio/tests/gdbus-server-auth.c source/gio/tests/gdbus-server-auth.c
---- glib-2.87.0/gio/tests/gdbus-server-auth.c	2025-11-03 05:42:10.000000000 -0700
-+++ source/gio/tests/gdbus-server-auth.c	2026-01-15 18:35:07.061075904 -0700
+--- glib-2.87.0/gio/tests/gdbus-server-auth.c	2025-11-03 19:42:10.000000000 +0700
++++ source/gio/tests/gdbus-server-auth.c	2026-02-19 13:53:45.719091042 +0700
 @@ -243,7 +243,7 @@
      }
    else    /* We should prefer EXTERNAL whenever it is allowed. */
@@ -187,8 +200,8 @@ diff -ruwN glib-2.87.0/gio/tests/gdbus-server-auth.c source/gio/tests/gdbus-serv
         * on Linux. */
        g_assert_cmpint (uid, ==, getuid ());
 diff -ruwN glib-2.87.0/glib/glib-unix.c source/glib/glib-unix.c
---- glib-2.87.0/glib/glib-unix.c	2025-11-03 05:42:10.000000000 -0700
-+++ source/glib/glib-unix.c	2026-01-15 18:35:07.061343737 -0700
+--- glib-2.87.0/glib/glib-unix.c	2025-11-03 19:42:10.000000000 +0700
++++ source/glib/glib-unix.c	2026-02-19 13:53:45.719219012 +0700
 @@ -74,6 +74,10 @@
  #include <sys/user.h>
  #endif  /* defined (__FreeBSD__ )*/
@@ -222,8 +235,8 @@ diff -ruwN glib-2.87.0/glib/glib-unix.c source/glib/glib-unix.c
    #error "g_unix_fd_query_path() not supported on this platform"
  #endif
 diff -ruwN glib-2.87.0/glib/gstrfuncs.c source/glib/gstrfuncs.c
---- glib-2.87.0/glib/gstrfuncs.c	2025-11-03 05:42:10.000000000 -0700
-+++ source/glib/gstrfuncs.c	2026-01-15 19:15:21.406736293 -0700
+--- glib-2.87.0/glib/gstrfuncs.c	2025-11-03 19:42:10.000000000 +0700
++++ source/glib/gstrfuncs.c	2026-02-19 13:53:45.719384853 +0700
 @@ -707,7 +707,7 @@
  
    gchar *fail_pos;

recipes/wip/libs/gnome/librsvg/recipe.toml

@@ -22,4 +22,5 @@ script = """
 DYNAMIC_INIT
 export GDK_PIXBUF_QUERYLOADERS="/usr/lib/$(cc -dumpmachine)/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders"
 cookbook_configure --disable-introspection
-"""
+mv ${COOKBOOK_STAGE}/${COOKBOOK_SYSROOT}/usr/lib/gdk-pixbuf-2.0 ${COOKBOOK_STAGE}/usr/lib/gdk-pixbuf-2.0
+"""

recipes/wip/x11/mate/caja/recipe.toml

@@ -16,4 +16,6 @@ template = "custom"
 script = """
 DYNAMIC_INIT
 cookbook_configure
+# TODO: conflict with shared-mime-info
+rm -f ${COOKBOOK_STAGE}/usr/share/mime/mime.cache
 """

recipes/wip/x11/mate/marco/recipe.toml

@@ -20,6 +20,7 @@ template = "meson"
 
 [package]
 dependencies = [
+    "librsvg",
     "mate-settings-daemon",
     "zenity",
 ]