CVS commit: pkgsrc/devel/xfce4-conf

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Wed Feb  6 11:25:02 UTC 2019

Modified Files:
        pkgsrc/devel/xfce4-conf: distinfo
Added Files:
        pkgsrc/devel/xfce4-conf/patches:
            patch-gsettings-backend_xfconf-giomodule.c

Log Message:
Downgrade a critical message to a warning - to allow using the introspection
compiler without $DISPLAY being set.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/xfce4-conf/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/xfce4-conf/patches/patch-gsettings-backend_xfconf-giomodule.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/xfce4-conf/distinfo
diff -u pkgsrc/devel/xfce4-conf/distinfo:1.6 pkgsrc/devel/xfce4-conf/distinfo:1.7
--- pkgsrc/devel/xfce4-conf/distinfo:1.6        Fri Jan 18 14:15:36 2019
+++ pkgsrc/devel/xfce4-conf/distinfo    Wed Feb  6 11:25:02 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2019/01/18 14:15:36 youri Exp $
+$NetBSD: distinfo,v 1.7 2019/02/06 11:25:02 martin Exp $
 
 SHA1 (xfconf-4.13.6.tar.bz2) = e972e9f24508f8a435dd1d9230e0399a39773443
 RMD160 (xfconf-4.13.6.tar.bz2) = beb87ea7d56fdbeace0f2313ee09d2b23d837c8a
 SHA512 (xfconf-4.13.6.tar.bz2) = 0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755
 Size (xfconf-4.13.6.tar.bz2) = 578107 bytes
+SHA1 (patch-gsettings-backend_xfconf-giomodule.c) = 5afc8c4822c551b72c7cfe1fbec8196127b05f9b

Added files:

Index: pkgsrc/devel/xfce4-conf/patches/patch-gsettings-backend_xfconf-giomodule.c
diff -u /dev/null pkgsrc/devel/xfce4-conf/patches/patch-gsettings-backend_xfconf-giomodule.c:1.1
--- /dev/null   Wed Feb  6 11:25:03 2019
+++ pkgsrc/devel/xfce4-conf/patches/patch-gsettings-backend_xfconf-giomodule.c  Wed Feb  6 11:25:02 2019
@@ -0,0 +1,21 @@
+$NetBSD: patch-gsettings-backend_xfconf-giomodule.c,v 1.1 2019/02/06 11:25:02 martin Exp $
+
+Downgrade a critical message to warning, this may happen when loading the
+module w/o intention to actually use it from the introspection compiler.
+
+Upstream ticket https://bugzilla.xfce.org/show_bug.cgi?id=15122
+
+--- gsettings-backend/xfconf-giomodule.c.orig  2018-10-21 12:04:21.000000000 +0200
++++ gsettings-backend/xfconf-giomodule.c       2019-02-06 11:36:27.869237116 +0100
+@@ -34,9 +34,9 @@ G_MODULE_EXPORT XFCONF_EXPORT void g_io_
+   GError *error = NULL;
+ 
+   if (!xfconf_init (&error)) {
+-    g_critical ("Failed to get connection to xfconfd: %s", error->message);
++    /* we could be loaded from g-ir-compiler, so do not abort */
++    g_warning ("Failed to get connection to xfconfd: %s", error->message);
+     g_error_free (error);
+-    return;
+   }
+ 
+   g_type_module_use(G_TYPE_MODULE(module));