diff options
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-connectivity')
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb (renamed from meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb) | 13 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch | 40 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb | 23 |
4 files changed, 13 insertions, 66 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb index dc2b964be5..01840009ea 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.18.bb @@ -7,14 +7,16 @@ DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ intltool-native \ " +GNOMEBASEBUILDCLASS = "autotools-brokensep" inherit distro_features_check gnomebase gsettings gtk-icon-cache gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "eae3be75e77ff1a7ea3174be25e62d03" -SRC_URI[archive.sha256sum] = "0adc4bfae8b49f7a1d929c22ef20933bd41fb4a8b458280f44c65f9e45b4c9c3" +SRC_URI[archive.md5sum] = "34923579b39360db64649342ee6735d8" +SRC_URI[archive.sha256sum] = "23dc1404f1e0622b7c4718b6d978b101d5e4d9be0b92133b3863a4dc29786178" 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 = " \ @@ -38,8 +40,13 @@ do_compile_prepend() { RDEPENDS_${PN} =+ "networkmanager" FILES_${PN} += " \ - ${datadir}/appdata \ ${datadir}/nm-applet/ \ ${datadir}/libnm-gtk/wifi.ui \ ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" + +# musl builds generate gir files which otherwise go un-packaged +FILES_${PN}-dev += " \ + ${datadir}/gir-1.0 \ " diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend new file mode 100644 index 0000000000..291a61605f --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -0,0 +1,3 @@ +# networkmanager-applet requires glib support +PACKAGECONFIG_append = "glib" + diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch b/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch deleted file mode 100644 index 570cb9ef37..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch +++ /dev/null @@ -1,40 +0,0 @@ -From fb5056fea9559b3ec3bb61967a112b6c793b700d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 8 Jan 2013 21:33:34 -0800 -Subject: [PATCH] include unistd.h to get ssize_t definitions - -Fixes errors like - -| In file included from plugins/mas.c:36:0: -| ./src/obex.h:39:1: error: unknown type name 'ssize_t' -| ./src/obex.h:49:1: error: unknown type name 'ssize_t' -| ./src/obex.h:50:1: error: unknown type name 'ssize_t' -| In file included from plugins/mas.c:38:0: -| ./src/mimetype.h:36:2: error: expected specifier-qualifier-list before 'ssize_t' -| In file included from plugins/mas.c:39:0: -| plugins/filesystem.h:24:1: error: unknown type name 'ssize_t' -| plugins/mas.c:550:1: error: unknown type name 'ssize_t' -| plugins/mas.c:557:1: error: unknown type name 'ssize_t' -| plugins/mas.c: In function 'any_read': -| plugins/mas.c:560:2: error: unknown type name 'ssize_t' - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - plugins/mas.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/mas.c b/plugins/mas.c -index 1b18059..b519507 100644 ---- a/plugins/mas.c -+++ b/plugins/mas.c -@@ -30,6 +30,7 @@ - #include <glib.h> - #include <fcntl.h> - #include <inttypes.h> -+#include <unistd.h> - - #include <gobex/gobex.h> - #include <gobex/gobex-apparam.h> diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb deleted file mode 100644 index 6096bed735..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "OBEX Server and Client" -# obexd was integrated into bluez5 -DEPENDS = "glib-2.0 dbus libical" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz \ - file://ssize_t_definition.patch \ -" -SRC_URI[md5sum] = "d03cf9bad2983243837f4f6d76ef14a6" -SRC_URI[sha256sum] = "eaa9d8d9542700e6750918d72a3ce00f8cf3a2771d3e2516efd1be5a05f78582" - -inherit autotools-brokensep pkgconfig - -PACKAGES =+ "obex-client obex-plugins" - -FILES_${PN} += "${datadir}/dbus-1/services/${PN}.service" -FILES_obex-client = "${libexecdir}/obex-client \ - ${datadir}/dbus-1/services/obex-client.service" -# currently the plugins are empty -FILES_obex-plugins = "${libdir}/obex/plugins" |