From b6d13f81087cd97d79f7ee1149e897ca37ee5aaa Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Wed, 9 Apr 2025 16:37:38 +0200 Subject: [PATCH] blueman: update 2.4.3 -> 2.4.4 - remove patch that was merged upstream 2.4.4 Bugs fixed Fix Rfcom plugin dbus signature Set an initial selected device in blueman-sendto AutoConnect: Store bluetooth address instead of object path Applet: Handle UnknownObject DBus error (@tommie) Make search button available after device list becomes empty (@astcri) Fatal LoadException Changes Terminate applet on manager termination if it was started by manager Add Galic and Esperanto translations AutoConnect: Automatically convert path to address Add toggle to force symbolic statusicon Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- ...n-DO-not-emit-absolute-path-when-S-B.patch | 38 ------------------- .../{blueman_2.4.3.bb => blueman_2.4.4.bb} | 5 +-- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch rename meta-networking/recipes-connectivity/blueman/{blueman_2.4.3.bb => blueman_2.4.4.bb} (93%) diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch deleted file mode 100644 index 6e48b70243..0000000000 --- a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4947abc5ede2dc356f011b7c45f6760c9c2ce9f1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 14 Aug 2024 21:26:24 -0700 -Subject: [PATCH] meson: Do not emit absolute path when S != B - -build systems like OE build outside sourcetree in such cases it works -ok but cython resolves the input file to absolute path and that gets -emitted into genetate _blueman.c as module name, renders the build -non-reproducible, wish cython had a better way to handle this but there -is not, therefore tweak the meson build rule to account for specifying -workdir to cython which will search the inputs correctly, and use -meson's build_root to emit the output into build dir. This ensures that -it becomes independent of source or build directories and cython does -not generate the absolute paths into generate C code. - -See cython discussion on [1] - -[1] https://github.com/cython/cython/issues/5949 - -Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/2461] -Signed-off-by: Khem Raj ---- - module/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module/meson.build b/module/meson.build -index 096ad7c8..fddef547 100644 ---- a/module/meson.build -+++ b/module/meson.build -@@ -4,7 +4,7 @@ blueman_c = custom_target( - 'blueman_c', - output: '_blueman.c', - input: '_blueman.pyx', -- command: [cython, '--output-file', '@OUTPUT@', '@INPUT@']) -+ command: [cython, '-w', meson.source_root(), '--output-file', join_paths(meson.build_root(), '@OUTPUT@'), join_paths(meson.build_root(), '@INPUT@')]) - - sources = [ - blueman_c, diff --git a/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.4.4.bb similarity index 93% rename from meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb rename to meta-networking/recipes-connectivity/blueman/blueman_2.4.4.bb index 974c563299..629e1bc8cd 100644 --- a/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb +++ b/meta-networking/recipes-connectivity/blueman/blueman_2.4.4.bb @@ -8,10 +8,9 @@ inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache f REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable \ - file://0001-meson-DO-not-emit-absolute-path-when-S-B.patch" +SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable" S = "${WORKDIR}/git" -SRCREV = "7bcf919ad6ac0ee9a8c66b18b0ca98af877d4c8f" +SRCREV = "bdacba8afe53066bc3a338997e26fee416af2261" EXTRA_OEMESON = "-Druntime_deps_check=false \ -Dsystemdsystemunitdir=${systemd_system_unitdir} \