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

[Jelle van der Waa]

    Date: Wednesday, December 12, 2018 @ 15:28:37
  Author: jelle
Revision: 415601

upgpkg: diffoscope 107-1

Update to 107, add patch for icc test deprecation and disable squashfs output differs

Modified:
  diffoscope/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-12 15:27:55 UTC (rev 415600)
+++ PKGBUILD	2018-12-12 15:28:37 UTC (rev 415601)
@@ -1,7 +1,7 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 
 pkgname=diffoscope
-pkgver=103
+pkgver=107
 pkgrel=1
 pkgdesc='Tool for in-depth comparison of files, archives, and directories'
 url='https://diffoscope.org/'
@@ -58,12 +58,16 @@
   'java-environment>=8' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools' 'lz4'
   'python-tlsh' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib'
   'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete')
-source=(${pkgname}-${pkgver}.tar.bz2::https://salsa.debian.org/reproducible-builds/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha512sums=('1cc5fb7b8d162cbc8a3aed211c8fc95f1c894f9eccd0e5535c13934253f6a7395ea92cd9c8dad066390d130cbd961f5e1ea7f302de3be8f4b833068f4c6d758e')
+source=(${pkgname}-${pkgver}.tar.bz2::https://salsa.debian.org/reproducible-builds/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+        test_icc_fixture.patch::https://salsa.debian.org/reproducible-builds/diffoscope/commit/a4c38a60fe505de772f0d9ced5cca1ca5df540ba.patch)
 
+sha512sums=('d46af97fad55629022eceffdc82c75a32f3649c8ff237cced373af99bfe80ce1a4f135d3d45efc0013350afec697f3fbac69b75917456501fb3ba1b4ced77071'
+            'd3415e43a271050ee01599b58d4c8c8347f3855eb4f1a2265722f014747ad749624bf08001444d6754ef78aaae46ca81fb40971b6d28ae307b54a86c13112e42')
+
 prepare() {
   cd ${pkgname}-${pkgver}
   sed '/python-magic/d' -i setup.py
+  patch -Np1 -i ${srcdir}/test_icc_fixture.patch # Fix fixture error from pytest
 }
 
 build() {
@@ -75,7 +79,7 @@
 check() {
   cd ${pkgname}-${pkgver}
   PYTHONPATH=".:${PYTHONPATH}" py.test \
-    -k 'not test_ppu'
+    -k 'not test_ppu and not test_superblock' # unsquashfs output differs from fixture.
 }
 
 package() {