mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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':
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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];
|
||||
@@ -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
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user