pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/xfce4-conf Downgrade a critical message to a war...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a09bc6e620a8
branches: trunk
changeset: 319143:a09bc6e620a8
user: martin <martin%pkgsrc.org@localhost>
date: Wed Feb 06 11:25:02 2019 +0000
description:
Downgrade a critical message to a warning - to allow using the introspection
compiler without $DISPLAY being set.
diffstat:
devel/xfce4-conf/distinfo | 3 +-
devel/xfce4-conf/patches/patch-gsettings-backend_xfconf-giomodule.c | 21 ++++++++++
2 files changed, 23 insertions(+), 1 deletions(-)
diffs (37 lines):
diff -r ef4db6a9592d -r a09bc6e620a8 devel/xfce4-conf/distinfo
--- a/devel/xfce4-conf/distinfo Wed Feb 06 11:23:27 2019 +0000
+++ b/devel/xfce4-conf/distinfo Wed Feb 06 11:25:02 2019 +0000
@@ -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
diff -r ef4db6a9592d -r a09bc6e620a8 devel/xfce4-conf/patches/patch-gsettings-backend_xfconf-giomodule.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/xfce4-conf/patches/patch-gsettings-backend_xfconf-giomodule.c Wed Feb 06 11:25:02 2019 +0000
@@ -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));
Home |
Main Index |
Thread Index |
Old Index