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

[Jelle van der Waa]

    Date: Monday, May 10, 2021 @ 10:38:29
  Author: jelle
Revision: 929514

Update, disable some tests for faulty file version

Modified:
  diffoscope/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-10 10:38:26 UTC (rev 929513)
+++ PKGBUILD	2021-05-10 10:38:29 UTC (rev 929514)
@@ -1,7 +1,7 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 
 pkgname=diffoscope
-pkgver=173
+pkgver=174
 pkgrel=1
 pkgdesc='Tool for in-depth comparison of files, archives, and directories'
 url='https://diffoscope.org/'
@@ -65,14 +65,11 @@
   '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}
-        file_compatibility.patch::https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/7bf04a62623d234a870fd62b0ee745c9b940f5d7.patch)
-sha512sums=('c75f5f7ec2cd27fc70317893ea7f057ad2e51a6cedc2131b5ee45ed5d86044b01cc4d3a40b66eccec329127369b33d746f5d0d7ee47a727c728dc207334fd10a'
-            'SKIP'
-            '7671335acf20b8b754bdec3963832b54cba0cbbc2f7e09edc65741fa2d70bf317953523cc0d2d82db08a03536d1ea4a4d8cfbb64dc7b292cfe1df40c83e91401')
-b2sums=('5b14e877aec224c4900684b3f59d5bdaf0f21ca0fc62fda75b8791234e9829d5a0a5b43268605b7c348bad0b84ae7353af4d7088aeeb44968fab2daf4b9aba9e'
-        'SKIP'
-        '9c7194c09deab31999e467c6c0724fa11758c0415c3134f70dcc0e39ee9aa0b941e46459b391786747dd81597b0cb1c2216556959ffd80478bd28e8256ca0e3f')
+source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc})
+sha512sums=('2f36bed3f22bfd78296b8dbd842e0a805a3e20175a9258ad784e161688c03a449f3efe518733ace983c5c095173e22fa0723d779b9578b002f01f767fa0091c2'
+            'SKIP')
+b2sums=('db8002184e6ae9a5afafda2bd9972aa4d66863f6ced7fb89445d73137c59a189e6ada0cbf59284fb733647ef5f6ca22bc6b5a8ecc36206db75e9b46f40de3da2'
+        'SKIP')
 validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb <chris at chris-lamb.co.uk>"
 
 
@@ -79,7 +76,6 @@
 prepare() {
   cd ${pkgname}-${pkgver}
   sed '/python-magic/d' -i setup.py
-  patch -Np1 -i ${srcdir}/file_compatibility.patch
 }
 
 build() {
@@ -91,7 +87,10 @@
 check() {
   cd ${pkgname}-${pkgver}
   PYTHONPATH=".:${PYTHONPATH}" PYTHONDONTWRITEBYTECODE=1 py.test \
-    -k 'not test_ppu and not test_superblock and not test_wasm' # unsquashfs output differs from fixture.
+    -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
+    # unsquashfs output differs from fixture.
     # ppu bug https://salsa.debian.org/reproducible-builds/diffoscope/issues/9
 }