apply patches on new upstream branch

debian/patches/.patch

@@ -7,7 +7,7 @@ Subject: =?utf-8?b?5L+u5aSN57yW6K+R6Zeu6aKY?=
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/gio/gportalsupport.c b/gio/gportalsupport.c
-index 0efbc73..04fb589 100644
+index 5b8e622..c8ee37e 100644
 --- a/gio/gportalsupport.c
 +++ b/gio/gportalsupport.c
 @@ -194,12 +194,12 @@ glib_has_dconf_access_in_sandbox (void)

debian/patches/166960.patch

@@ -1,9 +1,9 @@
 From: Yue-Lan <lanyue@ubuntukylin.com>
 Date: Mon, 12 Jun 2023 17:07:42 +0800
-Subject: =?utf-8?b?W0ZJWF0gIzE2Njk2MCDjgJDmlofku7bnrqHnkIblmajjgJHlnKjmnYM=?=
- =?utf-8?b?6ZmQ57uG5YyW55WM6Z2i5re75Yqg5a6M5YW25LuW55So5oi35p2D6ZmQ5ZCO77yM?=
- =?utf-8?b?5a+56K+l5paH5qGj6L+b6KGM57yW6L6R5L+d5a2Y5ZCO77yM57uG5YyW5p2D6ZmQ?=
- =?utf-8?b?55WM6Z2i6ZyA6KaB6YeN5paw5re75Yqg5YW25LuW55So5oi35p2D6ZmQ?=
+Subject: =?utf-8?b?IzE2Njk2MCDjgJDmlofku7bnrqHnkIblmajjgJHlnKjmnYPpmZDnu4Y=?=
+ =?utf-8?b?5YyW55WM6Z2i5re75Yqg5a6M5YW25LuW55So5oi35p2D6ZmQ5ZCO77yM5a+56K+l?=
+ =?utf-8?b?5paH5qGj6L+b6KGM57yW6L6R5L+d5a2Y5ZCO77yM57uG5YyW5p2D6ZmQ55WM6Z2i?=
+ =?utf-8?b?6ZyA6KaB6YeN5paw5re75Yqg5YW25LuW55So5oi35p2D6ZmQ?=
 
 ---
  gio/glocalfileoutputstream.c | 25 ++++++++++++++++++++++++-

debian/patches/169359-U.patch

@@ -1,8 +1,8 @@
 From: Yue-Lan <lanyue@ubuntukylin.com>
 Date: Mon, 8 May 2023 10:48:52 +0800
-Subject: =?utf-8?b?W0ZJWF0gIzE2OTM1OSDjgJDluILlnLrjgJHjgJDkurrooYzmuIXnrpc=?=
- =?utf-8?b?5Lit5b+D44CR5oyC6L29VeebmOWQjuaWh+S7tueuoeeQhuWZqOaYvuekuuaWhw==?=
- =?utf-8?b?5Lu25byC5bi4?=
+Subject: =?utf-8?b?IzE2OTM1OSDjgJDluILlnLrjgJHjgJDkurrooYzmuIXnrpfkuK3lv4M=?=
+ =?utf-8?b?44CR5oyC6L29VeebmOWQjuaWh+S7tueuoeeQhuWZqOaYvuekuuaWh+S7tuW8gg==?=
+ =?utf-8?b?5bi4?=
 
 ---
  gio/glocalfileenumerator.c | 6 +++++-

debian/patches/182831-U.patch

@@ -1,16 +1,15 @@
 From: Yue-Lan <lanyue@ubuntukylin.com>
 Date: Wed, 19 Jul 2023 11:32:14 +0800
