From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 2IcVF1hdBGaErAAAe85BDQ:P1 (envelope-from ) for ; Wed, 27 Mar 2024 18:54:32 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2IcVF1hdBGaErAAAe85BDQ (envelope-from ) for ; Wed, 27 Mar 2024 18:54:32 +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=I2zcksLv; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711562072; 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: content-transfer-encoding:content-transfer-encoding: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=ox+C7u96TqWEmrSJ0KPEAOdl9EB5eQK+5mUxgtDlfu0=; b=QRq22R089mncqcWNM8qX/6Bmp3FLtN8+JHItY8KXbtzdVn3WEZbPwdNkbmyUAdQuq1hggo F+fAUqNQbzM0L1mYliqOPCBfYDa7LQnCMUx4vasMUCUg3e+Mkc+qzWLulYrgErBF/WZt2G boxBtApc91bAFDRbsfi6ZfyJSXixtQ02SssNYViDHI7oYIeVdgdjYYsBYPIp1/HgBe1XKX BB7RUlQE45XD8pw3jn+liF6wfFMmYqnBlkYV52p5w0PBVKQ3G0CoqxnCq2vjboFPfo/lXb KNza7Y+ephGt2qc2ZI4byVnLC2N4/5vaAAWUcAauL9szEjK32OaQXnGRlq0rmg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=I2zcksLv; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711562072; a=rsa-sha256; cv=none; b=hzQLNfl2VFqZd8nOZ17RThCQ/kd21aEKYApW1e36QcK8HFfHx4xRGqjc9geHuwNc/9BXWK YIvZslRKjc97mJdftfsNmcStKiPbaSrSwOVVcN9mx+vMfuYKwmEw4yJihE5uy6ffhtnMc1 1TEDMhIUZxBLERdKqwsx8MO+dAy9xz03yELczWFI1e1LCKEHNPTuZ3kPTwbGM76hRniqRU AfZPRj880mQy2FA4jGuUbQwFD4/5pTYh1puurjD4+5KbbNBsaaxsoaWuajC17p37mrbgch zCijuTmdp6L2ECcDxY5xaVHbfbD4hHuGKpYXHMtWbp7FIl+GWM85ZH6cyKlSnw== 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 2657047DD4 for ; Wed, 27 Mar 2024 18:54:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpXTR-0002Dc-88; Wed, 27 Mar 2024 13:54:05 -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 1rpXTQ-0002Co-8N for guix-patches@gnu.org; Wed, 27 Mar 2024 13:54:04 -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 1rpXTP-0007Ew-TC for guix-patches@gnu.org; Wed, 27 Mar 2024 13:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpXTQ-0006Dd-0V for guix-patches@gnu.org; Wed, 27 Mar 2024 13:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69495] [PATCH 0/2] gnu: cairo: Update to 1.18.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:54:03 +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 , 69495@debbugs.gnu.org Cc: Raghav Gururajan , Vivien Kraus , Efraim Flashner , Maxim Cournoyer Received: via spool by 69495-submit@debbugs.gnu.org id=B69495.171156199223649 (code B ref 69495); Wed, 27 Mar 2024 17:54:03 +0000 Received: (at 69495) by debbugs.gnu.org; 27 Mar 2024 17:53:12 +0000 Received: from localhost ([127.0.0.1]:38349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpXSa-00069M-5T for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:53:12 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]:61466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpXSU-000688-K1 for 69495@debbugs.gnu.org; Wed, 27 Mar 2024 13:53:10 -0400 Received: by mail-lf1-x144.google.com with SMTP id 2adb3069b0e04-515a97846b5so4413246e87.2 for <69495@debbugs.gnu.org>; Wed, 27 Mar 2024 10:53:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711561980; x=1712166780; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=ox+C7u96TqWEmrSJ0KPEAOdl9EB5eQK+5mUxgtDlfu0=; b=I2zcksLvM/RFtHIGZR7u5erUKQzHKqdhJvTBon2xMs5GdA35u/HR0vhOlHFLsDxhx9 8c2bTH/+srwp77b6JVTiT/k/g7hPXAdCk5XDOn+dwTeFZCQvw7qo2a2Niqvqjq1j2bfK nQmGoNGDui1YUseJYEf8hezHZrN9pB7ysEhVogMrLLWYfQMnMfcRfUftcdvOgBQ21qqV xVZrM14GXoWKAikU3fFqPxNUX2BGnpEiC48/aeoxjBGdxbURHse0O45o80+i/WHlnFOz fIQV+ezlqGI83lEQYQPbskxpQz269CpJDPIJjx6LP6ByHDJUv5Gb3liB27CZrHorPNVR QAZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711561980; x=1712166780; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ox+C7u96TqWEmrSJ0KPEAOdl9EB5eQK+5mUxgtDlfu0=; b=GEXxChDo5RTRxNhpiO3787sDt+tI5+CR0rIRnWH9bj+Tpbu74qfiGWfGIYTJ3v49ti ZhpTczMxfRXOReRdavZTwjfizU2f7XuRuwIVedSm9MXbWAMpKonnGjtMJ08p+SaHDlvy Z783kPyR5N58uH5g289qvomri2FYYXwcYrQgJTKqbbI8nXO777K+EMCgv+1HCX1RRzRW PeCwPwJz8RR4oPcwrCzlCruZBMFOTHvmrVdLHI8mM0DEAw2hdTDmUmIAmJji2auCZoNC ZvreRlBYWh8a8XSkCjBLGAk1PwUSEKcJkLdPa+gN8oeu7ZCs/lycnGVmKCi60OOSWYqv tNtw== X-Forwarded-Encrypted: i=1; AJvYcCU8uG4u7AWiUtg99ktxRyLgFPhdj94yXqnJVGfjwTpzvDryKPmZJxfgyu6qaquWgIkpm1MZOj5dyDHhpxSkj5WICa8C+Gs= X-Gm-Message-State: AOJu0YyGRe5cq37mQ3DJaYsaL3xft1sq6SnBMNp2Lqahpo3AqNwG5Zbq uKc+6L81wfCi/vIAvTMHUb+kxkoBQK4qSlvj2zCd5C4rAY8WjJGL X-Google-Smtp-Source: AGHT+IFurO8KWddEy52T+3Mu5vDTEI2uLU/td3OWXtGgc67qksNanI8wy51f19svDwk5kwKjSX3y4Q== X-Received: by 2002:a19:3849:0:b0:513:4105:6b34 with SMTP id d9-20020a193849000000b0051341056b34mr116227lfj.64.1711561979808; Wed, 27 Mar 2024 10:52:59 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id wp2-20020a170907060200b00a4a396ba54asm3481529ejb.93.2024.03.27.10.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 10:52:59 -0700 (PDT) Message-ID: <80e01d3d4d6a8dab981fbe2d9792cdc87828b496.camel@gmail.com> From: Liliana Marie Prikler Date: Wed, 27 Mar 2024 18:52:58 +0100 In-Reply-To: <877chontxw.fsf@protonmail.com> References: <877chontxw.fsf@protonmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 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-Spam-Score: 4.15 X-Migadu-Queue-Id: 2657047DD4 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: 4.15 X-TUID: xV25ISQd0imL Am Mittwoch, dem 27.03.2024 um 05:08 +0000 schrieb John Kehayias: > 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, > >=20 > > 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 cairo > > 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 > > review as > > this was non-trivial. Thanks to lilyp on #guix for tips! > >=20 > > Please see the patches to update cairo to the new release (after > > many years!) > > 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 the tee > > backend that we had enabled before. I removed all the old configure > > flags and > > propagated-inputs which were commented out and now obsolete. > >=20 > > The docs require gtk-doc which depends on cairo. To break the cycle > > cairo is > > hidden (but exported) and built without docs, with the public > > cairo-with-docs > > including them. I followed what was done for glib with a similar > > issue. > >=20 > > 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 > > dependent > > (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. > > Perhaps it > > needs to build tests in a phase after cairo has built and set in a > > way to find > > this just build version? > >=20 > > Anyway, this built locally for me on x86_64. I built up to icecat, > > which needs > > the tee backend we previously manually enabled, and it built and > > ran > > successfully. > >=20 > > 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. > >=20 > > Thanks! > > John > >=20 > >=20 > > John Kehayias (2): > > =C2=A0 gnu: python-pycairo: Update to 1.26.0. > > =C2=A0 gnu: cairo: Update to 1.18.0. > >=20 > > =C2=A0gnu/local.mk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |= =C2=A0 2 - > > =C2=A0gnu/packages/gtk.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 85 ++++++++++----- > > ---- > > =C2=A0.../patches/cairo-CVE-2018-19876.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 37 -------- > > =C2=A0.../patches/cairo-CVE-2020-35492.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 49 ----------- > > =C2=A04 files changed, 47 insertions(+), 126 deletions(-) > > =C2=A0delete mode 100644 gnu/packages/patches/cairo-CVE-2018-19876.patc= h > > =C2=A0delete mode 100644 gnu/packages/patches/cairo-CVE-2020-35492.patc= h > >=20 > >=20 > > 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. I think mesa-updates would be the right place =E2=80=93 gnome-team is quite close to merge, so we can't do a world rebuild there right now. Cheers