diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-09-26 16:14:02 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-09-26 16:14:07 +0000 |
| commit | 40155debf7d5f16e82cd95541de8676a919cb146 (patch) | |
| tree | 9b3dcf55fcb82ec8eace90ec9d8657d3d33a9da4 /testing/icdiff | |
| parent | 379c28e2d5e45e325fac6af51cca1c08d3b68e62 (diff) | |
| download | aports-40155debf7d5f16e82cd95541de8676a919cb146.tar.bz2 aports-40155debf7d5f16e82cd95541de8676a919cb146.tar.xz | |
testing/icdiff: upgrade to 1.9.5
Diffstat (limited to 'testing/icdiff')
| -rw-r--r-- | testing/icdiff/APKBUILD | 8 | ||||
| -rw-r--r-- | testing/icdiff/disable-git-diff-test.patch | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/testing/icdiff/APKBUILD b/testing/icdiff/APKBUILD index de67704aa7..9f9b908295 100644 --- a/testing/icdiff/APKBUILD +++ b/testing/icdiff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=icdiff -pkgver=1.9.4 +pkgver=1.9.5 pkgrel=0 pkgdesc="Improved colored diff" url="http://www.jefftk.com/icdiff" @@ -13,6 +13,7 @@ checkdepends="py3-flake8" source="https://github.com/jeffkaufman/icdiff/archive/release-$pkgver.tar.gz fix-flake8-binary.patch fix-python-interpreter.patch + disable-git-diff-test.patch " builddir="$srcdir/icdiff-release-$pkgver" @@ -35,6 +36,7 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="aca036d5e7661796ba8cc5efd0fc9ad5175e134045d88855d5a8295ab90822040b28adc830a6bc5e19089e244f63d87f4d1adc5c0e6d6ef36edab34057dda9a0 release-1.9.4.tar.gz +sha512sums="f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a release-1.9.5.tar.gz fc6fa3c98b245a9ce1830428c1d59b37f75faaab00dbf44a6d78f84318cfb4bf3fdc826fc86b9ca8a9efbd2a760223525270ea79e4d761e64d4a18597693eb64 fix-flake8-binary.patch -949b3935c44ea2982949bf2389023f091a7e96d61bd05561cddf1f4baccb13da7bf138ac1707e5727190703f539ddca8ddacb79546d6d35a14a4e7e6c63685e4 fix-python-interpreter.patch" +949b3935c44ea2982949bf2389023f091a7e96d61bd05561cddf1f4baccb13da7bf138ac1707e5727190703f539ddca8ddacb79546d6d35a14a4e7e6c63685e4 fix-python-interpreter.patch +e4aefafc7cb9c94ea4d526f79916bd4e945bfcd3c6661ae69fc45e99ed3f399ed6d321ca9ebc44590367814f4b0feadcbeb55c3662528dda7b5919c2104651a4 disable-git-diff-test.patch" diff --git a/testing/icdiff/disable-git-diff-test.patch b/testing/icdiff/disable-git-diff-test.patch new file mode 100644 index 0000000000..fc28d3ebfe --- /dev/null +++ b/testing/icdiff/disable-git-diff-test.patch @@ -0,0 +1,15 @@ +This test is failing because it assumes to be run in it's own repository. + +See https://github.com/jeffkaufman/icdiff/issues/166 +diff --git a/test.sh b/test.sh +index 99729d7234..bad21cd213 100755 +--- a/test.sh ++++ b/test.sh +@@ -144,7 +144,6 @@ check_gold gold-subcolors-bad-color tests/input-{1,2}.txt --cols=80 --color-map= + check_gold gold-subcolors-bad-cat tests/input-{1,2}.txt --cols=80 --color-map='chnge:magenta,description:cyan_bold' + check_gold gold-subcolors-bad-fmt tests/input-{1,2}.txt --cols=80 --color-map='change:magenta:gold,description:cyan_bold' + check_gold gold-bad-encoding.txt tests/input-{1,2}.txt --encoding=nonexistend_encoding +-check_git_diff gitdiff-only-newlines.txt 4e86205629~1 4e86205629 + + # Testing pipe behavior doesn't fit well with the check_gold system + $INVOCATION tests/input-{4,5}.txt 2>/tmp/icdiff-pipe-error-output | head -n 1 |