-Subject: =?utf-8?b?W0ZJWF0gIzE4MjgzMSDjgJDmlofku7bnrqHnkIblmajjgJHliKDpmaQ=?=
- =?utf-8?b?5LuOVeebmOaLt+i0neWIsOacrOWcsOmVv+aWh+S7tuWQjeensOeahOaWh+S7tg==?=
- =?utf-8?b?6Iez5Zue5pS256uZ77yM5Zue5pS256uZ5Lit6K+l5paH5Lu25LiN5pi+56S65Y6f?=
- =?utf-8?b?5aeL6Lev5b6E?=
+Subject: =?utf-8?b?IzE4MjgzMSDjgJDmlofku7bnrqHnkIblmajjgJHliKDpmaTku45V55uY?=
+ =?utf-8?b?5ou36LSd5Yiw5pys5Zyw6ZW/5paH5Lu25ZCN56ew55qE5paH5Lu26Iez5Zue5pS2?=
+ =?utf-8?b?56uZ77yM5Zue5pS256uZ5Lit6K+l5paH5Lu25LiN5pi+56S65Y6f5aeL6Lev5b6E?=
 
 ---
  gio/glocalfile.c | 28 ++++++++++++++++++----------
  1 file changed, 18 insertions(+), 10 deletions(-)
 
 diff --git a/gio/glocalfile.c b/gio/glocalfile.c
