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>
This commit is contained in:
Ross Burton 2016-11-28 15:58:13 +00:00 committed by Martin Jansa
parent 6afb85d292
commit a7f3ec87f9
17 changed files with 17 additions and 20 deletions

View File

@ -3,7 +3,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
SECTION = "x11/gnome/libs"
DEPENDS = "glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib"
DEPENDS = "gnome-common-native glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib"
inherit gnomebase gtk-doc lib_package

View File

@ -2,7 +2,7 @@ SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
SECTION = "x11/office"
DEPENDS = "gtk+3 libsecret gnome-desktop3 poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native"
DEPENDS = "gtk+3 libsecret gnome-desktop3 poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native gnome-common-native"
PR = "r5"
inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check

View File

@ -3,7 +3,7 @@ SECTION = "x11/gnome"
LICENSE = "GPLv2+"
PR = "r2"
DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-codes intltool-native"
DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-codes intltool-native gnome-common-native"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"

View File

@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
SECTION = "x11/gnome"
DEPENDS = "udev gtk+3 libnotify libcanberra intltool-native \
DEPENDS = "udev gtk+3 libnotify libcanberra intltool-native gnome-common-native \
${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)} \
"

View File

@ -12,7 +12,7 @@ SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67"
SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d"
GNOME_COMPRESS_TYPE="bz2"
DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification intltool-native"
DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification intltool-native gnome-common-native"
EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs --disable-gnome-about"

View File

@ -3,7 +3,7 @@ SUMMARY = "GNOME disk utility"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart gnome-doc-utils intltool-native libgnome-keyring"
DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 libatasmart gnome-doc-utils intltool-native gnome-common-native libgnome-keyring"
PR = "r4"

View File

@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11/gnome"
PR = "r2"
DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils libwnck gtk+ dbus-glib librsvg intltool-native"
DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils libwnck gtk+ dbus-glib librsvg intltool-native gnome-common-native"
inherit gnome
SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167"
@ -29,4 +29,3 @@ FILES_${PN} += "${datadir}/icons \
FILES_${PN}-doc += "${datadir}/omf \
${datadir}/gnome/help "

View File

@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \
file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54"
DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib intltool-native"
DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib intltool-native gnome-common-native"
RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
# Some legacy packages will require gnome-mime-data to be installed, but use of
# it is deprecated.

View File

@ -4,7 +4,7 @@ HOMEPAGE = "http://projects.gnome.org/gtksourceview/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "gtk+ libxml2 intltool-native"
DEPENDS = "gtk+ libxml2 intltool-native gnome-common-native"
PNAME = "gtksourceview"
@ -29,4 +29,3 @@ do_configure_prepend() {
}
FILES_${PN} += " ${datadir}/gtksourceview-2.0"

View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \
file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef"
DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib"
DEPENDS = "gnome-common-native libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib"
inherit gnomebase pkgconfig autotools-brokensep gettext gtk-doc vala gobject-introspection

View File

@ -12,7 +12,7 @@ SRC_URI[archive.sha256sum] = "b2c63916866485793b87398266dd7778548c1734923c272a94
SRC_URI += "file://0001-libgnome-Makefile.am-allow-deprecated-symbols.patch"
GNOME_COMPRESS_TYPE="bz2"
DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound intltool-native"
DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound intltool-native gnome-common-native"
EXTRA_OECONF += "--disable-gtk-doc"

View File

@ -8,7 +8,7 @@ inherit gnomebase gtk-doc
# intltool to provide IT_PROG_INTLTOOL
# configure: line 12654: syntax error near unexpected token `0.35.0'
# configure: line 12654: `IT_PROG_INTLTOOL(0.35.0)'
DEPENDS = "gtk+ libglade libart-lgpl xineramaproto intltool-native"
DEPENDS = "gtk+ libglade libart-lgpl xineramaproto intltool-native gnome-common-native"
SRC_URI[archive.md5sum] = "ffcbb719c671ff5cd86e59aeba8d0b92"
SRC_URI[archive.sha256sum] = "859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40"

View File

@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812"
SECTION = "x11/gnome/libs"
DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native"
DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native gnome-common-native"
inherit gnome
@ -16,4 +16,3 @@ do_configure_append() {
find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
}

View File

@ -3,7 +3,7 @@ LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
SECTION = "x11/gnome/libs"
DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native"
DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native gnome-common-native"
inherit gnome

View File

@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
SECTION = "libs"
DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native"
DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native gnome-common-native"
inherit autotools pkgconfig gnome gconf gobject-introspection

View File

@ -3,7 +3,7 @@ LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
SECTION = "x11/libs"
DEPENDS = "intltool-native gtk+ gdk-pixbuf-native libxres"
DEPENDS = "intltool-native gnome-common-native gtk+ gdk-pixbuf-native libxres"
PACKAGECONFIG ??= "startup-notification"
PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"

View File

@ -19,7 +19,7 @@ LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "\
file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
EXTRA_OECONF = " --disable-static --disable-rebuilds"
EXTRA_OECONF = " --disable-static --disable-rebuilds --enable-compile-warnings=minimum"
DEPENDS += "gtk+ glib-2.0 ruby-native intltool-native gnome-common-native"
inherit autotools pkgconfig gettext