From fac09f5f18b1cd3286466d886fb5b82c104f85e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 12 Nov 2025 17:08:35 +0100 Subject: [PATCH] testing/edward: fix check() with latest main/ed --- testing/edward/APKBUILD | 4 +++- testing/edward/ed-1.22.2-compat.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 testing/edward/ed-1.22.2-compat.patch diff --git a/testing/edward/APKBUILD b/testing/edward/APKBUILD index f2ccf6f88ab..bc08b506583 100644 --- a/testing/edward/APKBUILD +++ b/testing/edward/APKBUILD @@ -10,7 +10,8 @@ license="GPL-3.0-or-later" makedepends="chicken" checkdepends="ed" subpackages="$pkgname-doc" -source="https://github.com/nmeum/edward/releases/download/$pkgver/edward-$pkgver.tar.gz" +source="https://github.com/nmeum/edward/releases/download/$pkgver/edward-$pkgver.tar.gz + ed-1.22.2-compat.patch" build() { make @@ -26,4 +27,5 @@ package() { sha512sums=" b0767a04829fccdac5d2cc35ee522602f1a10518f2d5fa59f1f2d362ceba552ec6b122ea1e35da539db6e6ec710a2e963f154057a9df443c6d090ac82aaa0484 edward-1.1.0.tar.gz +864364b4e32cb2935af2d0d66cfe2cd6998c5a0de5cf0e361d2a4777b4db3e9b7a54514b522372dfd23759360a6b7c8f5431f1fc1c50cc29df7e028ee3648cc2 ed-1.22.2-compat.patch " diff --git a/testing/edward/ed-1.22.2-compat.patch b/testing/edward/ed-1.22.2-compat.patch new file mode 100644 index 00000000000..48a63074966 --- /dev/null +++ b/testing/edward/ed-1.22.2-compat.patch @@ -0,0 +1,20 @@ +From 70966bbeaa3e127c7695be2da251f736c3156173 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= +Date: Tue, 11 Nov 2025 21:25:58 +0100 +Subject: [PATCH] tests: restore compatibility with GNU ed 1.22.2 + +This is a workaround for a regression in GNU ed 1.22.2. + +See https://lists.gnu.org/archive/html/bug-ed/2025-11/msg00000.html +--- + tests/integration/shell-previous/cmds | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/integration/shell-previous/cmds b/tests/integration/shell-previous/cmds +index d3d8df4..5f9e4b8 100644 +--- a/tests/integration/shell-previous/cmds ++++ b/tests/integration/shell-previous/cmds +@@ -1,2 +1,2 @@ +-!printf "1\n2\n3\n" ++!echo "foobar" + !!