From 9ef1a0aa143c72d51ae52c0e1f7476743813f434 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Fri, 3 Jul 2020 14:00:07 +0200 Subject: diffoscope: upgrade 148 -> 150 This includes the following changes: Version 149: * Update tests for file 5.39. (Closes: reproducible-builds/diffoscope#179) * Downgrade the tlsh warning message to an "info" level warning. (Closes: #888237, reproducible-builds/diffoscope#29) * Use the CSS "word-break" property over manually adding U+200B zero-width spaces that make copy-pasting cumbersome. (Closes: reproducible-builds/diffoscope!53) * Codebase improvements: - Drop some unused imports from the previous commit. - Prevent an unnecessary .format() when rendering difference comments. - Use a semantic "AbstractMissingType" type instead of remembering to check for both "missing" files and missing containers. * Allow user to mask/filter reader output via --diff-mask=REGEX. (MR: reproducible-builds/diffoscope!51) * Make --html-dir child pages open in new window to accommodate new web browser content security policies. * Fix the --new-file option when comparing directories by merging DirectoryContainer.compare and Container.compare. (Closes: reproducible-builds/diffoscope#180) * Fix zsh completion for --max-page-diff-block-lines. * Do not warn about missing tlsh during tests. Version 150: * Don't crash when listing entries in archives if they don't have a listed size (such as hardlinks in .ISO files). (Closes: reproducible-builds/diffoscope#188) * Dump PE32+ executables (including EFI applications) using objdump. (Closes: reproducible-builds/diffoscope#181) * Tidy detection of JSON files due to missing call to File.recognizes that checks against the output of file(1) which was also causing us to attempt to parse almost every file using json.loads. (Whoops.) * Drop accidentally-duplicated copy of the new --diff-mask tests. * Logging improvements: - Split out formatting of class names into a common method. - Clarify that we are generating presenter formats in the opening logs. * Remove objdjump(1) offsets before instructions to reduce diff noise. (Closes: reproducible-builds/diffoscope!57) Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-support/diffoscope/diffoscope_148.bb | 17 ----------------- meta/recipes-support/diffoscope/diffoscope_150.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 meta/recipes-support/diffoscope/diffoscope_148.bb create mode 100644 meta/recipes-support/diffoscope/diffoscope_150.bb diff --git a/meta/recipes-support/diffoscope/diffoscope_148.bb b/meta/recipes-support/diffoscope/diffoscope_148.bb deleted file mode 100644 index 8b81ce12fd..0000000000 --- a/meta/recipes-support/diffoscope/diffoscope_148.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "in-depth comparison of files, archives, and directories" -HOMEPAGE = "https://diffoscope.org/" -LICENSE = "GPL-3.0+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -PYPI_PACKAGE = "diffoscope" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "54e39043226045419ba37f9b7aae4b96939f5ec16f37c44cc102e3d3f8e9ab1b" - -RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" - -# Dependencies don't build for musl -COMPATIBLE_HOST_libc-musl = 'null' - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/diffoscope/diffoscope_150.bb b/meta/recipes-support/diffoscope/diffoscope_150.bb new file mode 100644 index 0000000000..58bd60a2c2 --- /dev/null +++ b/meta/recipes-support/diffoscope/diffoscope_150.bb @@ -0,0 +1,17 @@ +SUMMARY = "in-depth comparison of files, archives, and directories" +HOMEPAGE = "https://diffoscope.org/" +LICENSE = "GPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PYPI_PACKAGE = "diffoscope" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "0b9e4ae401fe4cbb8ce89b0bcabe608581d0ed53b91a28f18337179c7494af57" + +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic" + +# Dependencies don't build for musl +COMPATIBLE_HOST_libc-musl = 'null' + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg