[oe-commits] [meta-openembedded] 05/06: gtk-xfce-engine: Fix build with glib-2.0 > 2.53

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master
in repository meta-openembedded.

commit 9473dddf8aecb73df88d7a1c83ad5643393ab057
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Tue Dec 12 12:14:48 2017 -0800

    gtk-xfce-engine: Fix build with glib-2.0 > 2.53
    
    Fixes errors like
    UnicodeDecodeError: 'utf-8' codec can't decode byte 0xd6 in position 980: invalid continuation byte
    Makefile:737: recipe for target 'xfce_typebuiltin.h' failed
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../gtk-xfce-engine/glib-2.54-ftbfs.patch          | 23 ++++++++++++++++++++++
 .../gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb       |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch
new file mode 100644
index 0000000..fb89102
--- /dev/null
+++ b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch
@@ -0,0 +1,23 @@
+Description: Fix FTBFS with glib 2.54
+ glib-mkenums now expects input files to be UTF-8,
+ fix the encoding of libgnomeui/gnome-scores.h
+Author: Adrian Bunk <bunk at debian.org>
+
+ported from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870738
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+
+Index: gtk-xfce-engine-3.2.0/gtk-3.0/xfce_style_types.h
+===================================================================
+--- gtk-xfce-engine-3.2.0.orig/gtk-3.0/xfce_style_types.h
++++ gtk-xfce-engine-3.2.0/gtk-3.0/xfce_style_types.h
+@@ -19,7 +19,7 @@
+  *
+  *  Portions based Thinice port by 
+  *                       Tim Gerla <timg at rrv.net>,
+- *                       Tomas �gren <stric at ing.umu.se,
++ *                       Tomas Ögren <stric at ing.umu.se>,
+  *                       Richard Hult <rhult at codefactory.se>
+  *  Portions based on Smooth theme by
+  *                       Andrew Johnson <ajgenius at ajgenius.us>
diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb
index ae7f99f..ef4f4bf 100644
--- a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb
+++ b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb
@@ -8,6 +8,8 @@ inherit xfce distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
+SRC_URI += "file://glib-2.54-ftbfs.patch"
+
 SRC_URI[md5sum] = "363d6c16a48a00e26d45c45c2e1fd739"
 SRC_URI[sha256sum] = "875c9c3bda96faf050a2224649cc42129ffb662c4de33add8c0fd1fb860b47ed"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.