Patchwork [meta-xfce] ristretto: fix build error by including locale.h

login
register
mail settings
Submitter Andreas Müller
Date Jan. 3, 2012, 3:39 p.m.
Message ID <1325605177-5372-1-git-send-email-schnitzeltony@gmx.de>
Download mbox | patch
Permalink /patch/18243/
State Accepted
Commit f3e086bae4442bf0941ad3f11b7c46ccabade30d
Headers show

Comments

Andreas Müller - Jan. 3, 2012, 3:39 p.m.
build tested / error was:

| util.c: In function 'rstto_launch_help':
| util.c:36:35: error: 'LC_MESSAGES' undeclared (first use in this function)
| util.c:36:35: note: each undeclared identifier is reported only once for each function it appears in
| make[3]: *** [ristretto-util.o] Error 1
| make[3]: Leaving directory `/home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/ristretto-0.3.0-r0/ristretto-0.3.0/src'
| make[2]: *** [all] Error 2
| make[2]: Leaving directory `/home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/ristretto-0.3.0-r0/ristretto-0.3.0/src'
| make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory `/home/Superandy/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/ristretto-0.3.0-r0/ristretto-0.3.0'
| make: *** [all] Error 2
| + die 'oe_runmake failed'

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
 .../ristretto/files/add-locale_h.patch             |   13 +++++++++++++
 .../recipes-apps/ristretto/ristretto_0.3.0.bb      |    3 +++
 2 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-apps/ristretto/files/add-locale_h.patch

Patch

diff --git a/meta-xfce/recipes-apps/ristretto/files/add-locale_h.patch b/meta-xfce/recipes-apps/ristretto/files/add-locale_h.patch
new file mode 100644
index 0000000..a149500
--- /dev/null
+++ b/meta-xfce/recipes-apps/ristretto/files/add-locale_h.patch
@@ -0,0 +1,13 @@ 
+Upstream-Status: Applied in git repo
+---
+--- a/src/util.c.old	2011-11-05 22:12:00.000000000 +0100
++++ b/src/util.c	2012-01-03 16:18:21.435234961 +0100
+@@ -18,7 +18,7 @@
+ 
+ #include <config.h>
+ #include <glib.h>
+-
++#include <locale.h>
+ #include <exo/exo.h>
+ 
+ 
diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.3.0.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.3.0.bb
index 9a5d077..4fb28f0 100644
--- a/meta-xfce/recipes-apps/ristretto/ristretto_0.3.0.bb
+++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.3.0.bb
@@ -4,9 +4,12 @@  SECTION = "x11/application"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo"
+PR = "r1"
 
 inherit xfce-app
 
+SRC_URI += "file://add-locale_h.patch"
+
 RRECOMMENDS_${PN} += "tumbler"
 
 SRC_URI[md5sum] = "124c4e98f837e35c728b0ff1d9078b1a"