From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id CErpCpjdA2b77AAAe85BDQ:P1 (envelope-from ) for ; Wed, 27 Mar 2024 09:49:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id CErpCpjdA2b77AAAe85BDQ (envelope-from ) for ; Wed, 27 Mar 2024 09:49:28 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=go6Jv34J; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711529368; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=2nldI2FKJKHrq9BP0UfKqmZCUdELW4Q7EA2EbmtvBk8=; b=QF4yymWSH4G+nPytlJ5zel/C56DUCEr9KwT2UbjyJhwmrIdSX1HFQsyDPlM5sufEpVQgoc MroE5uurOA7UsK7IVQVK0seJiSHPRdZf3fGGDq+N+u+MqKtdQiw8/85wZYwHLLIpwJGxc6 8aCYe4oCIYM1tcvQRlHSS1OZxqfbSGfEG8fY5WB14ZwwlHYPc8uJj6PfeQAsCpCXejPOoC giykRv2hB6oarEMgNmkzfJZcP1ZRmVNXjCzOXL12Spp2bOvkvSicQYe1hIoyBGIJKvXlhC +1n6j2Pur+PRFnpbzTjz/VP27rxM6AtK6vsrjFFdo1DhgymkocstTtjxRhckzA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=go6Jv34J; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711529368; a=rsa-sha256; cv=none; b=cU1ndfpoiSQ5qqmty61EemAB03y8DVlG/rDzDTcc3NgqtRRqb4yKerrkZQ90cZazlKuhGM ms2rqnU5EE/li067jMtFalDq0qh5OMW6wQ1hUgBwuQZobugcewJovOhwmm28QFxyTyTUsl R6KmJcsfYW/7nOP1HqhZVBMab0wlLhLhAdKsDl9cWCvFcRCUUT7SK4XIFcK8QQ3LtfpZdW Php2YiPGdbNPWpQIarQapH7tnmvqj7XEAW3vaS4Dnvczx+erD7vSfvgSQG6Qw3FmbH4XJ8 /fAkLg0JEip2deoN1hcGO6EcJoo8vMIyW2jPFTlGZFj7692S7G8wEQDlaMRyvw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D4BB06C50F for ; Wed, 27 Mar 2024 09:49:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpOy0-0007tv-HA; Wed, 27 Mar 2024 04:49:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpOxy-0007tZ-OQ for guix-patches@gnu.org; Wed, 27 Mar 2024 04:49:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpOxy-0003pC-2y for guix-patches@gnu.org; Wed, 27 Mar 2024 04:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpOxy-00057u-1N for guix-patches@gnu.org; Wed, 27 Mar 2024 04:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69495] [PATCH 0/2] gnu: cairo: Update to 1.18.0. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 08:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias Cc: 69495@debbugs.gnu.org, Raghav Gururajan , Vivien Kraus , Liliana Marie Prikler , Maxim Cournoyer Received: via spool by 69495-submit@debbugs.gnu.org id=B69495.171152929119158 (code B ref 69495); Wed, 27 Mar 2024 08:49:01 +0000 Received: (at 69495) by debbugs.gnu.org; 27 Mar 2024 08:48:11 +0000 Received: from localhost ([127.0.0.1]:35740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpOx8-0004yt-Bq for submit@debbugs.gnu.org; Wed, 27 Mar 2024 04:48:11 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:48239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpOx5-0004xJ-2i for 69495@debbugs.gnu.org; Wed, 27 Mar 2024 04:48:09 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4149532da36so1592085e9.0 for <69495@debbugs.gnu.org>; Wed, 27 Mar 2024 01:48:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711529280; x=1712134080; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=2nldI2FKJKHrq9BP0UfKqmZCUdELW4Q7EA2EbmtvBk8=; b=go6Jv34J6y9mbpGrkF3YMUgjsNJiVX5+HOdqkBclNTcMPPn0AmKxvmbiO3DOif/5qF jp8FfxR8gV0LSipYI76iV5NCssUln4jF6rt3uEc5v6E3zA+qGFvsGBxoIJCDiizMO47b 4xeBsVQemGrdmLOBBMQUw5otuW7ISLhop9CD+U1iPsXopvz6gvOhhhficEfl+XdlkNWz gOwvBb85MJ3TMuvgrnQfzpDs89g9iYUqcKZ3deXRR64Mch7zkoEmG/SZh9XwsmdVvzwW CLZEYB29xqHsd7hjKcvN8ktptxQGdE3lrczHIX+3MBwNheGSGo2edhM9hmfQueb/FUqI yiGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711529280; x=1712134080; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2nldI2FKJKHrq9BP0UfKqmZCUdELW4Q7EA2EbmtvBk8=; b=VSbl4AjpRLTXviNpLbFMGnYpscteTwvDvwDsZjSoQRC80gvClR6ddRZ50uJyJUaEAw l3lqcsKwncKtyCfR3i3NbDZGG5u+MK6y+KLh+Iq12HvC3ZB4yd5iCu5TwRUPXxRVaoWo 2OH+C2TbCzygxiyoNHLDsGsXWppBRTBeWjICNipNhbDsoEVhwGmgTbf4xpWV2aTFzkPh HCIZMH+kNZjQcEh7k6LZ4xuXCwfQOBeYjlSoW3OLjXMNfafZtefrwkx6AXLQtBOMm7eF EQzWVcMeKo2DgfrwL4oqWMQTT7pJS/yCTmQmxxJr8ZtO0JaxdP65sHl+uzFaWfJqZePx hqQw== X-Gm-Message-State: AOJu0Yz6C25YZhnPEoO2V1hRZnsGkFoP+4JOKH3INLwzem3EY1N64N/N vs2a7gKAVXD4PeFtXaydYqucU4gUQtIk0xlfESArX3k/9ClvFBJ5 X-Google-Smtp-Source: AGHT+IHihM84SmHrSAzLIkKorkhYVXNjWKB3tFP62ew1zZ+e5MUnajrpkPmDj9Cf1S068mcWOEL1EQ== X-Received: by 2002:a05:600c:4eca:b0:414:860:bdc9 with SMTP id g10-20020a05600c4eca00b004140860bdc9mr2784672wmq.33.1711529280108; Wed, 27 Mar 2024 01:48:00 -0700 (PDT) Received: from localhost ([141.226.12.177]) by smtp.gmail.com with ESMTPSA id m31-20020a05600c3b1f00b004146bcdde06sm1471732wms.6.2024.03.27.01.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 01:47:59 -0700 (PDT) Date: Wed, 27 Mar 2024 10:47:57 +0200 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , John Kehayias , 69495@debbugs.gnu.org, Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan , Vivien Kraus References: <877chontxw.fsf@protonmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="NIc6f2EO+F75Tnqj" Content-Disposition: inline In-Reply-To: <877chontxw.fsf@protonmail.com> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: D4BB06C50F X-Spam-Score: -5.45 X-Migadu-Spam-Score: -5.45 X-Migadu-Scanner: mx10.migadu.com X-TUID: UHhGQpuEO5jR --NIc6f2EO+F75Tnqj Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Mar 27, 2024 at 05:08:02AM +0000, John Kehayias wrote: > Hello, >=20 > Arg, I don't know if this ever was actually sent to the gnome-team! Also > adding Efraim due to a librsvg issue (below). >=20 > Apologies if it didn't go through originally (or if you are getting it > again). >=20 > On Sat, Mar 02, 2024 at 01:50 AM, John Kehayias wrote: >=20 > > Hi gnome-team and guix, > > > > I'm cc'ing the gnome-team as this would normally fall to them, but with= their > > pending merge and the builds upcoming on mesa-updates (libdrm, which ca= iro > > depends on), I think this will go on mesa-updates. The patch is based on > > master, not gnome-team. Still, thought it would be good to have a revie= w as > > this was non-trivial. Thanks to lilyp on #guix for tips! > > > > Please see the patches to update cairo to the new release (after many y= ears!) > > of 1.18.0. An update to python-pycairo was needed first. The end result= is > > that our cairo package is quite a bit simpler as the defaults include t= he tee > > backend that we had enabled before. I removed all the old configure fla= gs and > > propagated-inputs which were commented out and now obsolete. > > > > The docs require gtk-doc which depends on cairo. To break the cycle cai= ro is > > hidden (but exported) and built without docs, with the public cairo-wit= h-docs > > including them. I followed what was done for glib with a similar issue. > > > > I did not try too much enable tests, which may have been revamped? The = quick > > look I took in the source docs suggested that it is very system depende= nt > > (reference images) though does run on their GitLab CI. When enabling > > test/ps2png.p/ps2png.c.o fails to build as it can't find cairo.h. Perha= ps it > > needs to build tests in a phase after cairo has built and set in a way = to find > > this just build version? > > > > Anyway, this built locally for me on x86_64. I built up to icecat, whic= h needs > > the tee backend we previously manually enabled, and it built and ran > > successfully. > > > > Let me know of any issues or changes wanted or if someone wants to take= this > > on a different branch. I think it makes sense on mesa-updates due to the > > libdrm update I will take there. > > > > Thanks! > > John > > > > > > John Kehayias (2): > > gnu: python-pycairo: Update to 1.26.0. > > gnu: cairo: Update to 1.18.0. > > > > gnu/local.mk | 2 - > > gnu/packages/gtk.scm | 85 ++++++++++--------- > > .../patches/cairo-CVE-2018-19876.patch | 37 -------- > > .../patches/cairo-CVE-2020-35492.patch | 49 ----------- > > 4 files changed, 47 insertions(+), 126 deletions(-) > > delete mode 100644 gnu/packages/patches/cairo-CVE-2018-19876.patch > > delete mode 100644 gnu/packages/patches/cairo-CVE-2020-35492.patch > > > > > > base-commit: b386c11e7804e0b577411d930b60f1e0a4a0382c > > prerequisite-patch-id: 2889be19c4a046760f2f608cefff987b11b65a31 > > -- > > 2.41.0 >=20 > I've applied this series locally and haven't run into issues in building > (and trying a few random packages). Happy to take feedback before I push > this to mesa-updates, and even then will be some time before the branch > will be built to be merged to master. Other updates include mesa, sdl2, > and vulkan. >=20 > I did run into two test failures for the older librsvg-2.40. Since that > is an old version, I guess we might expect issues as dependencies are > updated. I disabled the two failing tests with the attached patch. One > referred to a bug fix that had something to do with calling cairo, not > sure about the other. >=20 > Apologies if the CCing with teams didn't go through properly! And thanks > to Liliana for initial help on #guix with sorting out what was needed > for the circular dependency between cairo and gtk-doc. Currently x86_64, aarch64 and riscv64 are the only architectures using the newer librsvg. Can you test the older librsvg-2.40 with the newer cairo on x86_64 to see if the tests also fail there? I'm curious if it's a 32-bit problem or if its just that old. Overall I have no issues with skipping those two tests. > From 0f3e6653a65a5a7031f245260b6641aedc8f43f2 Mon Sep 17 00:00:00 2001 > Message-ID: <0f3e6653a65a5a7031f245260b6641aedc8f43f2.1711514951.git.john= =2Ekehayias@protonmail.com> > From: John Kehayias > Date: Wed, 27 Mar 2024 00:45:59 -0400 > Subject: [PATCH] gnu: librsvg-2.40: Skip tests that fail with cairo 1.18.= 0. >=20 > * gnu/packages/gnome.scm (librsvg-2.40)[arguments]: Skip two tests which = fail > after cairo was updated to version 1.18.0. >=20 > Change-Id: If3867a9fdee6481da819954d77341f411e85e78b > --- > gnu/packages/gnome.scm | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) >=20 > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 06256066bc..55b60b7b12 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -3717,12 +3717,15 @@ (define-public librsvg-2.40 > "svg1.1/masking-mask-01-b.svg" > ;; This test fails on aarch64: > "bugs/777834-empty-text-children.svg" > - > ;; These two tests fail due to slightly diffe= rent > ;; text rendering (different kerning or simil= ar), > ;; nothing alarming. > "bugs/340047.svg" > - "bugs/749415.svg")))))))) > + "bugs/749415.svg" > + ;; These two tests fail with the update to ca= iro > + ;; version 1.18.0. > + "bugs/587721-text-transform.svg" > + "svg1.1/masking-path-03-b.svg")))))))) > (native-inputs > (list pkg-config > `(,glib "bin") ; glib-mkenums, etc. >=20 > base-commit: c3f15443bc6d457758aad1326dcc6dcad9cf8d6e > prerequisite-patch-id: fa1f23e1340a3eeb9f347ed719b9b0fa0558fb3f > prerequisite-patch-id: a1eb5f0955b9988d3bfe3be8403c75999a1cae5f > prerequisite-patch-id: 2889be19c4a046760f2f608cefff987b11b65a31 > prerequisite-patch-id: ea93b6662275aeec1e014a9bc9fe7a96f26ac600 > prerequisite-patch-id: 177440a12b7c797d22f8bb1253db133d2fbad348 > prerequisite-patch-id: 3a5189c1e8e4612ceb6f1b70cc3c83e39a977eb9 > --=20 > 2.41.0 >=20 --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --NIc6f2EO+F75Tnqj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmYD3T0ACgkQQarn3Mo9 g1GPwA/9Fk6sBUTetOE06V8IjsUXSNJ8UgtwmEu11vBg0gcDNrJpYGbwwGCq+wtI bkURk1cz3+bbLoFD2VsMGqBIxPi05UhZK+Ilt3YXx9ekxkrqPkUSibntDNVlvVTm xDBULSziiop87fmlR6b/5x3ruUlcokXWn1jvfkg2KByq41omfQ9fbmkmVrsN30Qo 1RGbyeyO+/L/mfaauh2KKlXu5aXrxGdhhi5calaLcY+iiHvbo5oTohYehlkkOtpA AgeqfEsBR402AdGo1MKh87DFWOPqm40uDA23+UoHuMtAo38lhHWlKCPVopSyj9Ux H3WlgCHQv5V34Bftmiy76lbtOsWwO3oz1gUDFaUXio4eyVDuhVu8RWAfLDuV7qur 3pxyqYuK5DgF9vG4NVyk/kogpgzPRcDufh5QrMx3A2eP8NzUn6sp82JQGTcMUEsW kaB9Lu4DHJ9py0e+N0Pstih/5Jy7mG+OYrl55Tmi8oaQx2E06w4c6kP9pJ9sIKMB jWIFfgjdhyAY/o7gopIsl/VdQkPTSwJ8NX+OV3fvh9tOzyOFpRVEXtV/Q719U3ZA WedauSo8sVOZdl63YcJj8tjD07bWZYECmjGwv/+idAjqfHTUODaMLxiJtSKCIeQt I4sFTSC6t81TlaWivDSiO3j1lDiYbHBMIYDZzb1cot8MBOJCEaM= =WUsc -----END PGP SIGNATURE----- --NIc6f2EO+F75Tnqj--