Date: Thursday, December 29, 2022 @ 15:34:46 Author: jelle Revision: 1371865
upgpkg: diffoscope 229-1 Modified: diffoscope/trunk/PKGBUILD Deleted: diffoscope/trunk/0001-Support-file-5.43.patch ------------------------------+ 0001-Support-file-5.43.patch | 29 ----------------------------- PKGBUILD | 14 ++++++-------- 2 files changed, 6 insertions(+), 37 deletions(-) Deleted: 0001-Support-file-5.43.patch =================================================================== --- 0001-Support-file-5.43.patch 2022-12-29 15:32:04 UTC (rev 1371864) +++ 0001-Support-file-5.43.patch 2022-12-29 15:34:46 UTC (rev 1371865) @@ -1,29 +0,0 @@ -From 88c08e7e098d2962e1bdbeb56a48d4a20f73f0ae Mon Sep 17 00:00:00 2001 -From: Jelle van der Waa <[email protected]> -Date: Fri, 23 Sep 2022 14:35:20 +0200 -Subject: [PATCH] Support file 5.43 - -File 5.43 changed it's output format for pyc files to something new: - -Byte-compiled Python module for CPython 3.9, timestamp-based, .py -timestamp: Sun Sep 5 18:47:25 2021 UTC, .py size: 14217 bytes ---- - diffoscope/comparators/python.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/diffoscope/comparators/python.py b/diffoscope/comparators/python.py -index 5cf30c7d..1b9d4220 100644 ---- a/diffoscope/comparators/python.py -+++ b/diffoscope/comparators/python.py -@@ -36,7 +36,7 @@ re_memory_address = re.compile(r" at 0x\w+(?=, )") - - class PycFile(File): - DESCRIPTION = "Python .pyc files" -- FILE_TYPE_RE = re.compile(r"^python .*byte-compiled$") -+ FILE_TYPE_RE = re.compile(r"(^python .*byte-compiled$|^Byte-compiled Python module for CPython .*)") - FALLBACK_FILE_EXTENSION_SUFFIX = {".pyc"} - - def compare_details(self, other, source=None): --- -2.37.3 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-29 15:32:04 UTC (rev 1371864) +++ PKGBUILD 2022-12-29 15:34:46 UTC (rev 1371865) @@ -1,7 +1,7 @@ # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> pkgname=diffoscope -pkgver=228 +pkgver=229 pkgrel=1 pkgdesc='Tool for in-depth comparison of files, archives, and directories' url='https://diffoscope.org/' @@ -67,9 +67,9 @@ 'libxmlb' 'lz4' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'openssl' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib' 'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete' 'zstd' 'uboot-tools') source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc}) -sha512sums=('d9d10f085c6885f7b32cada71344f6834c9679ed9baa819132774df8b10572f78397b061fafb59ff847da99cdbc4cae13ba8556306e85d844533026b396a3c45' +sha512sums=('ebea41826b85723aebe2cf59427dc7bbdabe6f55635ab22bfa62f914dbb413188f02ab137563790499cdee76e4d15d7ca2119a510e71610c262d12cbf03eaa2c' 'SKIP') -b2sums=('9c1f26630294a6e77af4d88aba146ba7a9c083696c5690ce99ae804e2eb2ca8534ca83a3d66250d4bdfaea106ea27660ab9b2a36608eca70100cd762a7d50d98' +b2sums=('cb8f93ebf9e8f9d1117b29e7ca3945ed28792bf99d0b934eda7e07946c848a806781008a7e2b42e23441a669eb5a1c98d02b0f24302900e048562e8331d660cc' 'SKIP') validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb <[email protected]>" @@ -83,12 +83,10 @@ cd ${pkgname}-${pkgver} # lcms2 causes cd-iccdump to segfault rm tests/comparators/test_icc.py - # html2text tests fail - rm tests/comparators/test_html.py + # https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/111 + rm tests/comparators/test_berkeley_db.py PYTHONPATH=".:${PYTHONPATH}" PYTHONDONTWRITEBYTECODE=1 py.test \ - -k 'not test_ppu and not test_superblock and not test_wasm and not test_text_proper_indentation and not test_different and not test_equal' - # file upstream bug, see 2cd654b450ce82fb86f55223cc01ba1abdac58a8 in diffoscope.git - # bug introduced by revert in https://bugs.archlinux.org/task/70261 + -k 'not test_ppu and not test_superblock ' # unsquashfs output differs from fixture. # ppu bug https://salsa.debian.org/reproducible-builds/diffoscope/issues/9 }
