[gnome-continuous] Apply patch to quell a g_warning in ibus



commit b7d7fce73a929d3846245b1e33d81089577a9a83
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Mar 7 08:50:23 2016 -0500

    Apply patch to quell a g_warning in ibus
    
    Apply the patch from https://github.com/ibus/ibus/pull/1844
    to avoid tests failing due to an unnecessary warning.

 manifest.json                                      |    3 +-
 .../ibus-Don-t-warn-if-DISPLAY-is-not-set.patch    |   31 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 8c584e6..48320db 100644
--- a/manifest.json
+++ b/manifest.json
@@ -945,7 +945,8 @@
 
                 {"src": "ibus:ibus.git",
                 "patches": ["ibus-builddir.patch",
-                            "ibus-dconf-Work-around-using-dbus-development-builds-and-.patch"],
+                            "ibus-dconf-Work-around-using-dbus-development-builds-and-.patch",
+                             "ibus-Don-t-warn-if-DISPLAY-is-not-set.patch"],
                 "config-opts": ["--disable-tests", 
                                 "--disable-gconf",
                                 "--enable-dconf",
diff --git a/patches/ibus-Don-t-warn-if-DISPLAY-is-not-set.patch 
b/patches/ibus-Don-t-warn-if-DISPLAY-is-not-set.patch
new file mode 100644
index 0000000..a98abf1
--- /dev/null
+++ b/patches/ibus-Don-t-warn-if-DISPLAY-is-not-set.patch
@@ -0,0 +1,31 @@
+From 1856f5c9bacf1cd1a3aa88b70c02223665cd31b8 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen redhat com>
+Date: Sat, 5 Mar 2016 16:06:03 -0500
+Subject: [PATCH] Don't warn if DISPLAY is not set
+
+This is normal under Wayland, and not worth warning about.
+The warnings disrupt unit tests in GNOME continuous, which
+treat warnings as fatal.
+---
+ src/ibusshare.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/ibusshare.c b/src/ibusshare.c
+index 63800a6..b793a96 100644
+--- a/src/ibusshare.c
++++ b/src/ibusshare.c
+@@ -113,10 +113,7 @@ ibus_get_socket_path (void)
+             display = g_strdup (_display);
+         }
+ 
+-        if (display == NULL) {
+-            g_warning ("DISPLAY is empty! We use default DISPLAY (:0.0)");
+-        }
+-        else {
++        if (display) {
+             p = display;
+             hostname = display;
+             for (; *p != ':' && *p != '\0'; p++);
+-- 
+2.7.2
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]