[oe-commits] Khem Raj : libbonoboui: Fix build with gcc5

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 45b0b62b761d3be7ca1226b16d03557169b86041
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=45b0b62b761d3be7ca1226b16d03557169b86041

Author: Khem Raj <raj.khem at gmail.com>
Date:   Mon May 11 22:34:42 2015 -0700

libbonoboui: Fix build with gcc5

This is required to remove non-existing include paths which
gcc-5 detects and is fussy about

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-gnome/recipes-gnome/bonobo/files/gcc5.patch      | 12 ++++++++++++
 meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch b/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch
new file mode 100644
index 0000000..f7528ad
--- /dev/null
+++ b/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch
@@ -0,0 +1,12 @@
+Index: libbonoboui-2.24.5/tools/browser/Makefile.am
+===================================================================
+--- libbonoboui-2.24.5.orig/tools/browser/Makefile.am
++++ libbonoboui-2.24.5/tools/browser/Makefile.am
+@@ -2,7 +2,6 @@ INCLUDES =	\
+ 	-DBONOBO_BROWSER_DATADIR=\""$(datadir)"\"	\
+         -DBONOBO_SUPPORT_LOCALEDIR=\""$(datadir)/locale"\"        \
+ 	-I$(srcdir) -I$(top_srcdir) 			\
+-	-I$(top_srcdir)/bonobo-browser			\
+ 	$(BONOBOUI_CFLAGS)				\
+ 	$(WARN_CFLAGS)
+ 
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
index 6c2d67a..f3e37a9 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
+++ b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb
@@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
 
 inherit gnomebase pkgconfig gtk-doc
+
+SRC_URI += "file://gcc5.patch"
+
 SRC_URI[archive.md5sum] = "853be8e28aaa4ce48ba60be7d9046bf4"
 SRC_URI[archive.sha256sum] = "fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd"