From patchwork Wed Nov 27 10:49:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 16255 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C6F2D17773; Wed, 27 Nov 2019 10:52:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 430781774E for ; Wed, 27 Nov 2019 10:52:07 +0000 (GMT) Received: from localhost ([::1]:36892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZuvW-0006SB-73 for patchwork@mira.cbaines.net; Wed, 27 Nov 2019 05:52:06 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#38400] [PATCH] gnu: feh: Adapt tests for imlib2 1.6. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Nov 2019 10:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38400 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38400@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157485180719959 (code B ref -1); Wed, 27 Nov 2019 10:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Nov 2019 10:50:07 +0000 Received: from localhost ([127.0.0.1]:53483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZutY-0005Bp-QI for submit@debbugs.gnu.org; Wed, 27 Nov 2019 05:50:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:34555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZutV-0005BU-PU for submit@debbugs.gnu.org; Wed, 27 Nov 2019 05:50:04 -0500 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1574851790; bh=fgNPqA6CWEtcaMuvL4GFTBX5Wvuspckhg/d5eAvowRU=; h=X-UI-Sender-Class:From:To:Subject:Date; b=J8vm5iYVDGlEoW7PZ3WWSg8Nv5OU6z/l4BIn67/6B1Ijr+4X9Pv2a7+266rtpj8q8 Z6y4V76e+vUHd0dh0BLXaHJupXe1X2ph20oeRAKLqwfairjk7u8Dzj0O3pWEeohLOQ eTVAfUGRm+OBy2/kGnUknYbElnN1AC+t/EBwz/3Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c 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 User-agent: mu4e 1.2.0; emacs 26.3 From: Pierre Langlois Date: Wed, 27 Nov 2019 10:49:48 +0000 Message-ID: <87zhgh4mr7.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Qf7vpK698iS/YOozDiSFmp/wnCPxyGCZaIU9eE69buux9PIz2Nj dJypVn8JwdWOLTfK/zVK37tw9xmsddU7ns5ouUeEo1q9D21glffkJ9IFMGajvaRogT6Gwg+ Lry1yN2FI1UT84FqxHFkVq169roFj0HSRr4JRRHIcNhDzDM9SePBilyaRfSQaIHgd8cPTex eP3kNA/GaaDTii4D0npAg== X-UI-Out-Filterresults: notjunk:1;V03:K0:AlLIyc5PQv4=:1i2/Lxnnu+qtvi1K0WvwMl slCQwOUKCSZFyd8XAyF+iqu5n7yvxaodAVdnQkRcg5kjOvS00rFYT6/o+lkEsE1CPHvNph1Tf s3VLwCQZHD3FLSIMzjXlS15YJukzP9rIUogeEDwJRbEQMFsKW37nxL2Ct/BgGnqVnTIgqEQre tiaKt7KulxGsrYjcDgsxcLFFQ6vhhuZVe/5YHyNbCWaqx092bqccq0yUbn2x724nN6CkOjPoB AJq4QaT0A8ED5MIjcywK/dCq9lfO7v362gKEfStsGs3ktlGfkTUuHTyeWGjImYYjAgKIVRZY0 s8HQGyZ2fsgeCn6jUheM8eK2ZW2rMpSm3QfICV1VJqHEBIn5hYKLClGub2kwqaOglOuShL0F2 cdSrrkbmuHKudsrPL8t1J5km2Ogaalxq78Xj9riMXIJZDwp7gwcWSrtif0Pq/teNzs/JcYwWH 2D9KsagT+tuBAhikz+0P/oXOdr/l5yrRbbZsakMOVoUzqhssxhAZr/b8OcXYr3RVZ+i1BE2St heEE5SpnwC+Ra9X1ikJXJXUsuRWOaqa9zWj3nA+HzaV3EAY2WKmA0NvwmgPOfzlzQmRD3Z7hD aIRPYgwOBd1yzUZqqL3uIiu9k7A6vt6EhYe8VIhn2QzjmhpGfHyVqID1PEQhamR1Wm0W4sbVD VLwzn7Uj+ori4z7YIZ+hd+nJsa0A3jQYyXXA1KTcluq+uizgmTj9Ndd7yPKVPo8aWh/ta8oze 2iHYyjtSr3x3b0DCI2dALYgvt9C3rIGmyGURFRKQ47PPM2vbk2k3j4TjbzGFm09bKqtMy9Z6w X5+wLdFid5l6t1EqEkGeb6XrMfjt3i9Y4kTT3o7l6BFHQ3JBa0x/nD0CIFaAsm7M9yyt6ohKC IMfCyE2fLfV5UJDTQSFn99t6+4YbDlJsCkjvHt4+S+sssOda26HbjTVXLNYhKqqrhdj/tyXRH u58tdYRReCsboiD1Mio9kCIt74wj69HMv6hl4ThdGBve3Vw6q2Ujv74sVf6UkC503wLU/6ueR bfQ8V4QpgpTzrt8SPd0IQXjRh1ndcUcB9xxA0uJz+1VsgAl9WZCq4ZXV2DvWX98t0FhXk7EBJ 2De0PKIJaGT420HatYb25El1W2K4mj7XUXaaN9TLAjV1ZOuKxoYrsoFU/LtPqU98xVODFQx95 vfq6IVMaUBvGuArP/MD46m6jm4t6MjulGnQ57FKZgVCdU5BYVlV5GXAU8q+5Ln21I6e9wwgQf f06+C5GGWJoRw4ljPr9kBFX2gMyOJ7SKCvPXa1c5eSQZfkVDrWnqLePyf+bs= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. Thanks, Pierre 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 = \ %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 © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Guy Fleury Iteriteka +;;; Copyright © 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 + + 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 -- 2.24.0