From e01261885b0290f6bcadede64cb4d18421d2733f Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 18 Jun 2019 19:27:02 +0300 Subject: network-manager-applet: Remove obsolete dbus-glib and libnm-glib dependencies network-manager-applet stopped using dbus-glib 3 years ago. Building of the obsolete libnm-gtk is disabled by default in 1.8.20. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../network-manager-applet/network-manager-applet_1.8.20.bb | 5 ++--- .../recipes-connectivity/networkmanager/networkmanager_%.bbappend | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend (limited to 'meta-gnome') 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 7181f5ecfb..80aafc8707 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 @@ -2,7 +2,7 @@ SUMMARY = "GTK+ applet for NetworkManager" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ +DEPENDS = "gtk+3 libnotify libsecret networkmanager \ gconf libgnome-keyring iso-codes nss \ intltool-native \ " @@ -34,14 +34,13 @@ do_configure_append() { GI_DATA_ENABLED_libc-musl = "False" do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/libnm-gtk/.libs" + export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs" } RDEPENDS_${PN} =+ "networkmanager" FILES_${PN} += " \ ${datadir}/nm-applet/ \ - ${datadir}/libnm-gtk/wifi.ui \ ${datadir}/libnma/wifi.ui \ ${datadir}/metainfo \ " diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend deleted file mode 100644 index 1abb5bbcd1..0000000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# networkmanager-applet requires glib support -PACKAGECONFIG_append = " glib" - -- cgit 1.2.3-korg