diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2013-06-13 09:37:16 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-20 12:30:07 +0200 |
| commit | eccb3d022a063d74727690c8e4f384b8406b13a6 (patch) | |
| tree | 09ad884675f200b1851cd246ee95dda5c086ac5e /meta-oe/recipes-navigation | |
| parent | 006ce59b7b1d8b77fddc1273ba53ad7d535f3ff1 (diff) | |
| download | meta-openembedded-contrib-eccb3d022a063d74727690c8e4f384b8406b13a6.tar.gz | |
omgps: Fix build with glib-2.0 > 2.35
Fix errors like
| src/main.c: In function 'main':
| src/main.c:490:2: error: 'g_type_init' is deprecated (declared at
/builds1/angstrom/build/tmp-angstrom_next-eglibc/sysroots/qemuarm/usr/include/glib-2.0/gobject/gtype.h:669)
[-Werror=deprecated-declarations]
| g_type_init();
| ^
| cc1: all warnings being treated as errors
| make[1]: *** [omgps-main.o] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
| -rw-r--r-- | meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-navigation/omgps/omgps_svn.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch b/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch new file mode 100644 index 0000000000..6b9f465a2c --- /dev/null +++ b/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch @@ -0,0 +1,33 @@ +From 22bcf06637d64e40af6c152e28b31eef41e3f583 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Jun 2013 02:35:22 -0700 +Subject: [PATCH] g_type_init() is deprecated for glib >= 2.35.0 + +Call it for old versions. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +--- + src/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main.c b/src/main.c +index e984da4..a63ddf3 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -486,9 +486,9 @@ int main(int argc, char **argv) + if (strcmp(argv[1], "-log2file") == 0) + log2console = FALSE; + } +- ++#if !GLIB_CHECK_VERSION(2,35,0) + g_type_init(); +- ++#endif + gdk_threads_init(); + + gdk_threads_enter(); +-- +1.7.9.5 + diff --git a/meta-oe/recipes-navigation/omgps/omgps_svn.bb b/meta-oe/recipes-navigation/omgps/omgps_svn.bb index e1c1a71d8f..1a79df486a 100644 --- a/meta-oe/recipes-navigation/omgps/omgps_svn.bb +++ b/meta-oe/recipes-navigation/omgps/omgps_svn.bb @@ -21,6 +21,7 @@ SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \ file://use.unused.variable.patch \ file://fix.build.with.glib.2.34.patch \ file://gdk-pixbuf-2.26.5.patch \ + file://0001-g_type_init-is-deprecated-for-glib-2.35.0.patch \ " inherit autotools |