From 8d1fa3d126da693d2a2adaf06a2535ab0376fd74 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Thu, 5 Jun 2025 07:16:47 +0200 Subject: [PATCH] diffoscope: upgrade 293 -> 297 Also, remove the musl restriction - it builds successfully with both glibc and musl. Changelog: 294: - Correct longstanding issue where many ">"-based version tests used in conditional fixtures were broken due to the lack of a __gt__ method. Thanks, Colin Watson! (Closes: #1102658) - Address a long-hidden issue in the test_versions testsuite where we weren't actually testing ">" as it was masked by the tests for equality in the testsuite. - Update copyright years. 295: - Use --walk over the potentially dangerous --scan argument of zipdetails(1). (Closes: reproducible-builds/diffoscope#406) 296: - Don't rely on zipdetails' --walk functionality to be available; only add that argument after testing for a new enough versions. (Closes: reproducible-builds/diffoscope#408) - Disable and then re-enable failing on stable-bpo. - Update copyright years. - Add NuGet package support. 297: - Add a LZMA comparator and tests. (From OE-Core rev: 7ba8b83d4d24ce81bba971f8ca274f95d11996ba) Signed-off-by: Gyorgy Sarvari Signed-off-by: Richard Purdie --- .../diffoscope/{diffoscope_293.bb => diffoscope_297.bb} | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) rename meta/recipes-support/diffoscope/{diffoscope_293.bb => diffoscope_297.bb} (88%) diff --git a/meta/recipes-support/diffoscope/diffoscope_293.bb b/meta/recipes-support/diffoscope/diffoscope_297.bb similarity index 88% rename from meta/recipes-support/diffoscope/diffoscope_293.bb rename to meta/recipes-support/diffoscope/diffoscope_297.bb index 59e7cbe000..6f6f4ac520 100644 --- a/meta/recipes-support/diffoscope/diffoscope_293.bb +++ b/meta/recipes-support/diffoscope/diffoscope_297.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" inherit pypi setuptools3 -SRC_URI[sha256sum] = "15315d09babdee45449be7042ad1f57104a5f04853bd6951cdc0da171c13ac3b" +SRC_URI[sha256sum] = "25532061c640b4be7496f9a726640e20ca0fcb8e46a8a1a46e51ac940a5f4e57" RDEPENDS:${PN} += "\ binutils \ @@ -29,9 +29,6 @@ RDEPENDS:${PN} += "\ vim \ " -# Dependencies don't build for musl -COMPATIBLE_HOST:libc-musl = 'null' - do_install:append:class-native() { create_wrapper ${D}${bindir}/diffoscope \ MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \