Date: Friday, February 19, 2021 @ 15:20:41 Author: jelle Revision: 865882
Update to 167 and add uboot-tools as new optdependency Modified: diffoscope/trunk/PKGBUILD Deleted: diffoscope/trunk/c72c30f29ea3760eb4c785644dc7cd4c26833740.patch ------------------------------------------------+ PKGBUILD | 19 ++---- c72c30f29ea3760eb4c785644dc7cd4c26833740.patch | 70 ----------------------- 2 files changed, 8 insertions(+), 81 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-02-19 15:20:34 UTC (rev 865881) +++ PKGBUILD 2021-02-19 15:20:41 UTC (rev 865882) @@ -1,7 +1,7 @@ # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> pkgname=diffoscope -pkgver=166 +pkgver=167 pkgrel=1 pkgdesc='Tool for in-depth comparison of files, archives, and directories' url='https://diffoscope.org/' @@ -49,6 +49,7 @@ 'python-jsbeautifier: javascript beautifier support' 'python-progressbar: show progressbar support' 'tcpdump: pcap matching support' + 'uboot-tools: FIT image support' 'unzip: zip utilities support' 'gzip: gzip utilities support' 'tar: tar utilities support' @@ -62,14 +63,12 @@ 'python-pytest' 'python-jsbeautifier' 'python-h5py' 'acl' 'binutils' 'bzip2' 'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify' 'hdf5' 'imagemagick' 'java-environment=11' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools' 'lz4' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'openssl' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib' - 'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete' 'zstd') -source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc} c72c30f29ea3760eb4c785644dc7cd4c26833740.patch) -sha512sums=('db3d51e71baec7ce56e094f09d2b1feb936c36bc3ed5760fe70d27ec8e784dbf935224ddd5bbc829777b77a943d3288a2de97abd1fecc048061b5ec129ec798d' - 'SKIP' - '9d7d81fbad05a921456c09d527e062e933cdf3e4815ec3bed57ab4a1c9caa11981fcc09b5f58dcaab71647e0d99a7836b4f8c67101917f7f322fb331a21d3a91') -b2sums=('bcb5589eccdb29378ba37c42bd5f4d233bf1d8b0c7591d698d6668bfd282cfc34b9fccbb9486fd09f647d59ee5ae9665971d557f16bd7c40e1043b496922abe5' - 'SKIP' - '5b8790f5bb0a92db7e6bc30001b26d79ecb04d26bc617bc664c8fbebd875bd7262f1f92c042ab41a4816a89bff96699a6465a1fc27afa17785f15aa1f7d1b0ef') + 'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete' 'zstd' 'uboot-tools') +source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc}) +sha512sums=('8120e886b9d8dcc7828cf7f9894d2f9d5f844764ffeaf8885822360fe64700894f59e1220ef4761c3ba9cb461eef058c6fb10f1fac1b523edc259dfd580975ee' + 'SKIP') +b2sums=('93e9514e20c8679c48265ec38bd7732cf68dcaae934b304bc1c3c72480814e3772902bd64e2ae88d0d4c781d54bbd404c415db11a5946c75246fbd5090847f54' + 'SKIP') validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb <ch...@chris-lamb.co.uk>" @@ -76,8 +75,6 @@ prepare() { cd ${pkgname}-${pkgver} sed '/python-magic/d' -i setup.py - # pypi python-magic comptability broke libmagic compat, fixed upstream in 74c0d3f40efb49cfd78d3592bc87c76211e20570 - patch -Np1 -R -i ${srcdir}/c72c30f29ea3760eb4c785644dc7cd4c26833740.patch } build() { Deleted: c72c30f29ea3760eb4c785644dc7cd4c26833740.patch =================================================================== --- c72c30f29ea3760eb4c785644dc7cd4c26833740.patch 2021-02-19 15:20:34 UTC (rev 865881) +++ c72c30f29ea3760eb4c785644dc7cd4c26833740.patch 2021-02-19 15:20:41 UTC (rev 865882) @@ -1,70 +0,0 @@ -From c72c30f29ea3760eb4c785644dc7cd4c26833740 Mon Sep 17 00:00:00 2001 -From: Chris Lamb <la...@debian.org> -Date: Thu, 28 Jan 2021 12:22:17 +0000 -Subject: [PATCH] Prefer to use magic.Magic over the magic.open compatibility - interface. (Closes: reproducible-builds/diffoscope#236) - -See <https://github.com/ahupp/python-magic/blob/master/COMPAT.md> for more info. ---- - diffoscope/comparators/utils/file.py | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/diffoscope/comparators/utils/file.py b/diffoscope/comparators/utils/file.py -index 32700f02..fb3b4316 100644 ---- a/diffoscope/comparators/utils/file.py -+++ b/diffoscope/comparators/utils/file.py -@@ -65,37 +65,37 @@ def _run_tests(fold, tests): - - - class File(metaclass=abc.ABCMeta): -- if hasattr(magic, "open"): # use Magic-file-extensions from file -+ if hasattr(magic, "Magic"): # use python-magic - - @classmethod - def guess_file_type(cls, path): - if not hasattr(cls, "_mimedb"): -- cls._mimedb = magic.open(magic.NONE) -- cls._mimedb.load() -- return cls._mimedb.file( -- path.encode("utf-8", errors="surrogateescape") -- ) -+ cls._mimedb = magic.Magic() -+ return maybe_decode(cls._mimedb.from_file(path)) - - @classmethod - def guess_encoding(cls, path): - if not hasattr(cls, "_mimedb_encoding"): -- cls._mimedb_encoding = magic.open(magic.MAGIC_MIME_ENCODING) -- cls._mimedb_encoding.load() -- return cls._mimedb_encoding.file(path) -+ cls._mimedb_encoding = magic.Magic(mime_encoding=True) -+ return maybe_decode(cls._mimedb_encoding.from_file(path)) - -- else: # use python-magic -+ else: # use Magic-file-extensions from file - - @classmethod - def guess_file_type(cls, path): - if not hasattr(cls, "_mimedb"): -- cls._mimedb = magic.Magic() -- return maybe_decode(cls._mimedb.from_file(path)) -+ cls._mimedb = magic.open(magic.NONE) -+ cls._mimedb.load() -+ return cls._mimedb.file( -+ path.encode("utf-8", errors="surrogateescape") -+ ) - - @classmethod - def guess_encoding(cls, path): - if not hasattr(cls, "_mimedb_encoding"): -- cls._mimedb_encoding = magic.Magic(mime_encoding=True) -- return maybe_decode(cls._mimedb_encoding.from_file(path)) -+ cls._mimedb_encoding = magic.open(magic.MAGIC_MIME_ENCODING) -+ cls._mimedb_encoding.load() -+ return cls._mimedb_encoding.file(path) - - def __init__(self, container=None): - self._comments = [] --- -GitLab -