-index c357267..0f37547 100644
+index 9303902..f41e7d0 100644
 --- a/gio/glocalfile.c
 +++ b/gio/glocalfile.c
 @@ -1996,6 +1996,8 @@ g_local_file_trash (GFile         *file,

debian/patches/5c52117c4ae9367c96609915fde5a280101a9b0b-GLIB_FORCE_USE_P.patch

@@ -9,7 +9,7 @@ Subject: =?utf-8?b?5L+u5pS5IDVjNTIxMTdjNGFlOTM2N2M5NjYwOTkxNWZkZTVhMjgwMTAx?=
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gio/gportalsupport.c b/gio/gportalsupport.c
-index 12c5d6a..f8d866f 100644
+index c8ee37e..04fb589 100644
 --- a/gio/gportalsupport.c
 +++ b/gio/gportalsupport.c
 @@ -142,7 +142,7 @@ sandbox_info_read (void)

debian/patches/Add-extra-debug-to-memory-monitor-dbus-test.patch

@@ -12,10 +12,10 @@ Forwarded: no
  1 file changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in
-index 17862e3..61e6f94 100755
+index bf32918..42f9f21 100755
 --- a/gio/tests/memory-monitor-dbus.py.in
 +++ b/gio/tests/memory-monitor-dbus.py.in
-@@ -74,18 +74,29 @@ try:
+@@ -72,18 +72,29 @@ try:
              Timeout is in deciseconds, defaulting to 50 (5 seconds). message is
              printed on failure.
              '''
@@ -45,7 +45,7 @@ index 17862e3..61e6f94 100755
              self.last_warning = level
              self.main_context.wakeup()
  
-@@ -95,17 +106,20 @@ try:
+@@ -93,17 +104,20 @@ try:
              # Wait 2 seconds
              timeout = 2
              while timeout > 0:

debian/patches/Disable-some-tests-on-slow-architectures-which-keep-faili-1.patch

@@ -0,0 +1,34 @@
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Thu, 27 Sep 2012 11:22:56 +0200
+Subject: Disable some tests on slow architectures which keep failing the
+ tests
+
+[smcv: Modified to use g_test_skip() instead of omitting those test cases
+completely, and allow them to be re-enabled with a Debian-specific
+environment variable]
+
+Co-authored-by: Simon McVittie <smcv@debian.org>
+Forwarded: no
+---
+ gobject/tests/threadtests.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c
+index dee4d6e..eacf617 100644
+--- a/gobject/tests/threadtests.c
++++ b/gobject/tests/threadtests.c
+@@ -486,6 +486,14 @@ test_threaded_toggle_notify (void)
+                   "safely from another (the main) thread without causing the "
+                   "notifying thread to abort");
+ 
++#if defined(__arm__)
++  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
++    {
++      g_test_skip ("Intermittently takes more than 5 minutes on 32-bit ARM (Debian#1023652)");
++      return;
++    }
++#endif
++
+   g_object_add_toggle_ref (object, on_toggle_notify, &data);
+   g_object_unref (object);
+ 

debian/patches/Disable-some-tests-on-slow-architectures-which-keep-faili.patch

@@ -10,25 +10,61 @@ environment variable]
 Co-authored-by: Simon McVittie <smcv@debian.org>
 Forwarded: no
 ---
- gobject/tests/threadtests.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ glib/tests/mainloop.c | 16 ++++++++++++++++
+ glib/tests/timeout.c  |  9 +++++++++
+ 2 files changed, 25 insertions(+)
 
-diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c
-index dee4d6e..eacf617 100644
---- a/gobject/tests/threadtests.c
-+++ b/gobject/tests/threadtests.c
-@@ -486,6 +486,14 @@ test_threaded_toggle_notify (void)
-                   "safely from another (the main) thread without causing the "
-                   "notifying thread to abort");
+diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
+index 152e74b..1aac153 100644
+--- a/glib/tests/mainloop.c
++++ b/glib/tests/mainloop.c
+@@ -524,6 +524,14 @@ test_child_sources (void)
+   GMainLoop *loop;
+   GSource *parent, *child_b, *child_c, *end;
  
 +#if defined(__arm__)
 +  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
 +    {
-+      g_test_skip ("Intermittently takes more than 5 minutes on 32-bit ARM (Debian#1023652)");
++      g_test_skip ("Not reliable on older ARM hardware");
 +      return;
 +    }
 +#endif
 +
-   g_object_add_toggle_ref (object, on_toggle_notify, &data);
-   g_object_unref (object);
+   ctx = g_main_context_new ();
+   loop = g_main_loop_new (ctx, FALSE);
  
+@@ -602,6 +610,14 @@ test_recursive_child_sources (void)
+   GMainLoop *loop;
+   GSource *parent, *child_b, *child_c, *end;
+ 
++#if defined(__arm__)
++  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
++    {
++      g_test_skip ("Not reliable on older ARM hardware");
++      return;
++    }
++#endif
++
+   ctx = g_main_context_new ();
+   loop = g_main_loop_new (ctx, FALSE);
+ 
+diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c
+index 1ae3f3a..f838c9c 100644
+--- a/glib/tests/timeout.c
++++ b/glib/tests/timeout.c
+@@ -196,6 +196,15 @@ test_func (gpointer data)
+ static void
+ test_rounding (void)
+ {
++
++#if defined(__arm__)
++  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
++    {
++      g_test_skip ("Not reliable on older ARM hardware");
++      return;
++    }
++#endif
++
+   loop = g_main_loop_new (NULL, FALSE);
+ 
+   last_time = g_get_monotonic_time ();

debian/patches/Skip-memory-monitor-dbus-test-if-not-specifically-request.patch

@@ -11,7 +11,7 @@ Forwarded: no
  1 file changed, 2 insertions(+)
 
 diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in
-index bf32918..17862e3 100755
+index 42f9f21..61e6f94 100755
 --- a/gio/tests/memory-monitor-dbus.py.in
 +++ b/gio/tests/memory-monitor-dbus.py.in
 @@ -39,6 +39,8 @@ try:

debian/patches/Skip-unreliable-gdbus-threading-tests-by-default-1.patch

@@ -0,0 +1,48 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 4 Jan 2019 08:37:20 +0000
+Subject: Skip unreliable gdbus-threading tests by default
+
+test_threaded_singleton() test to reproduce a race condition between
+last-unref of the global singleton GDBusConnection and g_bus_get_sync().
+
+test_method_calls_in_thread() checks that multiple threads can all make
+method calls to the same proxy.
+
+However, test setup intermittently times out with:
+
+    # GLib-GIO-DEBUG: run 0: refcount is 2, sleeping
+    Bail out! GLib-GIO-FATAL-ERROR: connection had too many refs
+
+The current theory upstream is that this might be a reference leak in
+test_delivery_in_thread().
+
+Furthermore, test teardown is now often failing when destroying the test
+bus.
+
+Demote these tests to be run as part of the "flaky" autopkgtests, but
+not at build time or in the part of the autopkgtest run that gates
+progress into testing.
+
+Bug: https://gitlab.gnome.org/GNOME/glib/issues/1515
+Forwarded: no
+---
+ gio/tests/gdbus-threading.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
+index 9f1f9182..e829e26 100644
+--- a/gio/tests/gdbus-threading.c
++++ b/gio/tests/gdbus-threading.c
+@@ -679,6 +679,12 @@ main (int   argc,
+ 
+   g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
+ 
++  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
++    {
++      g_print("ok 1 # SKIP all gdbus-threading tests skipped because they are too unreliable (glib#1515)\n");
++      return 77;
++    }
++
+   if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
+     {
+       g_print("ok 1 # SKIP all gdbus-threading tests skipped because they are too unreliable (glib#1515)\n");

debian/patches/Skip-unreliable-gdbus-threading-tests-by-default-2.patch

@@ -30,12 +30,12 @@ Forwarded: no
  1 file changed, 6 insertions(+)
 
 diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
-index 755b490..9f1f918 100644
+index e829e26..51b1755 100644
 --- a/gio/tests/gdbus-threading.c
 +++ b/gio/tests/gdbus-threading.c
-@@ -679,6 +679,12 @@ main (int   argc,
- 
-   g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
+@@ -691,6 +691,12 @@ main (int   argc,
+       return 77;
+     }
  
 +  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
 +    {

debian/patches/Skip-unreliable-gdbus-threading-tests-by-default-3.patch

@@ -0,0 +1,48 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 4 Jan 2019 08:37:20 +0000
+Subject: Skip unreliable gdbus-threading tests by default
+
+test_threaded_singleton() test to reproduce a race condition between
+last-unref of the global singleton GDBusConnection and g_bus_get_sync().
+
+test_method_calls_in_thread() checks that multiple threads can all make
+method calls to the same proxy.
+
+However, test setup intermittently times out with:
+
+    # GLib-GIO-DEBUG: run 0: refcount is 2, sleeping
+    Bail out! GLib-GIO-FATAL-ERROR: connection had too many refs
+
+The current theory upstream is that this might be a reference leak in
+test_delivery_in_thread().
+
+Furthermore, test teardown is now often failing when destroying the test
+bus.
+
+Demote these tests to be run as part of the "flaky" autopkgtests, but
+not at build time or in the part of the autopkgtest run that gates
+progress into testing.
+
+Bug: https://gitlab.gnome.org/GNOME/glib/issues/1515
+Forwarded: no
+---
+ gio/tests/gdbus-threading.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
+index 51b1755..e32fe7e 100644
+--- a/gio/tests/gdbus-threading.c
++++ b/gio/tests/gdbus-threading.c
+@@ -697,6 +697,12 @@ main (int   argc,
+       return 77;
+     }
+ 
++  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
++    {
++      g_print("ok 1 # SKIP all gdbus-threading tests skipped because they are too unreliable (glib#1515)\n");
++      return 77;
++    }
++
+   session_bus_up ();
+ 
+   /* this is safe; testserver will exit once the bus goes away */

debian/patches/Skip-unreliable-gdbus-threading-tests-by-default-4.patch

@@ -0,0 +1,48 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 4 Jan 2019 08:37:20 +0000
+Subject: Skip unreliable gdbus-threading tests by default
+
+test_threaded_singleton() test to reproduce a race condition between
+last-unref of the global singleton GDBusConnection and g_bus_get_sync().
+
+test_method_calls_in_thread() checks that multiple threads can all make
+method calls to the same proxy.
+
+However, test setup intermittently times out with:
+
+    # GLib-GIO-DEBUG: run 0: refcount is 2, sleeping
+    Bail out! GLib-GIO-FATAL-ERROR: connection had too many refs
+
+The current theory upstream is that this might be a reference leak in
+test_delivery_in_thread().
+
+Furthermore, test teardown is now often failing when destroying the test
+bus.
+
+Demote these tests to be run as part of the "flaky" autopkgtests, but
+not at build time or in the part of the autopkgtest run that gates
+progress into testing.
+
+Bug: https://gitlab.gnome.org/GNOME/glib/issues/1515
+Forwarded: no
+---
+ gio/tests/gdbus-threading.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
+index e32fe7e..6ba941f 100644
+--- a/gio/tests/gdbus-threading.c
++++ b/gio/tests/gdbus-threading.c
+@@ -703,6 +703,12 @@ main (int   argc,
+       return 77;
+     }
+ 
++  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
++    {
++      g_print("ok 1 # SKIP all gdbus-threading tests skipped because they are too unreliable (glib#1515)\n");
++      return 77;
++    }
++
+   session_bus_up ();
+ 
+   /* this is safe; testserver will exit once the bus goes away */

debian/patches/Skip-unreliable-gdbus-threading-tests-by-default.patch

@@ -30,7 +30,7 @@ Forwarded: no
  1 file changed, 6 insertions(+)
 
 diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
-index 9f1f918..e829e26 100644
+index 755b490..9f1f9182 100644
 --- a/gio/tests/gdbus-threading.c
 +++ b/gio/tests/gdbus-threading.c
 @@ -679,6 +679,12 @@ main (int   argc,
@@ -43,6 +43,6 @@ index 9f1f918..e829e26 100644
 +      return 77;
 +    }
 +
-   if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-     {
-       g_print("ok 1 # SKIP all gdbus-threading tests skipped because they are too unreliable (glib#1515)\n");
+   session_bus_up ();
+ 
+   /* this is safe; testserver will exit once the bus goes away */

debian/patches/XB-1024-glib-XB-1000-XiB-1024-BUG-156528-GTK-19254-103652.patch

@@ -6,12 +6,11 @@ Subject: =?utf-8?b?KiDmlLnliqjor7TmmI7vvJrpgILphY3pupLpup/ns7vnu5/mlofku7Y=?=
  =?utf-8?b?5Yi277yJICogQlVH5Y+377yaMTU2NTI4IOOAkEdUS+mcgOaxgjE5MjU044CR44CQ?=
  =?utf-8?b?5paH5qGj5p+l55yL5Zmo44CR6YCa6L+H5paH5qGj5p+l55yL5Zmo5omT5byA5paH?=
  =?utf-8?b?5Lu25YiX6KGo55qE5paH5Lu25aSn5bCP5LiO5bGe5oCn6YeM55qE5aSn5bCP5LiN?=
- =?utf-8?b?5LiA6Ie0ICAgICAgICAgIDEwMzY1MiDjgJDnlKjkvosyNDI0NTbjgJHjgJDlvZI=?=
- =?utf-8?b?5qGj566h55CG5Zmo44CR5b2S5qGj5paH5Lu2LeaJk+W8gOeql+WPo+aYvuekug==?=
- =?utf-8?b?5paH5Lu25aSn5bCP5LiO5paH5Lu2566h55CG5Zmo5LiN5LiA6Ie0ICog6ZyA5rGC?=
- =?utf-8?b?L+S7u+WKoeWPt++8miAqIOWFtuS7luaUueWKqO+8miAqIOW9seWTjeWfn+ivtA==?=
- =?utf-8?b?5piO77ya5b2x5ZON5paH5Lu244CB56OB55uY5aSn5bCP5o2i566X57uT5p6c55qE?=
- =?utf-8?b?5pi+56S6?=
+ =?utf-8?b?5LiA6Ie0IDEwMzY1MiDjgJDnlKjkvosyNDI0NTbjgJHjgJDlvZLmoaPnrqHnkIY=?=
+ =?utf-8?b?5Zmo44CR5b2S5qGj5paH5Lu2LeaJk+W8gOeql+WPo+aYvuekuuaWh+S7tuWkpw==?=
+ =?utf-8?b?5bCP5LiO5paH5Lu2566h55CG5Zmo5LiN5LiA6Ie0ICog6ZyA5rGCL+S7u+WKoQ==?=
+ =?utf-8?b?5Y+377yaICog5YW25LuW5pS55Yqo77yaICog5b2x5ZON5Z+f6K+05piO77ya5b2x?=
+ =?utf-8?b?5ZON5paH5Lu244CB56OB55uY5aSn5bCP5o2i566X57uT5p6c55qE5pi+56S6?=
 
 ---
  glib/gutils.c | 2 +-

debian/patches/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch

@@ -1,70 +0,0 @@
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Thu, 27 Sep 2012 11:22:56 +0200
-Subject: Disable some tests on slow architectures which keep failing the
- tests
-
-[smcv: Modified to use g_test_skip() instead of omitting those test cases
-completely, and allow them to be re-enabled with a Debian-specific
-environment variable]
-
-Co-authored-by: Simon McVittie <smcv@debian.org>
-Forwarded: no
----
- glib/tests/mainloop.c | 16 ++++++++++++++++
- glib/tests/timeout.c  |  9 +++++++++
- 2 files changed, 25 insertions(+)
-
-diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
-index 152e74b..1aac153 100644
---- a/glib/tests/mainloop.c
-+++ b/glib/tests/mainloop.c
-@@ -524,6 +524,14 @@ test_child_sources (void)
-   GMainLoop *loop;
-   GSource *parent, *child_b, *child_c, *end;
- 
-+#if defined(__arm__)
-+  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+    {
-+      g_test_skip ("Not reliable on older ARM hardware");
-+      return;
-+    }
-+#endif
-+
-   ctx = g_main_context_new ();
-   loop = g_main_loop_new (ctx, FALSE);
- 
-@@ -602,6 +610,14 @@ test_recursive_child_sources (void)
-   GMainLoop *loop;
-   GSource *parent, *child_b, *child_c, *end;
- 
-+#if defined(__arm__)
-+  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+    {
-+      g_test_skip ("Not reliable on older ARM hardware");
-+      return;
-+    }
-+#endif
-+
-   ctx = g_main_context_new ();
-   loop = g_main_loop_new (ctx, FALSE);
- 
-diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c
-index 1ae3f3a..f838c9c 100644
---- a/glib/tests/timeout.c
-+++ b/glib/tests/timeout.c
-@@ -196,6 +196,15 @@ test_func (gpointer data)
- static void
- test_rounding (void)
- {
-+
-+#if defined(__arm__)
-+  if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+    {
-+      g_test_skip ("Not reliable on older ARM hardware");
-+      return;
-+    }
-+#endif
-+
-   loop = g_main_loop_new (NULL, FALSE);
- 
-   last_time = g_get_monotonic_time ();

debian/patches/fix-trash-issue-in-data.patch

@@ -9,10 +9,10 @@ Subject: fix-trash-issue-in-data
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gio/glocalfile.c b/gio/glocalfile.c
-index 9303902..c357267 100644
+index f41e7d0..0f37547 100644
 --- a/gio/glocalfile.c
 +++ b/gio/glocalfile.c
-@@ -2050,7 +2050,7 @@ g_local_file_trash (GFile         *file,
+@@ -2052,7 +2052,7 @@ g_local_file_trash (GFile         *file,
        g_free (path);
      }
  

debian/patches/series

@@ -0,0 +1,39 @@
+Disable-confusing-to-users-warning-about-deprecated-schem.patch
+closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch
+Disable-some-tests-on-slow-architectures-which-keep-faili.patch
+gmenumodel-test-Mark-as-flaky.patch
+gvariant-test-Don-t-run-at-build-time-on-mips.patch
+Skip-unreliable-gdbus-threading-tests-by-default.patch
+taptestrunner-Stop-looking-like-an-executable-script.patch
+timer-test-use-volatile-for-locals.patch
+vfat-4G.patch
+fix-trash-issue-in-data-usershare.patch
+Add-extra-debug-to-memory-monitor-dbus-test.patch
+Call-gettext-if-.desktop-file-does-not-have-inline-transl.patch
+change-format.patch
+Disable-some-tests-on-slow-architectures-which-keep-faili-1.patch
+166960.patch
+169359-U.patch
+182831-U.patch
+fix-trash-issue-in-data.patch
+gdbus-server-auth-Normally-skip-flaky-DBUS_COOKIE_SHA1-te.patch
+GLIB_FORCE_USE_PORTAL-GTK_USE_PORTAL-1-GLIB_FORCE_USE_POR.patch
+GLIB_USE_KYLIN_PROCESS_MANAGER-GLIB_USE_KYLIN_PROCESS_MAN.patch
+kylin-process-manager-dbus.patch
+Provide-backwards-compatibility-for-01_gettext-desktopfil.patch
+Skip-memory-monitor-dbus-test-if-not-specifically-request.patch
+Skip-unreliable-gdbus-threading-tests-by-default-1.patch
+spawn-test-riscv64.patch
+testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch
+tests-Skip-debugcontroller-test.patch
+tryfix-I8OAV1-kylin-process-manager.patch
+user-directory-i18n.patch
+XB-1024-glib-XB-1000-XiB-1024-BUG-156528-GTK-19254-103652.patch
+.patch
+5c52117c4ae9367c96609915fde5a280101a9b0b-GLIB_FORCE_USE_P.patch
+arm64.patch
+kylin-process-manager-dbus-1.patch
+Skip-unreliable-gdbus-threading-tests-by-default-2.patch
+Skip-unreliable-gdbus-threading-tests-by-default-3.patch
+Skip-unreliable-gdbus-threading-tests-by-default-4.patch
+Skip-test-which-performs-some-unreliable-floating-point-c.patch

debian/patches/tryfix-I8OAV1-kylin-process-manager.patch

@@ -13,7 +13,7 @@ Content-Transfer-Encoding: 8bit
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gio/gportalsupport.c b/gio/gportalsupport.c
-index f8d866f..0efbc73 100644
+index 12c5d6a..5b8e622 100644
 --- a/gio/gportalsupport.c
 +++ b/gio/gportalsupport.c
 @@ -133,7 +133,7 @@ sandbox_info_read (void)

debian/patches/user-directory-i18n.patch

@@ -9,7 +9,7 @@ Subject: user-directory-i18n
  1 file changed, 32 insertions(+), 1 deletion(-)
 
 diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
-index 7c2524e..ad5dfb8 100644
+index 4f51427..0f7c952 100644
 --- a/gio/glocalfileinfo.c
 +++ b/gio/glocalfileinfo.c
 @@ -124,6 +124,9 @@ static GHashTable *gid_cache = NULL;

debian/patches/vfat-4G.patch

@@ -10,7 +10,7 @@ Subject: =?utf-8?b?dmZhdOaWh+S7tui2hei/hzRH56e75Yqo5oiW5aSN5Yi255u05o6l5oql?=
  1 file changed, 70 insertions(+)
 
 diff --git a/gio/gfile.c b/gio/gfile.c
-index 16ff09f..14ce34e 100644
+index c7658ca..af7cb4f 100644
 --- a/gio/gfile.c
 +++ b/gio/gfile.c
 @@ -55,6 +55,9 @@