From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id oIiDDdykIGZSRwEAe85BDQ:P1 (envelope-from ) for ; Thu, 18 Apr 2024 06:43:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id oIiDDdykIGZSRwEAe85BDQ (envelope-from ) for ; Thu, 18 Apr 2024 06:43:08 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b="G+yeUV/Z"; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713415388; h=from:from:sender:sender:reply-to: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-to: 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=Mc+o4mBNXnPUC2OMP7D33ssUFe2Zt1jgTlYGYbUbVqU=; b=AtWvz9eAqXzINglvGyJToXr/I5Gn9DWaQ3Zc1NSmDPLvAadyQKHWmLngXOT/RiqVQFVKO6 u2U8iGg+39/TGjt0YUY+2rcDIpcsoXHpbrosd2BAt+9i0LjR+y15w1ZHAltj6pZkNuM76v UhZOv+auNMsNKgzEUro3x3GKPaGWb85L1R3J64JsZTlPZ6wSWsLTSEfVCHuofSyL5xx37D 2D2u3Uuk4LwqmEVlTSU201IWSd2RH+blzoB2K8qK9h6uo6bxqbL3zvMq47a+E5qapqK2Hk w+Ks8rFfEoMFdG7LkHMe5Dd21td+TCV7gCh11IpaVMP/y8C1vTnVENBJc5n4KA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b="G+yeUV/Z"; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713415388; a=rsa-sha256; cv=none; b=pQ0aOpPG+W8Hv/b38+Mszknk4cwnhtZENF6EmRFAktLJ5VZ9F4jOjRCyqhYMPekgGauT4v 2H8VrNXV2KnPtRdvIaP2NNUDu2osVl8vY+uf8Ker+H4pRhB32/LMfMpDK5tXlZnbNUvpsY 3l/3iWITieFh/J+Yc9Ir5ruwa1FLC4W6plHjkF17jxthsRfgG5d1JtGy3JqHHXL36AEoPq 04AeeFOUxHAKTT6dZqjIhSn771Kg8MDDHp6dqjtayCwLrVUpF+8T9V3z2Mjj9jS1uzJj0d ovwEcdEYfz0+RrKph/dLCSxMd0AMOyJEF6gLPsBWiGiDjwLT/Cji5hc+HL+JZg== 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 C2B8563A60 for ; Thu, 18 Apr 2024 06:43:07 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxJbo-0004cv-L8; Thu, 18 Apr 2024 00:42:52 -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 1rxJbn-0004cG-NO for guix-patches@gnu.org; Thu, 18 Apr 2024 00:42:51 -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 1rxJbn-0006rk-EY for guix-patches@gnu.org; Thu, 18 Apr 2024 00:42:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxJc0-0002lr-HF for guix-patches@gnu.org; Thu, 18 Apr 2024 00:43:04 -0400 Subject: bug#69495: [PATCH 0/2] gnu: cairo: Update to 1.18.0. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 18 Apr 2024 04:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 69495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 69495-done@debbugs.gnu.org, Raghav Gururajan , Vivien Kraus , Efraim Flashner , Maxim Cournoyer Mail-Followup-To: 69495@debbugs.gnu.org, john.kehayias@protonmail.com, john.kehayias@protonmail.com Received: via spool by 69495-done@debbugs.gnu.org id=D69495.171341532910290 (code D ref 69495); Thu, 18 Apr 2024 04:43:03 +0000 Received: (at 69495-done) by debbugs.gnu.org; 18 Apr 2024 04:42:09 +0000 Received: from localhost ([127.0.0.1]:50040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxJb6-0002fr-1X for submit@debbugs.gnu.org; Thu, 18 Apr 2024 00:42:08 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:22261) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxJb1-0002eH-RS for 69495-done@debbugs.gnu.org; Thu, 18 Apr 2024 00:42:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1713415304; x=1713674504; bh=Mc+o4mBNXnPUC2OMP7D33ssUFe2Zt1jgTlYGYbUbVqU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=G+yeUV/ZYrJTGhsiaURV3vUwetqOlZTGT5sHAx8e+tYkL67z3JDONn656a8C1O7x0 YSerQps5qbNzF/P2sfBu/5jLWX/8V/Dtf9oKiweBD08so8bKdDOutb6rRMQMW+hVgW TDlCTWX3pRTvDCYtnA/QMpuhTGWERcdKfBQZ07tSTarUVn+Yh//L5L173UGlXe6qjb 2cH1QO0zAOlDi4sov3BQ5y5l7fxGpXu1DgAdnZyiwSyrUpwGBvgPvCIOo8Wqs1N2Be ISFDGtlSLJmVZYo1HDyRdB0Lm4jgHiJskHX4d9b2b6uYgIAaxwuO6d6Xtmzra+1YJ/ V38kuY846TOeQ== Date: Thu, 18 Apr 2024 04:41:38 +0000 Message-ID: <877cgv2sg4.fsf@protonmail.com> In-Reply-To: <80e01d3d4d6a8dab981fbe2d9792cdc87828b496.camel@gmail.com> References: <877chontxw.fsf@protonmail.com> <80e01d3d4d6a8dab981fbe2d9792cdc87828b496.camel@gmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches From: John Kehayias via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.38 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.38 X-Migadu-Queue-Id: C2B8563A60 X-TUID: 7FhWZl6GfuMz On Wed, Mar 27, 2024 at 06:52 PM, Liliana Marie Prikler wrote: > Am Mittwoch, dem 27.03.2024 um 05:08 +0000 schrieb John Kehayias: >> Hello, >> >> Arg, I don't know if this ever was actually sent to the gnome-team! >> Also >> adding Efraim due to a librsvg issue (below). >> >> Apologies if it didn't go through originally (or if you are getting >> it >> again). >> >> On Sat, Mar 02, 2024 at 01:50 AM, John Kehayias wrote: >> >> > 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 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! >> > >> > 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. >> > >> > 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. >> > >> > 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? >> > >> > 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. >> > >> > 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): >> > =C2=A0 gnu: python-pycairo: Update to 1.26.0. >> > =C2=A0 gnu: cairo: Update to 1.18.0. >> > >> > =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.pat= ch >> > =C2=A0delete mode 100644 gnu/packages/patches/cairo-CVE-2020-35492.pat= ch >> > >> > >> > base-commit: b386c11e7804e0b577411d930b60f1e0a4a0382c >> > prerequisite-patch-id: 2889be19c4a046760f2f608cefff987b11b65a31 >> > -- >> > 2.41.0 >> >> 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 qui= te > close to merge, so we can't do a world rebuild there right now. > > > Cheers Thanks, and sorry for not updating sooner here. Pushed on mesa-updates 51ae492e8bde8c5465ac1b7bab72944aaf798e3f and merged to master with 2d5736cc3e869fadd2592cc13a8d332fac63b144 John