aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-navigation/omgps
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-12-22 18:15:28 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-23 09:36:17 +0100
commit7f35fdb0067843e28c60251b5c50cff256b7b310 (patch)
treec213a614f35d4026f1e38a67a6210cce2ae6b2b8 /meta-oe/recipes-navigation/omgps
parent6097b49f1fe7183f7b34fa2e4c5a8fbfd805ed26 (diff)
downloadmeta-openembedded-7f35fdb0067843e28c60251b5c50cff256b7b310.tar.gz
meta-openembedded-7f35fdb0067843e28c60251b5c50cff256b7b310.tar.bz2
meta-openembedded-7f35fdb0067843e28c60251b5c50cff256b7b310.zip
omgps: fix build with gdk-pixbuf-2.26.5 from oe-core
* also add Upstream-Status to other omgps patches Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation/omgps')
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch3
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch3
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch3
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch15
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch3
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch3
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps_svn.bb3
7 files changed, 32 insertions, 1 deletions
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
index e9536639d..ec3bde0cd 100644
--- a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
+++ b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
diff -uNr omgps.orig/src/dbus_intf.c omgps/src/dbus_intf.c
--- omgps.orig/src/dbus_intf.c 2011-12-12 12:22:47.000000000 +0100
+++ omgps/src/dbus_intf.c 2012-11-14 14:44:45.435381443 +0100
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
index 56ec3a445..3ed86d8a9 100644
--- a/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
+++ b/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
we need to include config.h first to know if HAVE_SYS_CAPABILITY_H is enabled or no, otherwise
sys/capability.h is not included and later used
| src/network.c: In function 'can_ping':
diff --git a/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch b/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
index 3eae96042..41f6471d4 100644
--- a/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
+++ b/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h
--- omgps.orig/src/include/map_repo.h 2009-07-20 19:54:08.000000000 +0200
+++ omgps/src/include/map_repo.h 2010-01-17 14:55:24.000000000 +0100
diff --git a/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch b/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
new file mode 100644
index 000000000..688080573
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
+diff -uNr omgps/src/tab_scratch.c omgps.new/src/tab_scratch.c
+--- omgps/src/tab_scratch.c 2012-12-22 18:13:25.994788128 +0100
++++ omgps.new/src/tab_scratch.c 2012-12-22 18:12:45.876790644 +0100
+@@ -51,7 +51,7 @@
+ }
+
+ gboolean ret = gdk_pixbuf_save (pixbuf, buf, SCREENSHOT_FILE_TYPE, &err, "tEXt::Software", "omgps", NULL);
+- gdk_pixbuf_unref(pixbuf);
++ g_object_unref(pixbuf);
+
+ if (ret) {
+ char buf1[128];
diff --git a/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch b/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
index d18a2fdb4..290c5e6a7 100644
--- a/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
+++ b/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
diff -uNr omgps.orig//src/uart.c omgps/src/uart.c
--- omgps.orig//src/uart.c 2010-08-22 23:34:09.000000000 +0200
+++ omgps/src/uart.c 2010-08-22 23:33:54.000000000 +0200
diff --git a/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch b/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
index 73d6dbab6..3ccb14ea9 100644
--- a/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
+++ b/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
@@ -1,3 +1,6 @@
+Upstream-Status: Submitted
+https://code.google.com/p/omgps/issues/detail?id=15
+
--- a/src/settings.c 2011-12-12 13:21:30.573400795 +0100
+++ b/src/settings.c 2011-12-12 14:11:05.269606119 +0100
@@ -278,6 +278,9 @@
diff --git a/meta-oe/recipes-navigation/omgps/omgps_svn.bb b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
index 0d788b61c..7c787a475 100644
--- a/meta-oe/recipes-navigation/omgps/omgps_svn.bb
+++ b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
DEPENDS = "gtk+ python-pygobject dbus-glib"
SRCREV = "109"
PV = "0.1+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/${PN}"
do_configure_prepend() {
@@ -20,6 +20,7 @@ SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \
file://fix.capability.patch \
file://use.unused.variable.patch \
file://fix.build.with.glib.2.34.patch \
+ file://gdk-pixbuf-2.26.5.patch \
"
inherit autotools