From unknown Mon Jun 16 23:46:37 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#38400 <38400@debbugs.gnu.org> To: bug#38400 <38400@debbugs.gnu.org> Subject: Status: [PATCH] gnu: feh: Adapt tests for imlib2 1.6. Reply-To: bug#38400 <38400@debbugs.gnu.org> Date: Tue, 17 Jun 2025 06:46:37 +0000 retitle 38400 [PATCH] gnu: feh: Adapt tests for imlib2 1.6. reassign 38400 guix-patches submitter 38400 Pierre Langlois severity 38400 normal tag 38400 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 27 05:50:07 2019 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: ** X-Spam-Status: No, score=2.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, SPOOFED_FREEMAIL,URIBL_BLOCKED autolearn=disabled version=3.3.2 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: feh: Adapt tests for imlib2 1.6. Date: Wed, 27 Nov 2019 10:49:48 +0000 Message-ID: <87zhgh4mr7.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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-Received-From: 212.227.15.19 X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= 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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 27 18:36:46 2019 Received: (at 38400-done) by debbugs.gnu.org; 27 Nov 2019 23:36:46 +0000 Received: from localhost ([127.0.0.1]:56385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ia6rW-0004FW-GD for submit@debbugs.gnu.org; Wed, 27 Nov 2019 18:36:46 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:47531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ia6rU-0004FH-WE for 38400-done@debbugs.gnu.org; Wed, 27 Nov 2019 18:36:45 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 63A4B226B2; Wed, 27 Nov 2019 18:36:39 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 27 Nov 2019 18:36:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm1; bh=SArAIFzEeanJg8zfiASMmV8gwJ y495TGTyDWv1QvpsU=; b=rvfA8gEUqwl7qLG1QcGobU2vNRS8gdmKNxtnd4WemK WXcAFUEu6JstyHwoXTR4ouEvVEKxve1TVk8bB1T3SmI3jufHp6396p7urZ82TCmp jw7q2HlXcfHVHJpk7TlPDxvbN4nNEITd9YjXVs+dX4nW9nBS/ZnOF5N5EDn/tQAi YsMLn5Hq2uItJhkjTPPF2yYpdVgKi+s+NHt5Tnm6WKfvbuJgJUZGepvaGLxQ0eQB j74F0OvhfAKwEeuORW1HcUpWh2hpo1h/Hqbu3+tPP8aryMtNmbdlk0r45wMapQs/ aL2F01ZTT6vbrnnIwksn0Zwob+gi7LlJBJu9a7H6RwFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=SArAIF zEeanJg8zfiASMmV8gwJy495TGTyDWv1QvpsU=; b=h79pcKyId7E4ClF4onjLH5 x5wzPRfE5b2D+Zv6T8RaGAIaUWXN2ocY+RrmPNVxVVGBKqYdHa32slm0iJSsTqvt BUpAVpE5B9r/wTMxVY7Woj4a13/wCNg3M4LCEEwkCZ/UdeCgFOscoi2Wnf6I0tlF HYDSK/4WD6Z2PZiQg9qPlYRLW0rICfhk1Sk/2dJvZZ9IExMWVOSdCIBWDBqfTSNy dOlMilbid4goFO2DttJVzNcADwBkvt4Faip/bbdBHjdJ+TSnVPyGiomesaI1m8CC lE+7LNRbqXncmsWn4ENiuiYBhLd4u+zKiOP0dx1hB8uCG0WL35yFZq1mPdqL5IKA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrudeiiedgudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucffohhmrg hinhepghhithhhuhgsrdgtohhmnecukfhppeekgedrhedvrddvvdeirddutddvnecurfgr rhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuve hluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (84-52-226.102.3p.ntebredband.no [84.52.226.102]) by mail.messagingengine.com (Postfix) with ESMTPA id DC0423060095; Wed, 27 Nov 2019 18:36:38 -0500 (EST) From: Marius Bakke To: Pierre Langlois , 38400-done@debbugs.gnu.org Subject: Re: [bug#38400] [PATCH] gnu: feh: Adapt tests for imlib2 1.6. In-Reply-To: <87zhgh4mr7.fsf@gmx.com> References: <87zhgh4mr7.fsf@gmx.com> User-Agent: Notmuch/0.29.2 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Thu, 28 Nov 2019 00:36:37 +0100 Message-ID: <87imn47uyi.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 38400-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Pierre Langlois writes: > 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! Pushed in 9943d238e9f07dccae973b641eb7738637ce95fb. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl3fCIUACgkQoqBt8qM6 VPqAkggAsqoGllKTyRm3paKdYUUo2VpyKnXzJZd32wzdDR8TL1z/ElcrLcFLs5/N t6g/ii12tD7nqyEjK/0nmWOiaCz4ebx4tLZ795k7EFh6MYjkn5VLSvBbVmdN0QBc cf8mTYGBmGsLsSrmlrWo/xXzHuK40MmLGP4IpgYXN0t+M62ISWlpdLg9Yv3ldmY0 Awt3xhg0TtFl1hYJSNP5eODUPhuJSg8uaDFiFdnEktxG4eEmbjbGu9ovpJir28LR +bNA/YfhjqLGLysFrUAOx140mVGg0BRMJv+ES+E9i5FZ/PGTNgBpHNqsd8OFos6Y KXgts+6ggoiWMQbrefMoK7o17wrf6A== =Fx75 -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jun 16 23:46:37 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 26 Dec 2019 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator