From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../network-manager-applet_1.8.10.bb | 45 ++++++++++++++++++++++ .../obex/obexd/ssize_t_definition.patch | 40 +++++++++++++++++++ .../recipes-connectivity/obex/obexd_0.48.bb | 23 +++++++++++ 3 files changed, 108 insertions(+) create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb (limited to 'meta-openembedded/meta-gnome/recipes-connectivity') 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.10.bb new file mode 100644 index 0000000000..dc2b964be5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb @@ -0,0 +1,45 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ + gconf libgnome-keyring iso-codes nss \ + intltool-native \ +" + +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" + +PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" +PACKAGECONFIG ??= "" + +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 +} + +# gobject-introspection related +GI_DATA_ENABLED_libc-musl = "False" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/src/libnma/.libs:${B}/src/libnm-gtk/.libs" +} + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/appdata \ + ${datadir}/nm-applet/ \ + ${datadir}/libnm-gtk/wifi.ui \ + ${datadir}/libnma/wifi.ui \ +" 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 new file mode 100644 index 0000000000..570cb9ef37 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch @@ -0,0 +1,40 @@ +From fb5056fea9559b3ec3bb61967a112b6c793b700d Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 + +--- + 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 + #include + #include ++#include + + #include + #include 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 new file mode 100644 index 0000000000..6096bed735 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb @@ -0,0 +1,23 @@ +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" -- cgit v1.2.3