summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-navigation/omgps
diff options
context:
space:
mode:
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 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
1diff -uNr omgps.orig/src/dbus_intf.c omgps/src/dbus_intf.c 4diff -uNr omgps.orig/src/dbus_intf.c omgps/src/dbus_intf.c
2--- omgps.orig/src/dbus_intf.c 2011-12-12 12:22:47.000000000 +0100 5--- omgps.orig/src/dbus_intf.c 2011-12-12 12:22:47.000000000 +0100
3+++ omgps/src/dbus_intf.c 2012-11-14 14:44:45.435381443 +0100 6+++ 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 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
1we need to include config.h first to know if HAVE_SYS_CAPABILITY_H is enabled or no, otherwise 4we need to include config.h first to know if HAVE_SYS_CAPABILITY_H is enabled or no, otherwise
2sys/capability.h is not included and later used 5sys/capability.h is not included and later used
3| src/network.c: In function 'can_ping': 6| 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 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
1diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h 4diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h
2--- omgps.orig/src/include/map_repo.h 2009-07-20 19:54:08.000000000 +0200 5--- omgps.orig/src/include/map_repo.h 2009-07-20 19:54:08.000000000 +0200
3+++ omgps/src/include/map_repo.h 2010-01-17 14:55:24.000000000 +0100 6+++ 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 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
4diff -uNr omgps/src/tab_scratch.c omgps.new/src/tab_scratch.c
5--- omgps/src/tab_scratch.c 2012-12-22 18:13:25.994788128 +0100
6+++ omgps.new/src/tab_scratch.c 2012-12-22 18:12:45.876790644 +0100
7@@ -51,7 +51,7 @@
8 }
9
10 gboolean ret = gdk_pixbuf_save (pixbuf, buf, SCREENSHOT_FILE_TYPE, &err, "tEXt::Software", "omgps", NULL);
11- gdk_pixbuf_unref(pixbuf);
12+ g_object_unref(pixbuf);
13
14 if (ret) {
15 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 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
1diff -uNr omgps.orig//src/uart.c omgps/src/uart.c 4diff -uNr omgps.orig//src/uart.c omgps/src/uart.c
2--- omgps.orig//src/uart.c 2010-08-22 23:34:09.000000000 +0200 5--- omgps.orig//src/uart.c 2010-08-22 23:34:09.000000000 +0200
3+++ omgps/src/uart.c 2010-08-22 23:33:54.000000000 +0200 6+++ 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 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
1--- a/src/settings.c 2011-12-12 13:21:30.573400795 +0100 4--- a/src/settings.c 2011-12-12 13:21:30.573400795 +0100
2+++ b/src/settings.c 2011-12-12 14:11:05.269606119 +0100 5+++ b/src/settings.c 2011-12-12 14:11:05.269606119 +0100
3@@ -278,6 +278,9 @@ 6@@ -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"
6DEPENDS = "gtk+ python-pygobject dbus-glib" 6DEPENDS = "gtk+ python-pygobject dbus-glib"
7SRCREV = "109" 7SRCREV = "109"
8PV = "0.1+svnr${SRCPV}" 8PV = "0.1+svnr${SRCPV}"
9PR = "r1" 9PR = "r2"
10S = "${WORKDIR}/${PN}" 10S = "${WORKDIR}/${PN}"
11 11
12do_configure_prepend() { 12do_configure_prepend() {
@@ -20,6 +20,7 @@ SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \
20 file://fix.capability.patch \ 20 file://fix.capability.patch \
21 file://use.unused.variable.patch \ 21 file://use.unused.variable.patch \
22 file://fix.build.with.glib.2.34.patch \ 22 file://fix.build.with.glib.2.34.patch \
23 file://gdk-pixbuf-2.26.5.patch \
23" 24"
24 25
25inherit autotools 26inherit autotools