network-manager-applet: upgrade 1.8.22 -> 1.8.23 / build with meson / cleanup

Cleanup means:
* remove unnecessary dependencies
* gobject-introspection builds fine for musl these days

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller 2019-10-28 00:35:44 +01:00 committed by Khem Raj
parent 9844187461
commit 022a2d95cb
2 changed files with 29 additions and 44 deletions

View File

@ -1,44 +0,0 @@
SUMMARY = "GTK+ applet for NetworkManager"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
DEPENDS = "gtk+3 libnotify libsecret networkmanager \
libgnome-keyring iso-codes nss \
intltool-native \
"
GNOMEBASEBUILDCLASS = "autotools-brokensep"
inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection gettext
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI[archive.md5sum] = "e0373f4c0d0637716e6e385799a9080f"
SRC_URI[archive.sha256sum] = "ebef1c1050ff6d94cad060e8d259f2a88ae159cf83ca75cb71d9f76867877eed"
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 ??= ""
EXTRA_OECONF = " \
--without-selinux \
"
# gobject-introspection related
GI_DATA_ENABLED_libc-musl = "False"
do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs"
}
RDEPENDS_${PN} =+ "networkmanager"
FILES_${PN} += " \
${datadir}/nm-applet/ \
${datadir}/libnma/wifi.ui \
${datadir}/metainfo \
"
# musl builds generate gir files which otherwise go un-packaged
FILES_${PN}-dev += " \
${datadir}/gir-1.0 \
"

View File

@ -0,0 +1,29 @@
SUMMARY = "GTK+ applet for NetworkManager"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
DEPENDS = "gtk+3 libnotify libsecret networkmanager iso-codes nss"
GNOMEBASEBUILDCLASS = "meson"
inherit distro_features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection gettext
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI[archive.md5sum] = "5c1bf351fde5adc12200345550516050"
SRC_URI[archive.sha256sum] = "118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf"
GTKDOC_MESON_OPTION = "gtk_doc"
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"
RDEPENDS_${PN} =+ "networkmanager"
FILES_${PN} += " \
${datadir}/nm-applet/ \
${datadir}/libnma/wifi.ui \
${datadir}/metainfo \
"