Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / zathura
Commits: 776e1645 by Robin Candau at 2024-03-05T10:01:37+01:00 upgpkg: 0.5.5-1: New upstream release + Switch licence to SPDX identifier - - - - - 3 changed files: - .SRCINFO - PKGBUILD - − fix-xvfb-run-tests.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,10 +1,10 @@ pkgbase = zathura pkgdesc = Minimalistic document viewer - pkgver = 0.5.4 - pkgrel = 2 + pkgver = 0.5.5 + pkgrel = 1 url = https://pwmt.org/projects/zathura/ arch = x86_64 - license = custom + license = Zlib checkdepends = xorg-server-xvfb makedepends = python-sphinx makedepends = texlive-bin @@ -24,9 +24,7 @@ pkgbase = zathura optdepends = zathura-pdf-mupdf: PDF support using MuPDF optdepends = zathura-ps: PostScript support optdepends = zathura-cb: Comic book support - source = zathura-0.5.4.tar.gz::https://pwmt.org/projects/zathura/download/zathura-0.5.4.tar.xz - source = fix-xvfb-run-tests.patch - sha256sums = a3037f7aa94d4096bfd97069f62ffcdca9f06431e8663548c1cd6b945c556f32 - sha256sums = 15bf4be1a6c1dc539e2f034fa30d509d19b016ec130aaa4cbe506bf61bc343fe + source = zathura-0.5.5.tar.gz::https://deb.debian.org/debian/pool/main/z/zathura/zathura_0.5.5.orig.tar.xz + sha256sums = eb5d7af54bb0fc88f5f03f6be3fc3a18bfddd28d93ed9e6136bbdb8ff3baf88f pkgname = zathura ===================================== PKGBUILD ===================================== @@ -5,14 +5,12 @@ # Contributor: ML <neldoreth> pkgname=zathura -pkgver=0.5.4 -pkgrel=2 - +pkgver=0.5.5 +pkgrel=1 pkgdesc="Minimalistic document viewer" url="https://pwmt.org/projects/zathura/" arch=('x86_64') -license=('custom') - +license=('Zlib') makedepends=('python-sphinx' 'texlive-bin' 'meson' 'ninja' 'appstream-glib' 'check') checkdepends=('xorg-server-xvfb') depends=('girara' 'sqlite' 'desktop-file-utils' 'file' 'libsynctex' 'file' 'libseccomp') @@ -21,22 +19,11 @@ optdepends=('zathura-djvu: DjVu support' 'zathura-pdf-mupdf: PDF support using MuPDF' 'zathura-ps: PostScript support' 'zathura-cb: Comic book support') - -source=(zathura-$pkgver.tar.gz::https://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.xz - fix-xvfb-run-tests.patch) - -sha256sums=('a3037f7aa94d4096bfd97069f62ffcdca9f06431e8663548c1cd6b945c556f32' - '15bf4be1a6c1dc539e2f034fa30d509d19b016ec130aaa4cbe506bf61bc343fe') - -prepare() { - # Arch's using the Fedora `xvfb` fork that deprecated the `-a` option in favor of the `-d` one. - # This patch makes the switch in upstream sources to prevent xvfb-run tests to fail when trying to kill the process during check(). - # Upstream is implementing an auto-detect feature for that in the next release, so the right option will be used automatically. - # This patch can thus be dropped at next release. - # See https://git.pwmt.org/pwmt/zathura/-/issues/390#note_2321 & https://git.pwmt.org/pwmt/zathura/-/issues/390#note_2323 - cd zathura-$pkgver - patch -Np1 <${srcdir}/fix-xvfb-run-tests.patch -} +# Temporarily switch sources while waiting for upstream to fix sources uploading on the pwmt.org website +# See https://git.pwmt.org/pwmt/zathura/-/issues/407#note_2414 +source=(zathura-$pkgver.tar.gz::https://deb.debian.org/debian/pool/main/z/zathura/zathura_$pkgver.orig.tar.xz) +#source=(zathura-$pkgver.tar.gz::https://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.xz) +sha256sums=('eb5d7af54bb0fc88f5f03f6be3fc3a18bfddd28d93ed9e6136bbdb8ff3baf88f') build() { cd zathura-$pkgver ===================================== fix-xvfb-run-tests.patch deleted ===================================== @@ -1,12 +0,0 @@ -diff --git a/tests/meson.build b/tests/meson.build -index 1b2e81a..bbfc668 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -42,7 +42,7 @@ if check.found() - c_args: defines + flags - ) - test('session', xvfb, -- args: ['-a', '-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset', session], -+ args: ['-d', '-s', '-screen 0 1400x900x24 -ac +extension GLX +render -noreset', session], - timeout: 60*60 - ) View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/zathura/-/commit/776e16455bf7002e6f7bbaf12e9d21cce632053e -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/zathura/-/commit/776e16455bf7002e6f7bbaf12e9d21cce632053e You're receiving this email because of your account on gitlab.archlinux.org.