[OE-core] [PATCH] gtk+: Fix bug in gtk-demo

Li xin lixin.fnst at cn.fujitsu.com
Fri Jul 17 06:37:41 UTC 2015


Modify gtkrc.c,otherwise the input-methods can not be enabled in gtk-demo.

Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
---
 meta/recipes-gnome/gtk+/gtk+/gtkrc.c-Bug-fix.patch | 30 ++++++++++++++++++++++
 meta/recipes-gnome/gtk+/gtk+_2.24.28.bb            |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-gnome/gtk+/gtk+/gtkrc.c-Bug-fix.patch

diff --git a/meta/recipes-gnome/gtk+/gtk+/gtkrc.c-Bug-fix.patch b/meta/recipes-gnome/gtk+/gtk+/gtkrc.c-Bug-fix.patch
new file mode 100644
index 0000000..59a707c
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+/gtkrc.c-Bug-fix.patch
@@ -0,0 +1,30 @@
+From 3080e6d55f12b5ba453723f295653c1696c4ad44 Mon Sep 17 00:00:00 2001
+From: Li xin <lixin.fnst at cn.fujitsu.com>
+Date: Wed, 15 Jul 2015 20:05:05 +0900
+Subject: [PATCH] gtkrc.c: Bug fix
+
+Modify gtkrc.c, otherwise the input-methods can not be enabled in gtk-demo.
+
+Upstream-Status: pending
+
+Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
+---
+ gtk/gtkrc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
+index 50b2563..4e6b618 100644
+--- a/gtk/gtkrc.c
++++ b/gtk/gtkrc.c
+@@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void)
+       if (im_module_file)
+ 	result = g_strdup (im_module_file);
+       else
+-        result = gtk_rc_make_default_dir ("immodules.cache");
++        result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+     }
+ 
+   return result;
+-- 
+1.8.4.2
+
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb
index e343773..9576670 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb
@@ -10,6 +10,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
            file://toggle-font.diff;striplevel=0 \
            file://doc-fixes.patch \
            file://strict-prototypes.patch \
+           file://gtkrc.c-Bug-fix.patch \
 	  "
 
 SRC_URI[md5sum] = "bfacf87b2ea67e4e5c7866a9003e6526"
-- 
1.8.4.2




More information about the Openembedded-core mailing list