summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/libgnome
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-11-28 15:58:13 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-02 09:16:18 +0100
commita7f3ec87f957ff35b8a853cd0e04c6b18bac0ece (patch)
tree4e1fc4583e0070c7c1ed3895396f4af7abcff742 /meta-gnome/recipes-gnome/libgnome
parent6afb85d29286aaa4cdd892460f6adf68912917a5 (diff)
downloadmeta-openembedded-a7f3ec87f957ff35b8a853cd0e04c6b18bac0ece.tar.gz
meta-gnome: add explicit gnome-common dependencies
gnome-common is deprecated and gnomebase.bbclass will soon stop depending on it, so add gnome-common to DEPENDS for the recipes that still use it. gxim previously wasn't really using the gnome-common macros so now the build fails with compiler errors, so pass the flag to turn off fatal warnings as gxim appears to be dead. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/libgnome')
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb2
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb2
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb3
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb2
4 files changed, 4 insertions, 5 deletions
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
index 40caa7b11..0055ba4a3 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb
@@ -12,7 +12,7 @@ SRC_URI[archive.sha256sum] = "b2c63916866485793b87398266dd7778548c1734923c272a94
12SRC_URI += "file://0001-libgnome-Makefile.am-allow-deprecated-symbols.patch" 12SRC_URI += "file://0001-libgnome-Makefile.am-allow-deprecated-symbols.patch"
13GNOME_COMPRESS_TYPE="bz2" 13GNOME_COMPRESS_TYPE="bz2"
14 14
15DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound intltool-native" 15DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound intltool-native gnome-common-native"
16 16
17EXTRA_OECONF += "--disable-gtk-doc" 17EXTRA_OECONF += "--disable-gtk-doc"
18 18
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb
index a0f0b517b..41a89cede 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb
@@ -8,7 +8,7 @@ inherit gnomebase gtk-doc
8# intltool to provide IT_PROG_INTLTOOL 8# intltool to provide IT_PROG_INTLTOOL
9# configure: line 12654: syntax error near unexpected token `0.35.0' 9# configure: line 12654: syntax error near unexpected token `0.35.0'
10# configure: line 12654: `IT_PROG_INTLTOOL(0.35.0)' 10# configure: line 12654: `IT_PROG_INTLTOOL(0.35.0)'
11DEPENDS = "gtk+ libglade libart-lgpl xineramaproto intltool-native" 11DEPENDS = "gtk+ libglade libart-lgpl xineramaproto intltool-native gnome-common-native"
12 12
13SRC_URI[archive.md5sum] = "ffcbb719c671ff5cd86e59aeba8d0b92" 13SRC_URI[archive.md5sum] = "ffcbb719c671ff5cd86e59aeba8d0b92"
14SRC_URI[archive.sha256sum] = "859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40" 14SRC_URI[archive.sha256sum] = "859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
index f35765790..e5914e04c 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
4 4
5SECTION = "x11/gnome/libs" 5SECTION = "x11/gnome/libs"
6 6
7DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native" 7DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native gnome-common-native"
8 8
9inherit gnome 9inherit gnome
10 10
@@ -16,4 +16,3 @@ do_configure_append() {
16 find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g 16 find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
17 find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g 17 find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
18} 18}
19
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb
index 94b00c133..c4801a9f9 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2"
3LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" 3LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
4 4
5SECTION = "x11/gnome/libs" 5SECTION = "x11/gnome/libs"
6DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native" 6DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native gnome-common-native"
7 7
8inherit gnome 8inherit gnome
9 9