summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoranthraxx2016-12-23 14:25:51 +0100
committeranthraxx2016-12-23 14:25:51 +0100
commitd6d478d916e153da8cdf999bb63ce8f031c07a7a (patch)
treef1feb1d2394bf670f474556c6cc2207dec177b18
parent352536cb59c8ef9d625426c5de30b9bb36e247b5 (diff)
downloadaur-d6d478d916e153da8cdf999bb63ce8f031c07a7a.tar.gz
upgpkg: diffoscope-git 65+1+g5366ec6-1 (adding openssh)
skipping some failing tests because of newer tool versions as expected
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 20beeb2b5502..c657aae3b63f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = diffoscope-git
pkgdesc = Tool for in-depth comparison of files, archives, and directories
- pkgver = 62+2+ge4731a6
+ pkgver = 65+1+g5366ec6
pkgrel = 1
url = https://diffoscope.org/
arch = x86_64
@@ -33,6 +33,7 @@ pkgbase = diffoscope-git
checkdepends = llvm
checkdepends = colord
checkdepends = fpc
+ checkdepends = openssh
makedepends = git
depends = python-magic
depends = python-libarchive-c
@@ -55,6 +56,7 @@ pkgbase = diffoscope-git
optdepends = gnupg: GNU privacy guard support
optdepends = mono: mono support
optdepends = mono-tools: mono utilities support
+ optdepends = openssh: OpenSSH key comparing support
optdepends = poppler: PDF utilities support
optdepends = sqlite: SQLite support
optdepends = squashfs-tools: squashfs filesystem support
diff --git a/PKGBUILD b/PKGBUILD
index 16e18bbe0ccc..134e9eb24dd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
pkgname=diffoscope-git
-pkgver=62+2+ge4731a6
+pkgver=65+1+g5366ec6
pkgrel=1
pkgdesc='Tool for in-depth comparison of files, archives, and directories'
url='https://diffoscope.org/'
@@ -28,6 +28,7 @@ optdepends=(
'gnupg: GNU privacy guard support'
'mono: mono support'
'mono-tools: mono utilities support'
+ 'openssh: OpenSSH key comparing support'
'poppler: PDF utilities support'
'sqlite: SQLite support'
'squashfs-tools: squashfs filesystem support'
@@ -42,7 +43,7 @@ optdepends=(
makedepends=('git')
checkdepends=(
'python-pytest' 'acl' 'binutils' 'bzip2' 'cdrkit' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify' 'java-environment>=8' 'fontforge' 'gettext' 'ghc' 'gnupg'
- 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools' 'tlsh' 'unzip' 'gzip' 'tar' 'vim' 'xz' 'llvm' 'colord' 'fpc')
+ 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools' 'tlsh' 'unzip' 'gzip' 'tar' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh')
provides=('diffoscope')
conflicts=('diffoscope')
source=(${pkgname}::git+https://anonscm.debian.org/git/reproducible/diffoscope.git)
@@ -65,9 +66,9 @@ build() {
check() {
cd ${pkgname}
- # TODO: readd fpc
+ # TODO: readd fpc and dex
# TODO: colord test fails with lcms2 >= 2.8
- PYTHONPATH=".:${PYTHONPATH}" py.test -k 'not test_icc and not test_ppu'
+ PYTHONPATH=".:${PYTHONPATH}" py.test -k 'not test_icc and not test_ppu and not test_dex'
}
package() {