Patchwork [meta-oe,meta-efl,5/6] tangogps: fix build with glib-2.32

login
register
mail settings
Submitter Martin Jansa
Date April 30, 2012, 6:31 a.m.
Message ID <a34b7affb9e7f37246e9256659102a14e263609d.1335766581.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/26597/
State Accepted
Commit fbf0e66f986497d2bcadc48977b0de705b0dfc9f
Headers show

Comments

Martin Jansa - April 30, 2012, 6:31 a.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../tangogps/tangogps-0.99.4/glib-2.32.patch       |   11 +++++++++++
 .../recipes-navigation/tangogps/tangogps_0.99.4.bb |    6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch

Patch

diff --git a/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch
new file mode 100644
index 0000000..0579455
--- /dev/null
+++ b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/glib-2.32.patch
@@ -0,0 +1,11 @@ 
+diff -uNr tangogps-0.99.4.orig/src/map_management.c tangogps-0.99.4/src/map_management.c
+--- tangogps-0.99.4.orig/src/map_management.c	2010-06-25 11:40:05.000000000 +0200
++++ tangogps-0.99.4/src/map_management.c	2012-04-30 07:43:58.551301271 +0200
+@@ -2,7 +2,6 @@
+ 
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gstring.h>
+ #include <glib/gprintf.h>
+ #include <gconf/gconf.h>
+ #include <math.h>
diff --git a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
index 3a1ea3d..5a4231a 100644
--- a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
+++ b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
@@ -5,10 +5,12 @@  SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4 bluez4"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \
-           file://remove.unused.header.patch"
+           file://remove.unused.header.patch \
+           file://glib-2.32.patch \
+"
 SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d"
 SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a"