From e7b813a5fc96ca661c9b63a35edf28d740d3277f Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 19 Feb 2026 08:43:16 -0800 Subject: [PATCH] python3-cffi: Refresh patch with upstream Upstream had more to the final merged commit than what was in the previous patch Whitespace changes in SRC_URI for consistency. Signed-off-by: Tim Orling --- ...ing-more-resilient-to-changes-in-pycpa.patch} | 16 ++++++++-------- .../python/python3-cffi_2.0.0.bb | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) rename meta/recipes-devtools/python/python3-cffi/{0001-Make-test_parsing-more-resilient-to-changes-in.patch => 0001-Make-test_parsing-more-resilient-to-changes-in-pycpa.patch} (89%) diff --git a/meta/recipes-devtools/python/python3-cffi/0001-Make-test_parsing-more-resilient-to-changes-in.patch b/meta/recipes-devtools/python/python3-cffi/0001-Make-test_parsing-more-resilient-to-changes-in-pycpa.patch similarity index 89% rename from meta/recipes-devtools/python/python3-cffi/0001-Make-test_parsing-more-resilient-to-changes-in.patch rename to meta/recipes-devtools/python/python3-cffi/0001-Make-test_parsing-more-resilient-to-changes-in-pycpa.patch index 2919b78a6ef..275944e1804 100644 --- a/meta/recipes-devtools/python/python3-cffi/0001-Make-test_parsing-more-resilient-to-changes-in.patch +++ b/meta/recipes-devtools/python/python3-cffi/0001-Make-test_parsing-more-resilient-to-changes-in-pycpa.patch @@ -1,8 +1,8 @@ -From 6f345f658a7012bca0859d23436a11b9902711ae Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Fri, 6 Feb 2026 01:53:23 +0000 -Subject: [PATCH] Make test_parsing more resilient to changes in - pycparser (#224) +From c36c02fa6f4f1d12a9cead81861c6f42af47da22 Mon Sep 17 00:00:00 2001 +From: Eli Bendersky +Date: Sat, 24 Jan 2026 17:54:58 -0800 +Subject: [PATCH] Make test_parsing more resilient to changes in pycparser + (#224) * Make test_parsing more resilient to changes in pycparser @@ -15,15 +15,15 @@ Ref #223 * Loosen error message assertion even more -Upstream-Status: Backport [https://github.com/python-cffi/cffi/commit/c36c02fa6f4f1d12a9cead81861c6f42af47da22] +Upstream-Status: Backport [https://github.com/python-cffi/cffi/pull/224] -Signed-off-by: Wang Mingyu +Signed-off-by: Tim Orling --- testing/cffi0/test_parsing.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/testing/cffi0/test_parsing.py b/testing/cffi0/test_parsing.py -index f10b989..7009e34 100644 +index 8d4dd016..3e47bcdd 100644 --- a/testing/cffi0/test_parsing.py +++ b/testing/cffi0/test_parsing.py @@ -197,7 +197,7 @@ def test_dont_remove_comment_in_line_directives(): diff --git a/meta/recipes-devtools/python/python3-cffi_2.0.0.bb b/meta/recipes-devtools/python/python3-cffi_2.0.0.bb index 269595f5c3f..6a98d9aebc4 100644 --- a/meta/recipes-devtools/python/python3-cffi_2.0.0.bb +++ b/meta/recipes-devtools/python/python3-cffi_2.0.0.bb @@ -6,8 +6,10 @@ DEPENDS += "libffi python3-pycparser" SRC_URI[sha256sum] = "44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529" -SRC_URI += "file://run-ptest \ - file://0001-Make-test_parsing-more-resilient-to-changes-in.patch" +SRC_URI += "\ + file://run-ptest \ + file://0001-Make-test_parsing-more-resilient-to-changes-in-pycpa.patch \ +" inherit pypi python_setuptools_build_meta ptest pkgconfig -- 2.47.3