mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: feh: Update to 3.3.
* gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/image-viewers.scm (feh): Update to 3.3. [source](patches): Remove.
This commit is contained in:
parent
33b59c1a3e
commit
63e8df382f
3 changed files with 2 additions and 56 deletions
|
@ -826,7 +826,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/fasthenry-spSolve.patch \
|
||||
%D%/packages/patches/fasthenry-spFactor.patch \
|
||||
%D%/packages/patches/fbreader-curl-7.62.patch \
|
||||
%D%/packages/patches/feh-fix-tests-for-imlib2-1.6.patch \
|
||||
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
|
||||
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
|
||||
%D%/packages/patches/file-CVE-2018-10360.patch \
|
||||
|
|
|
@ -65,7 +65,7 @@ (define-module (gnu packages image-viewers)
|
|||
(define-public feh
|
||||
(package
|
||||
(name "feh")
|
||||
(version "3.2.1")
|
||||
(version "3.3")
|
||||
(home-page "https://feh.finalrewind.org/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -73,9 +73,7 @@ (define-public feh
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg"))
|
||||
(patches
|
||||
(search-patches "feh-fix-tests-for-imlib2-1.6.patch"))))
|
||||
"04c8cgwzkax481sz7lbzy23mk79bqmjy3qpvr7vxa4c14mc9k5gk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases (delete 'configure))
|
||||
|
|
|
@ -1,51 +0,0 @@
|
|||
commit 8048fb542d0c36f868760ba1590fbe14a3a85df7
|
||||
Author: Pierre Langlois <pierre.langlois@gmx.com>
|
||||
Date: Wed Nov 27 10:42:05 2019 +0000
|
||||
|
||||
Adapt tests for imlib2 1.6
|
||||
|
||||
Reported upstream on https://github.com/derf/feh/issues/497
|
||||
|
||||
diff --git a/test/list/custom b/test/list/custom
|
||||
index dbe2074..40ac557 100644
|
||||
--- a/test/list/custom
|
||||
+++ b/test/list/custom
|
||||
@@ -1,4 +1,4 @@
|
||||
test/ok/gif; 16; 4; list; gif; 256; 953; gif; 1; 16
|
||||
-test/ok/jpg; 16; 4; list; jpg; 256; 354; jpeg; 2; 16
|
||||
+test/ok/jpg; 16; 4; list; jpg; 256; 354; jpg; 2; 16
|
||||
test/ok/png; 16; 4; list; png; 256; 403; png; 3; 16
|
||||
test/ok/pnm; 16; 4; list; pnm; 256; 269; pnm; 4; 16
|
||||
diff --git a/test/list/default b/test/list/default
|
||||
index bc0ef52..e480db3 100644
|
||||
--- a/test/list/default
|
||||
+++ b/test/list/default
|
||||
@@ -1,5 +1,5 @@
|
||||
NUM FORMAT WIDTH HEIGHT PIXELS SIZE ALPHA FILENAME
|
||||
1 gif 16 16 256 953 - test/ok/gif
|
||||
-2 jpeg 16 16 256 354 - test/ok/jpg
|
||||
+2 jpg 16 16 256 354 - test/ok/jpg
|
||||
3 png 16 16 256 403 X test/ok/png
|
||||
4 pnm 16 16 256 269 - test/ok/pnm
|
||||
diff --git a/test/list/format_reverse b/test/list/format_reverse
|
||||
index 9216184..3301f78 100644
|
||||
--- a/test/list/format_reverse
|
||||
+++ b/test/list/format_reverse
|
||||
@@ -1,5 +1,5 @@
|
||||
NUM FORMAT WIDTH HEIGHT PIXELS SIZE ALPHA FILENAME
|
||||
1 pnm 16 16 256 269 - test/ok/pnm
|
||||
2 png 16 16 256 403 X test/ok/png
|
||||
-3 jpeg 16 16 256 354 - test/ok/jpg
|
||||
+3 jpg 16 16 256 354 - test/ok/jpg
|
||||
4 gif 16 16 256 953 - test/ok/gif
|
||||
diff --git a/test/list/size b/test/list/size
|
||||
index cad60b0..7716239 100644
|
||||
--- a/test/list/size
|
||||
+++ b/test/list/size
|
||||
@@ -1,5 +1,5 @@
|
||||
NUM FORMAT WIDTH HEIGHT PIXELS SIZE ALPHA FILENAME
|
||||
1 pnm 16 16 256 269 - test/ok/pnm
|
||||
-2 jpeg 16 16 256 354 - test/ok/jpg
|
||||
+2 jpg 16 16 256 354 - test/ok/jpg
|
||||
3 png 16 16 256 403 X test/ok/png
|
||||
4 gif 16 16 256 953 - test/ok/gif
|
Loading…
Reference in a new issue