From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id GCOQG6iG4mXgNgEAqHPOHw:P1 (envelope-from ) for ; Sat, 02 Mar 2024 02:53:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id GCOQG6iG4mXgNgEAqHPOHw (envelope-from ) for ; Sat, 02 Mar 2024 02:53:44 +0100 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=DKiUkhDE; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709344424; 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-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=2Z4ZqICONFK+S8Tnwc0G2foQE75k91/JloFaCyZAIyU=; b=JEEBWZXs7nn3k4/b7rD4RPRKekV6MPrvkx+aJ5z8SaMKDc1jnQ8oaABRcq/ZInqr9bmiyA RSAx600RhZAPFxc0qDl1j02UlTa//PiaBchZpR+an/XGMK6DxSP+Tji72gA69ManhNu7gB lGqiv5KOo3UgtGDPqh++IP9fSknwlUPi4K8yzc+9Dm2Bo4LC9LA+mKKJcJMYkULfU8dd5r 0oB8AoFVrSCi8msReHn30cvVylvoS9w81+GbKr2MbwND9kXizmGdis4jOh3/RoNf1RVNcI E3lFVXKgB7+6HaTuiYJex6Ak+KprzxRiwuVima8W9R1sLdWO0csWPpE9GqqNyA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=DKiUkhDE; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709344424; a=rsa-sha256; cv=none; b=RrDd0zITxSdaePjW+QqvObRTfvH0SLv9SGs7w2ckpFEeDOpRHbSgFkzfj56uniH5lLMQda VwEXaDJWGL0+ezyTaw+8c8R1M44tZtUP1q7Op9W3oE0uKCgZLy2cgq2nmVK1GsbNsNZsIO O3ki37aG4P7gLNC1THDMpGqIH1QnUw+PeAGpR/Qf8yoDT0ObE1n3IWaydKlROYacxhJJGa UIh19O1UV+P3g6rHeR5VgqSieY3H8DBRZQTbF0mfy9eLkkv1zeaoqDCCt/bNR/PvtSjWxA r60ugamYLjd4wEDKHH8YWQqlRqemQ77RTvbOXOLahwF7ElTTa1MXoU4fy3uMaw== 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 16020108DB for ; Sat, 2 Mar 2024 02:53:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgEYx-00072Y-T7; Fri, 01 Mar 2024 20:53:19 -0500 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 1rgEXO-0006uI-2j for guix-patches@gnu.org; Fri, 01 Mar 2024 20:51:42 -0500 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 1rgEXG-0001Dl-JZ for guix-patches@gnu.org; Fri, 01 Mar 2024 20:51:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rgEXi-0008Fk-KW for guix-patches@gnu.org; Fri, 01 Mar 2024 20:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69495] [PATCH 0/2] gnu: cairo: Update to 1.18.0. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Mar 2024 01:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69495@debbugs.gnu.org Cc: John Kehayias X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170934430431694 (code B ref -1); Sat, 02 Mar 2024 01:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Mar 2024 01:51:44 +0000 Received: from localhost ([127.0.0.1]:37682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgEXP-0008F7-Jt for submit@debbugs.gnu.org; Fri, 01 Mar 2024 20:51:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:49544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgEXL-0008Et-8q for submit@debbugs.gnu.org; Fri, 01 Mar 2024 20:51:42 -0500 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 1rgEWs-0006qg-RW for guix-patches@gnu.org; Fri, 01 Mar 2024 20:51:10 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rgEWq-0001Ba-2G for guix-patches@gnu.org; Fri, 01 Mar 2024 20:51:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1709344263; x=1709603463; bh=2Z4ZqICONFK+S8Tnwc0G2foQE75k91/JloFaCyZAIyU=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=DKiUkhDEAjF86g26CDLQ4RlRe14adxKonUPzASN1jc6quuvcietNO/vx6AAW0SQXt XUpq2VwEe4hFpcm4w40GBXEESq3t0X79Xz7PWC6Y9bxT5iresxJFMkVrhPUwpf6Q0W kR18mhGhKKQV6zYuL5Qp+Zeiu/JPo/63dhXlRPqsKR9+Gz3DjTOB4Q+DAJ6htnZJDr fJ+fVPjUez2j/4X43ptX0zLVjcvJKgahG8JtZiKSzwS37xCMlA5dkskEWohF4vWF+6 lhPU+yHdDEZ4XZuNOTSRUZxBiHtiiSLqkaEXzEmhiLFIfr2Zch9XF6pURZ2xtSvaVt QyPG7ycu4Kopg== Date: Sat, 02 Mar 2024 01:50:54 +0000 Message-ID: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.133; envelope-from=john.kehayias@protonmail.com; helo=mail-40133.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.97 X-Spam-Score: -6.97 X-Migadu-Queue-Id: 16020108DB X-TUID: nEbhaSu3NDUN Hi gnome-team and guix, I'm cc'ing the gnome-team as this would normally fall to them, but with the= ir 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 t= ee backend that we had enabled before. I removed all the old configure flags a= nd propagated-inputs which were commented out and now obsolete. The docs require gtk-doc which depends on cairo. To break the cycle cairo i= s hidden (but exported) and built without docs, with the public cairo-with-do= cs 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 quic= k 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 i= t needs to build tests in a phase after cairo has built and set in a way to f= ind this just build version? Anyway, this built locally for me on x86_64. I built up to icecat, which ne= eds 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 thi= s 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