[arch-commits] Commit in glib2/trunk (3 files)

[Jan Steffens]

    Date: Wednesday, January 26, 2022 @ 15:22:37
  Author: heftig
Revision: 435164

Reformat patch

Added:
  glib2/trunk/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
    (from rev 433807, glib2/trunk/noisy-glib-compile-schemas.diff)
Modified:
  glib2/trunk/PKGBUILD
Deleted:
  glib2/trunk/noisy-glib-compile-schemas.diff

-----------------------------------------------------------------+
 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch |   33 ++++++++++
 PKGBUILD                                                        |    6 -
 noisy-glib-compile-schemas.diff                                 |   24 -------
 3 files changed, 36 insertions(+), 27 deletions(-)

Copied: glib2/trunk/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch (from rev 433807, glib2/trunk/noisy-glib-compile-schemas.diff)
===================================================================
--- 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch	                        (rev 0)
+++ 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch	2022-01-26 15:22:37 UTC (rev 435164)
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Fri, 7 Jan 2022 18:59:10 +0000
+Subject: [PATCH] glib-compile-schemas: Remove noisy deprecation warnings
+
+---
+ gio/glib-compile-schemas.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
+index 7e1152f6bf45..924a3e7f176a 100644
+--- a/gio/glib-compile-schemas.c
++++ b/gio/glib-compile-schemas.c
+@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState  *state,
+       return;
+     }
+ 
+-  if (path && (g_str_has_prefix (path, "/apps/") ||
+-               g_str_has_prefix (path, "/desktop/") ||
+-               g_str_has_prefix (path, "/system/")))
+-    {
+-      gchar *message = NULL;
+-      message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”.  "
+-                                   "Paths starting with "
+-                                   "“/apps/”, “/desktop/” or “/system/” are deprecated."),
+-                                 id, path);
+-      g_printerr ("%s\n", message);
+-      g_free (message);
+-    }
+-
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-26 10:52:22 UTC (rev 435163)
+++ PKGBUILD	2022-01-26 15:22:37 UTC (rev 435164)
@@ -14,10 +14,10 @@
              meson dbus)
 checkdepends=(desktop-file-utils)
 source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver"
-        noisy-glib-compile-schemas.diff
+        0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
         glib-compile-schemas.hook gio-querymodules.{hook,script})
 sha256sums=('SKIP'
-            'b1cb539389aaabd13671424452f2805112a359b96c9e0e7f80fad804a77f9c7e'
+            'edb5e34ac0a77431978cab55b98e39754d73455e28a38f5003424e943bbe5fff'
             '64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25'
             '2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7'
             '92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e')
@@ -27,7 +27,7 @@
   cd glib
 
   # Suppress noise from glib-compile-schemas.hook
-  git apply -3 ../noisy-glib-compile-schemas.diff
+  git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
 }
 
 build() {

Deleted: noisy-glib-compile-schemas.diff
===================================================================
--- noisy-glib-compile-schemas.diff	2022-01-26 10:52:22 UTC (rev 435163)
+++ noisy-glib-compile-schemas.diff	2022-01-26 15:22:37 UTC (rev 435164)
@@ -1,24 +0,0 @@
-diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c
-index cfea042f8..1b2afe457 100644
---- i/gio/glib-compile-schemas.c
-+++ w/gio/glib-compile-schemas.c
-@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState  *state,
-       return;
-     }
- 
--  if (path && (g_str_has_prefix (path, "/apps/") ||
--               g_str_has_prefix (path, "/desktop/") ||
--               g_str_has_prefix (path, "/system/")))
--    {
--      gchar *message = NULL;
--      message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”.  "
--                                   "Paths starting with "
--                                   "“/apps/”, “/desktop/” or “/system/” are deprecated."),
--                                 id, path);
--      g_printerr ("%s\n", message);
--      g_free (message);
--    }
--
-   state->schema_state = schema_state_new (path, gettext_domain,
-                                           extends, extends_name, list_of);
-