diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-05-15 11:46:26 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-05-16 07:29:17 +0200 |
| commit | e478a7affaf3e89663e29f996a05a1f132f0b956 (patch) | |
| tree | 01322d3dca29bae16c3629fea3fe0a921629fe1b | |
| parent | 29da3f431f1a2fa27e5117bc8a21c9e5d61b54eb (diff) | |
| download | meta-openembedded-contrib-e478a7affaf3e89663e29f996a05a1f132f0b956.tar.gz | |
florence: make it build by aligning includes
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-support/florence/florence_0.5.1.bb | 5 |
2 files changed, 37 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch b/meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch new file mode 100644 index 0000000000..06f10bdef1 --- /dev/null +++ b/meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch @@ -0,0 +1,33 @@ +From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Tue, 15 May 2012 13:40:05 +0200 +Subject: [PATCH] Fix glib includes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Upstream status: unknown + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + src/trace.c | 5 +---- + 1 files changed, 1 insertions(+), 4 deletions(-) + +diff --git a/src/trace.c b/src/trace.c +index 5ea5c13..774c56d 100644 +--- a/src/trace.c ++++ b/src/trace.c +@@ -21,10 +21,7 @@ + + #include "trace.h" + #include "system.h" +-#include <glib/gprintf.h> +-#include <glib/gutils.h> +-#include <glib/gslist.h> +-#include <glib/gstrfuncs.h> ++#include <glib.h> + #include <stdio.h> + #include <stdarg.h> + +-- +1.7.6.5 + diff --git a/meta-oe/recipes-support/florence/florence_0.5.1.bb b/meta-oe/recipes-support/florence/florence_0.5.1.bb index dbffac7076..dcbcefae43 100644 --- a/meta-oe/recipes-support/florence/florence_0.5.1.bb +++ b/meta-oe/recipes-support/florence/florence_0.5.1.bb @@ -6,9 +6,12 @@ HOMEPAGE = "http://florence.sourceforge.net/english.html" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +PR = "r1" + DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native" -SRC_URI = "http://switch.dl.sourceforge.net/project/florence/florence/0.5.1/florence-0.5.1.tar.bz2" +SRC_URI = "http://switch.dl.sourceforge.net/project/florence/florence/0.5.1/florence-0.5.1.tar.bz2 \ + file://0001-Fix-glib-includes.patch" SRC_URI[md5sum] = "56d12e5b47c100d9df172aa5ddc0f609" SRC_URI[sha256sum] = "7b06ed84ef2b7b22d8d2cf0c7d013a05409bd82028240ac8719a68b192d5bc62" |