summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gnome
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-12-23 10:33:27 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-23 11:17:08 +0100
commit2b3a6f6eed5883844e8371b09b57267f8a0989d0 (patch)
tree8d3e52bf74d7c903e5a24a00630718719a6a7da0 /meta-gnome/recipes-gnome/gnome
parentd5bb26f8ace3a3b9802f40a5ef5778d51954ba81 (diff)
downloadmeta-openembedded-2b3a6f6eed5883844e8371b09b57267f8a0989d0.tar.gz
libgnomecups: fix build with >=glib-2.31
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome')
-rw-r--r--meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch42
-rw-r--r--meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb4
2 files changed, 46 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch
new file mode 100644
index 000000000..c7b616578
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch
@@ -0,0 +1,42 @@
1Imported from gentoo:
2
3http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch
4
5From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
6From: Dominique Leuenberger <dimstar@opensuse.org>
7Date: Sun, 27 Nov 2011 21:36:41 +0100
8Subject: [PATCH] Fix: Only glib.h can be included
9
10---
11 libgnomecups/gnome-cups-i18n.c | 2 +-
12 libgnomecups/gnome-cups-init.h | 3 +--
13 2 files changed, 2 insertions(+), 3 deletions(-)
14
15diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
16index 8987c5c..127756d 100644
17--- a/libgnomecups/gnome-cups-i18n.c
18+++ b/libgnomecups/gnome-cups-i18n.c
19@@ -1,5 +1,5 @@
20 #include <config.h>
21-#include <glib/gmacros.h>
22+#include <glib.h>
23 #include "gnome-cups-i18n.h"
24
25 #ifdef ENABLE_NLS
26diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
27index 22b682a..c4600fc 100644
28--- a/libgnomecups/gnome-cups-init.h
29+++ b/libgnomecups/gnome-cups-init.h
30@@ -1,8 +1,7 @@
31 #ifndef GNOME_CUPS_INIT
32 #define GNOME_CUPS_INIT
33
34-#include <glib/gtypes.h>
35-#include <glib/gmacros.h>
36+#include <glib.h>
37
38 G_BEGIN_DECLS
39
40--
411.7.7
42
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
index c932ba018..199ee72da 100644
--- a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
+++ b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4 4
5DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" 5DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
6 6
7PR = "r1"
8
7inherit gnome pkgconfig 9inherit gnome pkgconfig
8 10
9do_compile_append () { 11do_compile_append () {
@@ -11,5 +13,7 @@ do_compile_append () {
11 sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc 13 sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc
12} 14}
13 15
16SRC_URI += "file://libgnomecups-0.2.3-glib.h.patch"
17
14SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b" 18SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b"
15SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29" 19SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29"