From 0d224e77e1fb2b05ddb3f02059ae480ee2bec636 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 23 Dec 2012 10:33:27 +0100 Subject: libgnomecups: fix build with >=glib-2.31 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Jansa Signed-off-by: Eric Bénard --- .../libgnomecups/libgnomecups-0.2.3-glib.h.patch | 42 ++++++++++++++++++++++ .../recipes-gnome/gnome/libgnomecups_0.2.3.bb | 4 +++ 2 files changed, 46 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch 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 0000000000..c7b6165787 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome/libgnomecups/libgnomecups-0.2.3-glib.h.patch @@ -0,0 +1,42 @@ +Imported from gentoo: + +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch + +From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Sun, 27 Nov 2011 21:36:41 +0100 +Subject: [PATCH] Fix: Only glib.h can be included + +--- + libgnomecups/gnome-cups-i18n.c | 2 +- + libgnomecups/gnome-cups-init.h | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c +index 8987c5c..127756d 100644 +--- a/libgnomecups/gnome-cups-i18n.c ++++ b/libgnomecups/gnome-cups-i18n.c +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include "gnome-cups-i18n.h" + + #ifdef ENABLE_NLS +diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h +index 22b682a..c4600fc 100644 +--- a/libgnomecups/gnome-cups-init.h ++++ b/libgnomecups/gnome-cups-init.h +@@ -1,8 +1,7 @@ + #ifndef GNOME_CUPS_INIT + #define GNOME_CUPS_INIT + +-#include +-#include ++#include + + G_BEGIN_DECLS + +-- +1.7.7 + 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 c932ba0182..199ee72daf 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" DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" +PR = "r1" + inherit gnome pkgconfig do_compile_append () { @@ -11,5 +13,7 @@ do_compile_append () { sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc } +SRC_URI += "file://libgnomecups-0.2.3-glib.h.patch" + SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b" SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29" -- cgit 1.2.3-korg