Switch from using tarball to git because the 2.3.2 tarball lacks the meson_options.txt file.
Signed-off-by: Markus Volk <[email protected]> --- ...01-meson-add-pythoninstalldir-option.patch | 19 ++++++++++--------- .../{blueman_2.2.4.bb => blueman_2.3.2.bb} | 7 ++++--- 2 files changed, 14 insertions(+), 12 deletions(-) rename meta-networking/recipes-connectivity/blueman/{blueman_2.2.4.bb => blueman_2.3.2.bb} (86%) diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch index a52821915..cc448b4ff 100644 --- a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch +++ b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch @@ -16,14 +16,14 @@ Signed-off-by: Chen Qi <[email protected]> 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index bc990cd..a37aacd 100644 +index e12d0ce6..e84457a5 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name]) bindir = join_paths([prefix, get_option('bindir')]) libexecdir = join_paths([prefix, get_option('libexecdir')]) - schemadir = join_paths([datadir, 'glib-2.0', 'schemas']) --pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) + schemadir = join_paths(['share', 'glib-2.0', 'schemas']) +-pythondir = pyinstall.get_install_dir() +pythoninstalldir = get_option('pythoninstalldir') +if pythoninstalldir != '' + pythondir = join_paths([prefix, pythoninstalldir]) @@ -34,16 +34,17 @@ index bc990cd..a37aacd 100644 if get_option('policykit') have_polkit = 'True' diff --git a/meson_options.txt b/meson_options.txt -index b3e939f..96acbbc 100644 +index 177d9ab8..3e397d8e 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -5,5 +5,6 @@ option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAud - option('appindicator', type: 'boolean', value: true, description: 'Enable Libappindicator support') +@@ -2,6 +2,7 @@ option('runtime_deps_check', type: 'boolean', value: true, description: 'Disable + option('dhcp-config-path', type: 'string', value: '/etc/dhcp3/dhcpd.conf', description: 'Set dhcp3 server configuration path') + option('policykit', type: 'boolean', value: true, description: 'Enable policykit support') + option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAudio support') ++option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}') option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}') -+option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers') - option('thunar-sendto', type: 'boolean', value: true, description: 'Install Thunar sendto plugin') -- -2.33.0 +2.34.1 diff --git a/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.3.2.bb similarity index 86% rename from meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb rename to meta-networking/recipes-connectivity/blueman/blueman_2.3.2.bb index 119752086..eed00fce0 100644 --- a/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb +++ b/meta-networking/recipes-connectivity/blueman/blueman_2.3.2.bb @@ -7,14 +7,15 @@ DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache SRC_URI = " \ - https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ + git://github.com/blueman-project/blueman.git;protocol=https;branch=2-3-stable \ file://0001-Search-for-cython3.patch \ file://0002-fix-fail-to-enable-bluetooth.patch \ file://0001-meson-add-pythoninstalldir-option.patch \ " -SRC_URI[sha256sum] = "55d639feeda0b43b18a659e65985213a54b47dcb1348f3b4effb5238db242602" +S = "${WORKDIR}/git" +SRCREV = "4275c35ffe372c3b194080726fbe1c99f974360f" -EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" +EXTRA_OEMESON = "-Druntime_deps_check=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#99162): https://lists.openembedded.org/g/openembedded-devel/message/99162 Mute This Topic: https://lists.openembedded.org/mt/94308271/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
