Skip to content
Snippets Groups Projects
Commit b3d6536d authored by alice's avatar alice
Browse files

community/feh: upgrade to 3.10

parent 35676aa2
No related branches found
No related tags found
No related merge requests found
# Contributor: Leo <thinkabit.ukim@gmail.com> # Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=feh pkgname=feh
pkgver=3.9.1 pkgver=3.10
pkgrel=0 pkgrel=0
pkgdesc="Fast, lightweight image viewer which uses imlib2" pkgdesc="Fast, lightweight image viewer which uses imlib2"
url="https://feh.finalrewind.org" url="https://feh.finalrewind.org"
...@@ -18,8 +18,7 @@ makedepends=" ...@@ -18,8 +18,7 @@ makedepends="
libxt-dev libxt-dev
" "
checkdepends="perl-utils perl-test-command" checkdepends="perl-utils perl-test-command"
source="https://feh.finalrewind.org/feh-$pkgver.tar.bz2 source="https://feh.finalrewind.org/feh-$pkgver.tar.bz2"
fix-tests.patch"
build() { build() {
make magic=1 PREFIX=/usr make magic=1 PREFIX=/usr
...@@ -39,6 +38,5 @@ package() { ...@@ -39,6 +38,5 @@ package() {
} }
sha512sums=" sha512sums="
78682ec80df6b6655dbc18774ee95b3d68f1711a50129a9befb8adfb8c1a74aeede2493a35955687cdc2aa079978927727dac02543643418ef8deefa0d8c6d05 feh-3.9.1.tar.bz2 9dc242a545590ab20847662613c289f4b78d44a1647c3696a65fd05c307628f869adf68fa3a66ca637b3974a309efb0b96d58a7aaa3d29725faf21208f40383e feh-3.10.tar.bz2
fe0971a0d23444195d142e0fc502b7105c038b055128081c3b780acdb59b89f0b67931d17e4fae0da5b20fd96d32429a69c2997ab2e1f1e8a9bbf13ab59d6375 fix-tests.patch
" "
Upstream disables libmagic support by default nowadays. For this reason,
the error messages expected in the negative tests also assumes this.
Change the expected error message for magic=1 builds.
This reverts commit 3c1076b31e2e4e3429a5c3d334d555e549fb72d2.
See: https://github.com/derf/feh/commit/3c1076b31e2e4e3429a5c3d334d555e549fb72d2
--- a/test/feh.t
+++ b/test/feh.t
@@ -47,7 +47,7 @@ if ( $version =~ m{ Compile-time \s switches : \s .* help }ox ) {
}
my $re_warning
- = qr{${feh_name} WARNING: test/fail/... \- No Imlib2 loader for that file format\n};
+ = qr{${feh_name} WARNING: test/fail/... \- Does not look like an image \(magic bytes missing\)\n};
my $re_loadable = qr{test/ok/...};
my $re_unloadable = qr{test/fail/...};
my $re_list_action = qr{test/ok/... 16x16};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment