[arch-commits] Commit in diffoscope/trunk (PKGBUILD)

[Jelle van der Waa]

    Date: Friday, April 30, 2021 @ 19:43:47
  Author: jelle
Revision: 925398

Update to 173 with a custom patch for file 5.40

Modified:
  diffoscope/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-30 19:13:56 UTC (rev 925397)
+++ PKGBUILD	2021-04-30 19:43:47 UTC (rev 925398)
@@ -1,7 +1,7 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 
 pkgname=diffoscope
-pkgver=171
+pkgver=173
 pkgrel=1
 pkgdesc='Tool for in-depth comparison of files, archives, and directories'
 url='https://diffoscope.org/'
@@ -39,6 +39,7 @@
   'mono: mono support'
   'openssh: OpenSSH key comparing support'
   'openssl: .p7c and .p7b certificates. support'
+  'pgpdump: PGP files support'
   'poppler: PDF utilities support'
   'r: R language support'
   'radare2: decompiler for executables'
@@ -61,14 +62,17 @@
 makedepends=('help2man' 'python-docutils' 'git')
 checkdepends=(
   'python-pytest' 'python-jsbeautifier' 'python-h5py' 'acl' 'binutils' 'bzip2' 'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify'
-  'hdf5' 'imagemagick' 'java-environment=11' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'poppler' 'sqlite' 'squashfs-tools'
+  'hdf5' 'imagemagick' 'java-environment=11' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'pgpdump' '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' 'uboot-tools')
-source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc})
-sha512sums=('9eea18a65d1e04f244960c0c819336c7a2af24b96a9895202ec89ffd304fbec528256cd8c7eaf7829d7a8540940d65ce8d217542175b3392e4fd5a4af44ae4c4'
-            'SKIP')
-b2sums=('220fe70c646d3f8c1985e5e853bcf4028b5904527ad0dedf90a4d4f32b24886062eb88be92cbea86215b644e3ebea910571ae8cca2032a893db3f24dc600a06b'
-        'SKIP')
+source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc}
+        file_compatibility.patch::https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/7bf04a62623d234a870fd62b0ee745c9b940f5d7.patch)
+sha512sums=('c75f5f7ec2cd27fc70317893ea7f057ad2e51a6cedc2131b5ee45ed5d86044b01cc4d3a40b66eccec329127369b33d746f5d0d7ee47a727c728dc207334fd10a'
+            'SKIP'
+            '7671335acf20b8b754bdec3963832b54cba0cbbc2f7e09edc65741fa2d70bf317953523cc0d2d82db08a03536d1ea4a4d8cfbb64dc7b292cfe1df40c83e91401')
+b2sums=('5b14e877aec224c4900684b3f59d5bdaf0f21ca0fc62fda75b8791234e9829d5a0a5b43268605b7c348bad0b84ae7353af4d7088aeeb44968fab2daf4b9aba9e'
+        'SKIP'
+        '9c7194c09deab31999e467c6c0724fa11758c0415c3134f70dcc0e39ee9aa0b941e46459b391786747dd81597b0cb1c2216556959ffd80478bd28e8256ca0e3f')
 validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb <chris at chris-lamb.co.uk>"
 
 
@@ -75,6 +79,7 @@
 prepare() {
   cd ${pkgname}-${pkgver}
   sed '/python-magic/d' -i setup.py
+  patch -Np1 -i ${srcdir}/file_compatibility.patch
 }
 
 build() {