From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37495) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZuuY-0005oY-Q9 for guix-patches@gnu.org; Wed, 27 Nov 2019 05:51:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZuuU-0003JG-U2 for guix-patches@gnu.org; Wed, 27 Nov 2019 05:51:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47513) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZuuU-0003J2-PD for guix-patches@gnu.org; Wed, 27 Nov 2019 05:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iZuuU-0005Dc-Me for guix-patches@gnu.org; Wed, 27 Nov 2019 05:51:02 -0500 Subject: [bug#38400] [PATCH] gnu: feh: Adapt tests for imlib2 1.6. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:37366) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZutS-0004hD-Jl for guix-patches@gnu.org; Wed, 27 Nov 2019 05:50:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZutP-0002nX-55 for guix-patches@gnu.org; Wed, 27 Nov 2019 05:49:58 -0500 Received: from mout.gmx.net ([212.227.15.19]:55457) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZutO-0002lV-LS for guix-patches@gnu.org; Wed, 27 Nov 2019 05:49:55 -0500 Received: from labiere ([80.44.68.57]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1M42jK-1iZutJ2jM8-0006m3 for ; Wed, 27 Nov 2019 11:49:49 +0100 From: Pierre Langlois Date: Wed, 27 Nov 2019 10:49:48 +0000 Message-ID: <87zhgh4mr7.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38400@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello Guix! Since we updated imlib2 to version 1.6 the feh test suite was failing, however it looks harmless. The output expectation just needs tweaking a little. I've reported it upstream https://github.com/derf/feh/issues/497 but in the meantime, here's a patch for downstream! I don't think such a patch is suitable upstream as it would mean the tests would fail on previous versions of imlib2. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-feh-Adapt-tests-for-imlib2-1.6.patch Content-Transfer-Encoding: quoted-printable >From 1355d070a0d6dbe598e7feb4457da6ea988921e8 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 27 Nov 2019 10:40:56 +0000 Subject: [PATCH] gnu: feh: Adapt tests for imlib2 1.6. * gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch: New file. * gnu/packages/image-viewers.scm (feh)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/image-viewers.scm | 5 +- .../feh-fix-tests-for-imlib2-1.6.patch | 51 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0129e42944..082465a24a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -826,6 +826,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/fbreader-curl-7.62.patch \ %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch \ %D%/packages/patches/fcgi-2.4.0-poll.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 \ diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index d237a27c4a..c0300f5087 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -11,6 +11,7 @@ ;;; Copyright =C2=A9 2018, 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2019 Nicolas Goaziou ;;; Copyright =C2=A9 2019 Guy Fleury Iteriteka +;;; Copyright =C2=A9 2019 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,7 +73,9 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg")))) + "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg")) + (patches + (search-patches "feh-fix-tests-for-imlib2-1.6.patch")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) diff --git a/gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch b/gnu/= packages/patches/feh-fix-tests-for-imlib2-1.6.patch new file mode 100644 index 0000000000..a91906dbe9 --- /dev/null +++ b/gnu/packages/patches/feh-fix-tests-for-imlib2-1.6.patch @@ -0,0 +1,51 @@ +commit 8048fb542d0c36f868760ba1590fbe14a3a85df7 +Author: Pierre Langlois +Date: Wed Nov 27 10:42:05 2019 +0000 + + Adapt tests for imlib2 1.6 +=20=20=20=20 + 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 --=20 2.24.0 --=-=-= Content-Type: text/plain Thanks, Pierre --=-=-=--