[oe-commits] Martin Jansa : gtk-engines: fix build with glib-2.32

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 93a4f4a8e7c298c5a19e757ae797328369da104e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=93a4f4a8e7c298c5a19e757ae797328369da104e

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Thu May  3 07:42:52 2012 +0200

gtk-engines: fix build with glib-2.32

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../gtk-engines/gtk-engines-2.20.2/glib-2.32.patch |   23 ++++++++++++++++++++
 .../gtk-engines/gtk-engines_2.20.2.bb              |    3 +-
 2 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
new file mode 100644
index 0000000..f0b878d
--- /dev/null
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
@@ -0,0 +1,23 @@
+From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar at opensuse.org>
+Date: Sun, 27 Nov 2011 14:24:57 +0000
+Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914
+
+Upstream-Status: Backport
+
+---
+diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c
+index 1f7a41f..56a9286 100644
+--- a/engines/clearlooks/src/animation.c
++++ b/engines/clearlooks/src/animation.c
+@@ -28,7 +28,7 @@
+ #include "animation.h"
+ 
+ #ifdef HAVE_WORKING_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+ 
+ struct _AnimationInfo {
+ 	GTimer *timer;
+--
+cgit v0.9.0.2
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 3ca6e81..5b8ee88 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SECTION = "x11/base"
 DEPENDS = "gtk+"
 
-PR = "r1"
+PR = "r2"
 
 PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
 
@@ -39,5 +39,6 @@ python populate_packages_prepend() {
 	# TODO: mark theme packages as arch all
 }
 
+SRC_URI += "file://glib-2.32.patch"
 SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f"
 SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"