Thanks to meson being more precise / better readable we can get rid of old crap e.g useless dependency on libgnome-keyring.
Signed-off-by: Andreas Müller <[email protected]> --- .../network-manager-applet_1.8.20.bb | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb index 7181f5ecf..45f552a88 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.20.bb @@ -3,32 +3,25 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ - gconf libgnome-keyring iso-codes nss \ + gconf iso-codes nss \ intltool-native \ " -GNOMEBASEBUILDCLASS = "autotools-brokensep" -inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection +GNOMEBASEBUILDCLASS = "meson" +inherit distro_features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "06aafa851762146034351aa72ebb23d4" SRC_URI[archive.sha256sum] = "050dbb155566c715239dc0378844d8beed10954e64e71014ecef8ca912df34ec" -PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" -PACKAGECONFIG[mobile-provider-info] = "--enable-mobile-broadband-provider-info,--disable-mobile-broadband-provider-info,mobile-broadband-provider-info,mobile-broadband-provider-info" PACKAGECONFIG ??= "" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" +PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" +PACKAGECONFIG[mobile-provider-info] = "-Dmobile_broadband_provider_info=true, -Dmobile_broadband_provider_info=false, mobile-broadband-provider-info,mobile-broadband-provider-info" +PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" -EXTRA_OECONF = " \ - --without-selinux \ -" - -do_configure_append() { - # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror - for i in $(find ${B} -name "Makefile") ; do - sed -i -e s%-Werror[^[:space:]]*%%g $i - done -} +GTKDOC_MESON_OPTION = "gtk_doc" # gobject-introspection related GI_DATA_ENABLED_libc-musl = "False" -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
