diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-05-03 07:42:52 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-03 15:15:25 +0100 |
| commit | 93a4f4a8e7c298c5a19e757ae797328369da104e (patch) | |
| tree | bb788065867227004dc9f149c66e103de0f34b74 /meta | |
| parent | aba81b64679ec0b1809946cb480e261af47f7625 (diff) | |
| download | openembedded-core-93a4f4a8e7c298c5a19e757ae797328369da104e.tar.gz openembedded-core-93a4f4a8e7c298c5a19e757ae797328369da104e.tar.bz2 openembedded-core-93a4f4a8e7c298c5a19e757ae797328369da104e.zip | |
gtk-engines: fix build with glib-2.32
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-gnome/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 0000000000..f0b878d376 --- /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@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 3ca6e81fae..5b8ee88bdf 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" |