diff options
-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 @@ | |||
1 | From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dominique Leuenberger <dimstar@opensuse.org> | ||
3 | Date: Sun, 27 Nov 2011 14:24:57 +0000 | ||
4 | Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | --- | ||
9 | diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c | ||
10 | index 1f7a41f..56a9286 100644 | ||
11 | --- a/engines/clearlooks/src/animation.c | ||
12 | +++ b/engines/clearlooks/src/animation.c | ||
13 | @@ -28,7 +28,7 @@ | ||
14 | #include "animation.h" | ||
15 | |||
16 | #ifdef HAVE_WORKING_ANIMATION | ||
17 | -#include <glib/gtimer.h> | ||
18 | +#include <glib.h> | ||
19 | |||
20 | struct _AnimationInfo { | ||
21 | GTimer *timer; | ||
22 | -- | ||
23 | 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" | |||
8 | SECTION = "x11/base" | 8 | SECTION = "x11/base" |
9 | DEPENDS = "gtk+" | 9 | DEPENDS = "gtk+" |
10 | 10 | ||
11 | PR = "r1" | 11 | PR = "r2" |
12 | 12 | ||
13 | PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" | 13 | PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" |
14 | 14 | ||
@@ -39,5 +39,6 @@ python populate_packages_prepend() { | |||
39 | # TODO: mark theme packages as arch all | 39 | # TODO: mark theme packages as arch all |
40 | } | 40 | } |
41 | 41 | ||
42 | SRC_URI += "file://glib-2.32.patch" | ||
42 | SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" | 43 | SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" |
43 | SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" | 44 | SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" |