From 0dfc9ab6f069924a17c523e61c7e37b380248fc0 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 12 Oct 2018 08:26:21 -0700 Subject: blueman: really belongs in meta-networking it has a build dependancy on python-cython and python-pyparsing with are in meta-python Signed-off-by: Armin Kuster Signed-off-by: Khem Raj --- .../blueman/blueman/0001-Search-for-cython3.patch | 31 ++++++++++++++++ .../recipes-connectivity/blueman/blueman_git.bb | 41 ++++++++++++++++++++++ .../blueman/blueman/0001-Search-for-cython3.patch | 31 ---------------- .../recipes-connectivity/blueman/blueman_git.bb | 41 ---------------------- 4 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch create mode 100644 meta-networking/recipes-connectivity/blueman/blueman_git.bb delete mode 100644 meta-oe/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch delete mode 100644 meta-oe/recipes-connectivity/blueman/blueman_git.bb diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch new file mode 100644 index 0000000000..269174b2f6 --- /dev/null +++ b/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch @@ -0,0 +1,31 @@ +From 77db892cdee265e971270c06ca1ffbaeea6449a3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 26 Jun 2018 00:27:40 +0200 +Subject: [PATCH] Search for cython3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 727089d1..6b565cdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,7 +58,7 @@ AC_SUBST([PYGOBJECT_LIBS]) + + AC_ARG_VAR([CYTHONEXEC], [Cython compiler]) + if test "x$CYTHONEXEC" = "x"; then +- AC_PATH_PROG([CYTHONEXEC],[cython]) ++ AC_PATH_PROG([CYTHONEXEC],[cython3]) + fi + AC_SUBST([CYTHONEXEC]) + AC_MSG_CHECKING([for cython executable]) +-- +2.14.3 + diff --git a/meta-networking/recipes-connectivity/blueman/blueman_git.bb b/meta-networking/recipes-connectivity/blueman/blueman_git.bb new file mode 100644 index 0000000000..947db78360 --- /dev/null +++ b/meta-networking/recipes-connectivity/blueman/blueman_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-native intltool-native" + +inherit autotools systemd gsettings python3native gtk-icon-cache + +SRC_URI = " \ + git://github.com/blueman-project/blueman.git \ + file://0001-Search-for-cython3.patch \ +" +SRCREV = "c4a03417e81e21543d4568e8e7f7de307582eb50" +PV = "2.0.5+git${SRCPV}" +S = "${WORKDIR}/git" + +EXTRA_OECONF = " \ + --disable-runtime-deps-check \ + --disable-schemas-compile \ +" + +SYSTEMD_SERVICE_${PN} = "${BPN}-mechanism.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +RRECOMENDS_${PN} += "adwaita-icon-theme" +RDEPENDS_${PN} += " \ + python3-dbus \ + packagegroup-tools-bluetooth \ +" + +PACKAGECONFIG[thunar] = "--enable-thunar-sendto,--disable-thunar-sendto,,thunar" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/Thunar \ + ${systemd_user_unitdir} \ + ${exec_prefix}${systemd_system_unitdir} \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" diff --git a/meta-oe/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch b/meta-oe/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch deleted file mode 100644 index 269174b2f6..0000000000 --- a/meta-oe/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 77db892cdee265e971270c06ca1ffbaeea6449a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 26 Jun 2018 00:27:40 +0200 -Subject: [PATCH] Search for cython3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 727089d1..6b565cdc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,7 +58,7 @@ AC_SUBST([PYGOBJECT_LIBS]) - - AC_ARG_VAR([CYTHONEXEC], [Cython compiler]) - if test "x$CYTHONEXEC" = "x"; then -- AC_PATH_PROG([CYTHONEXEC],[cython]) -+ AC_PATH_PROG([CYTHONEXEC],[cython3]) - fi - AC_SUBST([CYTHONEXEC]) - AC_MSG_CHECKING([for cython executable]) --- -2.14.3 - diff --git a/meta-oe/recipes-connectivity/blueman/blueman_git.bb b/meta-oe/recipes-connectivity/blueman/blueman_git.bb deleted file mode 100644 index 947db78360..0000000000 --- a/meta-oe/recipes-connectivity/blueman/blueman_git.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-native intltool-native" - -inherit autotools systemd gsettings python3native gtk-icon-cache - -SRC_URI = " \ - git://github.com/blueman-project/blueman.git \ - file://0001-Search-for-cython3.patch \ -" -SRCREV = "c4a03417e81e21543d4568e8e7f7de307582eb50" -PV = "2.0.5+git${SRCPV}" -S = "${WORKDIR}/git" - -EXTRA_OECONF = " \ - --disable-runtime-deps-check \ - --disable-schemas-compile \ -" - -SYSTEMD_SERVICE_${PN} = "${BPN}-mechanism.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" - -RRECOMENDS_${PN} += "adwaita-icon-theme" -RDEPENDS_${PN} += " \ - python3-dbus \ - packagegroup-tools-bluetooth \ -" - -PACKAGECONFIG[thunar] = "--enable-thunar-sendto,--disable-thunar-sendto,,thunar" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/Thunar \ - ${systemd_user_unitdir} \ - ${exec_prefix}${systemd_system_unitdir} \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" -- cgit v1.2.3-54-g00ecf