From 8d1fa3d126da693d2a2adaf06a2535ab0376fd74 Mon Sep 17 00:00:00 2001
From: Gyorgy Sarvari <skandigraun@gmail.com>
Date: Thu, 5 Jun 2025 07:16:47 +0200
Subject: 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 <skandigraun@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/diffoscope/diffoscope_293.bb | 43 -----------------------
 meta/recipes-support/diffoscope/diffoscope_297.bb | 40 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 43 deletions(-)
 delete mode 100644 meta/recipes-support/diffoscope/diffoscope_293.bb
 create mode 100644 meta/recipes-support/diffoscope/diffoscope_297.bb

diff --git a/meta/recipes-support/diffoscope/diffoscope_293.bb b/meta/recipes-support/diffoscope/diffoscope_293.bb
deleted file mode 100644
index 59e7cbe000..0000000000
--- a/meta/recipes-support/diffoscope/diffoscope_293.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SUMMARY = "in-depth comparison of files, archives, and directories"
-DESCRIPTION = "Tries to get to the bottom of what makes files or directories \
-different. It will recursively unpack archives of many kinds and transform \
-various binary formats into more human-readable form to compare them. \
-It can compare two tarballs, ISO images, or PDF just as easily."
-HOMEPAGE = "https://diffoscope.org/"
-BUGTRACKER = "https://salsa.debian.org/reproducible-builds/diffoscope/-/issues"
-LICENSE = "GPL-3.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-PYPI_PACKAGE = "diffoscope"
-
-inherit pypi setuptools3
-
-SRC_URI[sha256sum] = "15315d09babdee45449be7042ad1f57104a5f04853bd6951cdc0da171c13ac3b"
-
-RDEPENDS:${PN} += "\
-        binutils \
-        python3-curses \
-        python3-difflib \
-        python3-fcntl \
-        python3-json \
-        python3-libarchive-c \
-        python3-magic \
-        python3-multiprocessing \
-        python3-pprint \
-        python3-rpm \
-        squashfs-tools \
-        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 \
-		RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \
-		LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
-		RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE}
-}
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/diffoscope/diffoscope_297.bb b/meta/recipes-support/diffoscope/diffoscope_297.bb
new file mode 100644
index 0000000000..6f6f4ac520
--- /dev/null
+++ b/meta/recipes-support/diffoscope/diffoscope_297.bb
@@ -0,0 +1,40 @@
+SUMMARY = "in-depth comparison of files, archives, and directories"
+DESCRIPTION = "Tries to get to the bottom of what makes files or directories \
+different. It will recursively unpack archives of many kinds and transform \
+various binary formats into more human-readable form to compare them. \
+It can compare two tarballs, ISO images, or PDF just as easily."
+HOMEPAGE = "https://diffoscope.org/"
+BUGTRACKER = "https://salsa.debian.org/reproducible-builds/diffoscope/-/issues"
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+PYPI_PACKAGE = "diffoscope"
+
+inherit pypi setuptools3
+
+SRC_URI[sha256sum] = "25532061c640b4be7496f9a726640e20ca0fcb8e46a8a1a46e51ac940a5f4e57"
+
+RDEPENDS:${PN} += "\
+        binutils \
+        python3-curses \
+        python3-difflib \
+        python3-fcntl \
+        python3-json \
+        python3-libarchive-c \
+        python3-magic \
+        python3-multiprocessing \
+        python3-pprint \
+        python3-rpm \
+        squashfs-tools \
+        vim \
+        "
+
+do_install:append:class-native() {
+	create_wrapper ${D}${bindir}/diffoscope \
+		MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \
+		RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \
+		LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
+		RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE}
+}
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf