Date: Friday, September 23, 2022 @ 12:43:36 Author: jelle Revision: 1309150
upgpkg: diffoscope 222-1 Added: diffoscope/trunk/0001-Support-file-5.43.patch Modified: diffoscope/trunk/PKGBUILD ------------------------------+ 0001-Support-file-5.43.patch | 29 +++++++++++++++++++++++++++++ PKGBUILD | 18 ++++++++++++------ 2 files changed, 41 insertions(+), 6 deletions(-) Added: 0001-Support-file-5.43.patch =================================================================== --- 0001-Support-file-5.43.patch (rev 0) +++ 0001-Support-file-5.43.patch 2022-09-23 12:43:36 UTC (rev 1309150) @@ -0,0 +1,29 @@ +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-09-23 09:50:25 UTC (rev 1309149) +++ PKGBUILD 2022-09-23 12:43:36 UTC (rev 1309150) @@ -1,7 +1,7 @@ # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> pkgname=diffoscope -pkgver=221 +pkgver=222 pkgrel=1 pkgdesc='Tool for in-depth comparison of files, archives, and directories' url='https://diffoscope.org/' @@ -66,13 +66,19 @@ 'hdf5' 'imagemagick' 'java-environment=11' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'pgpdump' 'poppler' 'sqlite' 'squashfs-tools' '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=('e1f3c726c37f1c5e4c8b6379ac0d06ec950403c97e64d7457169963d073d02d29b4257b9ed6a3159d01c9fee3ced2d94248da6537fdf82d56e1d373ba7f7271e' - 'SKIP') -b2sums=('31f2dcdf98d38356670dbf2fd833247cd3f6e1f057746cdd014097fca8d99ab851b9f625a5e40daec0e6835abea8be559038173b2dc3215ab906b26ce77cad5d' - 'SKIP') +source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc} 0001-Support-file-5.43.patch) +sha512sums=('92207e75f953407984a7b57f9e67947f0f2d03c61ca522c99dacc8430f4cd66bb7414c8d2c41d6d2a9d3281ee56fbca4bb847dc9a77ea08100241b8e405d1b70' + 'SKIP' + 'edc504fc8b53a72f79aafc40dc1a7a725d98b467a81b0dff8835949776069a743096bbb67f237d9547bf59747a1b824099a3794f140705056d0767818000c653') +b2sums=('85df3c47e90f2abe815703eb7cd0be1c02ede7946b21faa65d3e39c53b74ccbe418b9272f3b7b345e863379f00c923b7a3f0ea44840e35deb8f51570facd3c1e' + 'SKIP' + '83b91c1261d745ee20dba0f65361e4b553509df8dd9e54ec48496ea5edd613ed9fdda0add21e5c122b727dd87f908de6dbc870f7beb1bbde3691ad31923eb294') validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb <[email protected]>" +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/0001-Support-file-5.43.patch +} build() { cd ${pkgname}-${pkgver}
