Jelle van der Waa pushed to branch main at Arch Linux / Packaging / Packages /
diffoscope
Commits:
64cd49ae by Jelle van der Waa at 2026-01-19T11:58:33+01:00
upgpkg: 310-1
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = diffoscope
pkgdesc = Tool for in-depth comparison of files, archives, and
directories
- pkgver = 309
- pkgrel = 2
+ pkgver = 310
+ pkgrel = 1
url = https://diffoscope.org/
arch = x86_64
license = GPL-3.0-or-later
@@ -115,13 +115,13 @@ pkgbase = diffoscope
optdepends = xz: XZ and LZMA utilities support
optdepends = zstd: zst compression
optdepends = p7zip: 7z compression
- source = https://diffoscope.org/archive/diffoscope-309.tar.bz2
- source = https://diffoscope.org/archive/diffoscope-309.tar.bz2.asc
+ source = https://diffoscope.org/archive/diffoscope-310.tar.bz2
+ source = https://diffoscope.org/archive/diffoscope-310.tar.bz2.asc
validpgpkeys = C2FE4BD271C139B86C533E461E953E27D4311E58
validpgpkeys = 66AE2B4AFCCF3F52DA184D184B043FCDB9444540
- sha512sums =
ef254966348fb9e78cbb1926160b27bf61e5ddc501a4ac174914b0101b246b0574012b0b23e8ca9ca0a58c2a51eff7bf97a5fa343eae9763bf5b72f6729a8062
+ sha512sums =
f233222109da08d58820ecb316d8e0c7bd3d02bcbd344ba930794f087892c40ca6d0cd0ee447060dfa160a084aae0f925f98af14ac062ccc9058bfe1b992df46
sha512sums = SKIP
- b2sums =
fc5089e914d1a1a1eb8507a7b696a0d4331c3c7e11c31e5ad19a3128310d817ae1612670a5b4e6636b65b6e221c4f097d5d4f878941d725dbe33639c1e751eb1
+ b2sums =
c3f973e3061a3c89718e132e69b9006f92b0f2b44377dbaa43cd507eb6cd2720c4af662944d5bbaadaa4c00e4eb8fecc57e713e8b4e8b960f1657b47645e85c5
b2sums = SKIP
pkgname = diffoscope
=====================================
PKGBUILD
=====================================
@@ -1,8 +1,8 @@
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
pkgname=diffoscope
-pkgver=309
-pkgrel=2
+pkgver=310
+pkgrel=1
pkgdesc='Tool for in-depth comparison of files, archives, and directories'
url='https://diffoscope.org/'
arch=('x86_64')
@@ -83,9 +83,9 @@ checkdepends=(
'libxmlb' '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' 'asar')
source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc})
-sha512sums=('ef254966348fb9e78cbb1926160b27bf61e5ddc501a4ac174914b0101b246b0574012b0b23e8ca9ca0a58c2a51eff7bf97a5fa343eae9763bf5b72f6729a8062'
+sha512sums=('f233222109da08d58820ecb316d8e0c7bd3d02bcbd344ba930794f087892c40ca6d0cd0ee447060dfa160a084aae0f925f98af14ac062ccc9058bfe1b992df46'
'SKIP')
-b2sums=('fc5089e914d1a1a1eb8507a7b696a0d4331c3c7e11c31e5ad19a3128310d817ae1612670a5b4e6636b65b6e221c4f097d5d4f878941d725dbe33639c1e751eb1'
+b2sums=('c3f973e3061a3c89718e132e69b9006f92b0f2b44377dbaa43cd507eb6cd2720c4af662944d5bbaadaa4c00e4eb8fecc57e713e8b4e8b960f1657b47645e85c5'
'SKIP')
validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58"
"66AE2B4AFCCF3F52DA184D184B043FCDB9444540")
@@ -105,10 +105,12 @@ check() {
# HACK test_dtb fails because our version of fdtdump outputs
v1.7.2-1-ge1e5298
rm tests/comparators/test_dtb.py
PYTHONPATH=".:${PYTHONPATH}" PYTHONDONTWRITEBYTECODE=1 py.test \
+ --deselect tests/comparators/test_fit.py::test_file_differences \
-k 'not test_ppu and not test_superblock and not test_listing'
# unsquashfs output differs from fixture.
# ppu bug https://salsa.debian.org/reproducible-builds/diffoscope/issues/9
# skip test_listing due to a bug in binwalk comparison with test_listing
+ # skip test_file_differences for uboot-tools 2026.01
https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/422
}
package() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/diffoscope/-/commit/64cd49aefd48fcbf2ae7256ad541d145b1a091e0
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/diffoscope/-/commit/64cd49aefd48fcbf2ae7256ad541d145b1a091e0
You're receiving this email because of your account on gitlab.archlinux.org.
