CVS commit: pkgsrc/devel/glib2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 18 11:18:29 UTC 2020

Modified Files:
        pkgsrc/devel/glib2: Makefile distinfo
Added Files:
        pkgsrc/devel/glib2/patches: patch-gio_glib-compile-schemas.c

Log Message:
glib2: disable deprecation warnings

glib2 complains about it, but gsettings-desktop-schemas is actively
using these paths and not planning to stop anytime soon.

This deprecation warning causes lots of unnecessary warnings in
pkgin upgrade logs.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 pkgsrc/devel/glib2/Makefile \
    pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/glib2/patches/patch-gio_glib-compile-schemas.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.274 pkgsrc/devel/glib2/Makefile:1.275
--- pkgsrc/devel/glib2/Makefile:1.274   Tue Jun 30 11:59:19 2020
+++ pkgsrc/devel/glib2/Makefile Fri Sep 18 11:18:29 2020
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.274 2020/06/30 11:59:19 adam Exp $
+# $NetBSD: Makefile,v 1.275 2020/09/18 11:18:29 wiz Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=   1
+
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
 
Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.274 pkgsrc/devel/glib2/distinfo:1.275
--- pkgsrc/devel/glib2/distinfo:1.274   Wed Aug 19 09:34:35 2020
+++ pkgsrc/devel/glib2/distinfo Fri Sep 18 11:18:29 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.274 2020/08/19 09:34:35 adam Exp $
+$NetBSD: distinfo,v 1.275 2020/09/18 11:18:29 wiz Exp $
 
 SHA1 (glib-2.64.5.tar.xz) = be12160d2b91a152721279d27b00f8affbf9501b
 RMD160 (glib-2.64.5.tar.xz) = f1d1dd687d98b796b0d6219e6053ced097034c15
@@ -7,6 +7,7 @@ Size (glib-2.64.5.tar.xz) = 4778456 byte
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
 SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
+SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d

Added files:

Index: pkgsrc/devel/glib2/patches/patch-gio_glib-compile-schemas.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_glib-compile-schemas.c:1.1
--- /dev/null   Fri Sep 18 11:18:29 2020
+++ pkgsrc/devel/glib2/patches/patch-gio_glib-compile-schemas.c Fri Sep 18 11:18:29 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-gio_glib-compile-schemas.c,v 1.1 2020/09/18 11:18:29 wiz Exp $
+
+gsettings-desktop-schemas uses deprecated paths and is not going to stop
+anytime soon, see
+https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/issues/27
+
+--- gio/glib-compile-schemas.c.orig    2020-08-18 11:06:36.941520700 +0000
++++ gio/glib-compile-schemas.c
+@@ -1232,6 +1232,7 @@ parse_state_start_schema (ParseState  *s
+       return;
+     }
+ 
++#if 0
+   if (path && (g_str_has_prefix (path, "/apps/") ||
+                g_str_has_prefix (path, "/desktop/") ||
+                g_str_has_prefix (path, "/system/")))
+@@ -1244,6 +1245,7 @@ parse_state_start_schema (ParseState  *s
+       g_printerr ("%s\n", message);
+       g_free (message);
+     }
++#endif
+ 
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);