From 788169b265136e6135f449b2bda94e48380544a0 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Mon, 17 Nov 2025 15:58:24 +0800 Subject: [PATCH] rtorrent: upgrade 0.16.1 -> 0.16.2 Changelog: https://github.com/rakshasa/rtorrent/releases/tag/v0.16.2 Remove 0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch as it was merged in upstream. Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- ...mmon.m4-Insert-spaces-in-shell-lists.patch | 45 ------------------- ...{rtorrent_0.16.1.bb => rtorrent_0.16.2.bb} | 7 ++- 2 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/rtorrent/rtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch rename meta-oe/recipes-connectivity/rtorrent/{rtorrent_0.16.1.bb => rtorrent_0.16.2.bb} (71%) diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch b/meta-oe/recipes-connectivity/rtorrent/rtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch deleted file mode 100644 index bd075c0b21..0000000000 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent/0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch +++ /dev/null @@ -1,45 +0,0 @@ -From da3687c276078e8ad1df3c972bd1d5deaffb3dc5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 24 Oct 2025 08:45:02 -0700 -Subject: [PATCH] scripts/common.m4: Insert spaces in shell lists -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -$1=$(echo "$result" | tr -d '\n') - -removes all newlines without inserting spaces -That usually isn’t what we want for shell lists. -It should typically be space-separated output. - -Fixes a bug seen with yocto where compiler is not a single word -but a string e.g. - -ccache aarch64-yoe-linux-musl-clang++ -mcpu=cortex-a72+crc+nocrypto --dyld-prefix=/usr -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/libtorrent/0.16.1/recipe-sysroot - -It changes it to - -ccacheaarch64-yoe-linux-musl-clang++-mcpu=cortex-a72+crc+nocrypto--dyld-prefix=/usr-fstack-protector-strong-O2-D_FORTIFY_SOURCE=2-Wformat-Wformat-security-Werror=format-security--sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/libtorrent/0.16.1/recipe-sysroot - -When doing c++17 checks on compiler, resulting in failure - -Upstream-Status: Submitted [https://github.com/rakshasa/rtorrent/pull/1620] -Signed-off-by: Khem Raj ---- - scripts/common.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/scripts/common.m4 b/scripts/common.m4 -index 7129204..d8ee019 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -30,7 +30,8 @@ AC_DEFUN([TORRENT_REMOVE_UNWANTED], - $1="$2" - else - result=`echo "${values_to_check}" | $GREP -Fvx -- "${unwanted_values}" | $GREP -v '^$'` -- $1=$(echo "$result" | tr -d '\n') -+ # join with spaces, squeeze repeats, and trim trailing space -+ $1=$(printf '%s\n' "$result" | tr '\n' ' ' | sed 's/ */ /g; s/ *$//') - fi - ]) - diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.1.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.2.bb similarity index 71% rename from meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.1.bb rename to meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.2.bb index 0030b7593d..e077efa22a 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.1.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.16.2.bb @@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurses" -SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https;tag=v${PV} \ - file://0001-scripts-common.m4-Insert-spaces-in-shell-lists.patch \ - " -SRCREV = "b38f80e59795dc6728b2c31ac3eab564651ce46d" +SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https;tag=v${PV}" + +SRCREV = "8550facf43fd1e36b416bcdb3b025e7e09578364" inherit autotools pkgconfig