From 60182ae8daa8b73d0a3ca12c8e5c5a031c788803 Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Wed, 24 Sep 2025 15:53:08 +0200 Subject: [PATCH 2/3] d/patches: Update test timeout patch and convert to DEP-3 format Upstream increased the test timeout from 5 to 10 in commit 218d5ed24947 ("test: Increase timeout for alpha-loop test") So update the patch context so that it applies. While at it, convert the patch format to conform to DEP-3. Signed-off-by: Diederik de Haas --- debian/changelog | 1 + debian/patches/series | 2 +- .../test-alpha-loop-Increase-timeout.patch | 28 +++++++++++++++++++ debian/patches/test-increase-timeout.diff | 11 -------- 4 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 debian/patches/test-alpha-loop-Increase-timeout.patch delete mode 100644 debian/patches/test-increase-timeout.diff diff --git a/debian/changelog b/debian/changelog index 24b9f72..f24e904 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ pixman (0.46.4-0.1) UNRELEASED; urgency=medium [ Diederik de Haas ] * New upstream release (Closes: #1059145) + * d/patches: Update test timeout patch and convert to DEP-3 format -- Dylan Aïssi Thu, 31 Jul 2025 22:16:23 +0200 diff --git a/debian/patches/series b/debian/patches/series index 708b774..f021534 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -test-increase-timeout.diff +test-alpha-loop-Increase-timeout.patch diff --git a/debian/patches/test-alpha-loop-Increase-timeout.patch b/debian/patches/test-alpha-loop-Increase-timeout.patch new file mode 100644 index 0000000..eb200f5 --- /dev/null +++ b/debian/patches/test-alpha-loop-Increase-timeout.patch @@ -0,0 +1,28 @@ +From d126cd3a3512734b4510f23e2200325db309b002 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Sat, 03 Aug 2013 10:22:07 +0200 +Subject: [PATCH] test/alpha-loop: Increase timeout +Forwarded: not-needed + +Increase timeout for the alpha-loop test. That will hopefully let it +pass on the mips buildd. +--- + test/alpha-loop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/alpha-loop.c b/test/alpha-loop.c +index 1fe3cb3..2b2fec7 100644 +--- a/test/alpha-loop.c ++++ b/test/alpha-loop.c +@@ -22,7 +22,7 @@ main (int argc, char **argv) + d = pixman_image_create_bits (PIXMAN_a8r8g8b8, WIDTH, HEIGHT, dest, WIDTH * 4); + s = pixman_image_create_bits (PIXMAN_a2r10g10b10, WIDTH, HEIGHT, src, WIDTH * 4); + +- fail_after (10, "Infinite loop detected: 10 seconds without progress\n"); ++ fail_after (50, "Infinite loop detected: 50 seconds without progress\n"); + + pixman_image_set_alpha_map (s, a, 0, 0); + pixman_image_set_alpha_map (a, s, 0, 0); +-- +2.51.0 + diff --git a/debian/patches/test-increase-timeout.diff b/debian/patches/test-increase-timeout.diff deleted file mode 100644 index 30f41ea..0000000 --- a/debian/patches/test-increase-timeout.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test/alpha-loop.c -+++ b/test/alpha-loop.c -@@ -22,7 +22,7 @@ main (int argc, char **argv) - d = pixman_image_create_bits (PIXMAN_a8r8g8b8, WIDTH, HEIGHT, dest, WIDTH * 4); - s = pixman_image_create_bits (PIXMAN_a2r10g10b10, WIDTH, HEIGHT, src, WIDTH * 4); - -- fail_after (5, "Infinite loop detected: 5 seconds without progress\n"); -+ fail_after (50, "Infinite loop detected: 50 seconds without progress\n"); - - pixman_image_set_alpha_map (s, a, 0, 0); - pixman_image_set_alpha_map (a, s, 0, 0); -- 2.51.0