From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 4CpBGAWqA2bAHQEA62LTzQ:P1 (envelope-from ) for ; Wed, 27 Mar 2024 06:09:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 4CpBGAWqA2bAHQEA62LTzQ (envelope-from ) for ; Wed, 27 Mar 2024 06:09:25 +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=AbkZ3k2q; 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=1711516165; 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: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=uZMi9mm+u5uEr08rqNaspDxVNnR7n3/dlcrP/Av+77o=; b=I13FNvbN1Z3ZGDwUs7vksxplA0paMuB6HInCqCIndUbhaayZc6NsbFMe3qMXaKfntGE5Wq YHwqArI7KVemF4OMo/kOeMg9ZxZfw+iIvq0S4czyEYoDRv1mplPiY+97HMgtkco54MUnDN 4MTPW909kRvZOpg9P+ltMRiWoVx2IgBwRSWZlBsHzo3bl0gLwNjr5qaZjvrm6eP5PEriqK WuRG/UuYKuO2wN1dOc0Cv1DauSB6bOtF4Ui6RhQ1EnHsyp6Y1DVtpswTzWCzA0Zir7uLaT QnWnuC2hqPnerN1+kghx7jtv0eijR6n7peIG5AuCgrUjX5RduQDSBB1jrMVGWw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=AbkZ3k2q; 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=1711516165; a=rsa-sha256; cv=none; b=TKbyB5/Nc6tb5sQORDJnmx1e0SnDKGTy8qCVroq0dEmDZ6S9wnXtq4CCFvVmDJJqJWzI2b M/KNspG7KU/LG/mDhgksSRgrVLCNn6h8TDXfC2Vy+TyweQ2YRX02+n/3LBwSpMsYhNus4D 8IXuxpNfd168zaazD938wdUi45z32+kcHKK2y5igwaOZ+WOAISHpbz2eC55tv77SSiZ3IV Qk6b1Dyr3DPH+7WjnEKfb3Wm7PuSwyWWXkhHiloYGY6BT600uGV/N0tGN/YT31+j7N65G+ b1gZO4cNEUbxkAEt3hUNnZz7h0PjU09zplxnKY6Vg90HTEhm2oB428ZC7oYx6Q== 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 B5ADB6A0FC for ; Wed, 27 Mar 2024 06:09:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpLX6-0000np-QW; Wed, 27 Mar 2024 01:09: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 1rpLX5-0000nb-Dm for guix-patches@gnu.org; Wed, 27 Mar 2024 01:09:03 -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 1rpLX4-0000fi-Pl for guix-patches@gnu.org; Wed, 27 Mar 2024 01:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpLX4-0000JQ-3u for guix-patches@gnu.org; Wed, 27 Mar 2024 01:09:02 -0400 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: Wed, 27 Mar 2024 05:09:02 +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: 69495@debbugs.gnu.org Cc: Raghav Gururajan , Vivien Kraus , Liliana Marie Prikler , Maxim Cournoyer , Efraim Flashner Received: via spool by 69495-submit@debbugs.gnu.org id=B69495.17115161041126 (code B ref 69495); Wed, 27 Mar 2024 05:09:02 +0000 Received: (at 69495) by debbugs.gnu.org; 27 Mar 2024 05:08:24 +0000 Received: from localhost ([127.0.0.1]:35534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpLWR-0000I5-Bc for submit@debbugs.gnu.org; Wed, 27 Mar 2024 01:08:23 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:33089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpLWL-0000HO-K5 for 69495@debbugs.gnu.org; Wed, 27 Mar 2024 01:08:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1711516091; x=1711775291; bh=uZMi9mm+u5uEr08rqNaspDxVNnR7n3/dlcrP/Av+77o=; 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=AbkZ3k2qf8BN5FDwV0KpV8S4XfLElgLJpdDUPGVYjqCX1iLU3zycRKADjLHKNGAa2 sWJkWKovNJdw7xUYJjwfHC8ad3AFqY9VXx9Lfyw0SFmev+w/oy/KtAw/RrwMDatpi2 6EICwzf02b41O0qasrSBGad6aUziCn32ZZWODviJdf796TDYP2LEnNLMhQgLhCituv b4iFLiwdmE+0jRL1ln1Kjsku3Ct3kiKG42f2nt6f3GLC6WVb22j0+paBU6a/j/cDqK sETXdKyHktUpH+BDDSiXuAwdnxvC3w8O6ijKUFcGQZPaeOZrPzUXZxOgX0/nxooF0I 5GEU76XPjFnMQ== Date: Wed, 27 Mar 2024 05:08:02 +0000 Message-ID: <877chontxw.fsf@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_8Lp2iWmxU8ZcJmCyIGSMkxtZaHXnz2CbTs2w9MGw" 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-Queue-Id: B5ADB6A0FC X-Spam-Score: -4.24 X-Migadu-Spam-Score: -4.24 X-Migadu-Scanner: mx11.migadu.com X-TUID: plxvUmIo4pxg This is a multi-part message in MIME format. --b1_8Lp2iWmxU8ZcJmCyIGSMkxtZaHXnz2CbTs2w9MGw Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 t= heir > pending merge and the builds upcoming on mesa-updates (libdrm, which cair= o > 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 yea= rs!) > of 1.18.0. An update to python-pycairo was needed first. The end result i= s > 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 qu= ick > 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 t= his > 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 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 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. 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. John --b1_8Lp2iWmxU8ZcJmCyIGSMkxtZaHXnz2CbTs2w9MGw Content-Type: text/x-patch; name=0001-gnu-librsvg-2.40-Skip-tests-that-fail-with-cairo-1.1.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-librsvg-2.40-Skip-tests-that-fail-with-cairo-1.1.patch RnJvbSAwZjNlNjY1M2E2NWE1YTcwMzFmMjQ1MjYwYjY2NDFhZWRjOGY0M2YyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KTWVzc2FnZS1JRDogPDBmM2U2NjUzYTY1YTVhNzAzMWYyNDUyNjBiNjY0 MWFlZGM4ZjQzZjIuMTcxMTUxNDk1MS5naXQuam9obi5rZWhheWlhc0Bwcm90b25tYWlsLmNvbT4N CkZyb206IEpvaG4gS2VoYXlpYXMgPGpvaG4ua2VoYXlpYXNAcHJvdG9ubWFpbC5jb20+DQpEYXRl OiBXZWQsIDI3IE1hciAyMDI0IDAwOjQ1OjU5IC0wNDAwDQpTdWJqZWN0OiBbUEFUQ0hdIGdudTog bGlicnN2Zy0yLjQwOiBTa2lwIHRlc3RzIHRoYXQgZmFpbCB3aXRoIGNhaXJvIDEuMTguMC4NCg0K KiBnbnUvcGFja2FnZXMvZ25vbWUuc2NtIChsaWJyc3ZnLTIuNDApW2FyZ3VtZW50c106IFNraXAg dHdvIHRlc3RzIHdoaWNoIGZhaWwNCmFmdGVyIGNhaXJvIHdhcyB1cGRhdGVkIHRvIHZlcnNpb24g MS4xOC4wLg0KDQpDaGFuZ2UtSWQ6IElmMzg2N2E5ZmRlZTY0ODFkYTgxOTk1NGQ3NzM0MWY0MTFl ODVlNzhiDQotLS0NCiBnbnUvcGFja2FnZXMvZ25vbWUuc2NtIHwgNyArKysrKy0tDQogMSBmaWxl IGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBh L2dudS9wYWNrYWdlcy9nbm9tZS5zY20gYi9nbnUvcGFja2FnZXMvZ25vbWUuc2NtDQppbmRleCAw NjI1NjA2NmJjLi41NWI2MGI3YjEyIDEwMDY0NA0KLS0tIGEvZ251L3BhY2thZ2VzL2dub21lLnNj bQ0KKysrIGIvZ251L3BhY2thZ2VzL2dub21lLnNjbQ0KQEAgLTM3MTcsMTIgKzM3MTcsMTUgQEAg KGRlZmluZS1wdWJsaWMgbGlicnN2Zy0yLjQwDQogICAgICAgICAgICAgICAgICAgICAgICAgICAg InN2ZzEuMS9tYXNraW5nLW1hc2stMDEtYi5zdmciDQogICAgICAgICAgICAgICAgICAgICAgICAg ICAgOzsgVGhpcyB0ZXN0IGZhaWxzIG9uIGFhcmNoNjQ6DQogICAgICAgICAgICAgICAgICAgICAg ICAgICAgImJ1Z3MvNzc3ODM0LWVtcHR5LXRleHQtY2hpbGRyZW4uc3ZnIg0KLQ0KICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDs7IFRoZXNlIHR3byB0ZXN0cyBmYWlsIGR1ZSB0byBzbGlnaHRs eSBkaWZmZXJlbnQNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyB0ZXh0IHJlbmRlcmlu ZyAoZGlmZmVyZW50IGtlcm5pbmcgb3Igc2ltaWxhciksDQogICAgICAgICAgICAgICAgICAgICAg ICAgICAgOzsgbm90aGluZyBhbGFybWluZy4NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAi YnVncy8zNDAwNDcuc3ZnIg0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICJidWdzLzc0OTQx NS5zdmciKSkpKSkpKSkNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAiYnVncy83NDk0MTUu c3ZnIg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IFRoZXNlIHR3byB0ZXN0cyBmYWls IHdpdGggdGhlIHVwZGF0ZSB0byBjYWlybw0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7 IHZlcnNpb24gMS4xOC4wLg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICJidWdzLzU4Nzcy MS10ZXh0LXRyYW5zZm9ybS5zdmciDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgInN2ZzEu MS9tYXNraW5nLXBhdGgtMDMtYi5zdmciKSkpKSkpKSkNCiAgICAgKG5hdGl2ZS1pbnB1dHMNCiAg ICAgIChsaXN0IHBrZy1jb25maWcNCiAgICAgICAgICAgIGAoLGdsaWIgImJpbiIpIDsgZ2xpYi1t a2VudW1zLCBldGMuDQoNCmJhc2UtY29tbWl0OiBjM2YxNTQ0M2JjNmQ0NTc3NThhYWQxMzI2ZGNj NmRjYWQ5Y2Y4ZDZlDQpwcmVyZXF1aXNpdGUtcGF0Y2gtaWQ6IGZhMWYyM2UxMzQwYTNlZWI5ZjM0 N2VkNzE5YjliMGZhMDU1OGZiM2YNCnByZXJlcXVpc2l0ZS1wYXRjaC1pZDogYTFlYjVmMDk1NWI5 OTg4ZDNiZmUzYmU4NDAzYzc1OTk5YTFjYWU1Zg0KcHJlcmVxdWlzaXRlLXBhdGNoLWlkOiAyODg5 YmUxOWM0YTA0Njc2MGYyZjYwOGNlZmZmOTg3YjExYjY1YTMxDQpwcmVyZXF1aXNpdGUtcGF0Y2gt aWQ6IGVhOTNiNjY2MjI3NWFlZWMxZTAxNGE5YmM5ZmU3YTk2ZjI2YWM2MDANCnByZXJlcXVpc2l0 ZS1wYXRjaC1pZDogMTc3NDQwYTEyYjdjNzk3ZDIyZjhiYjEyNTNkYjEzM2QyZmJhZDM0OA0KcHJl cmVxdWlzaXRlLXBhdGNoLWlkOiAzYTUxODljMWU4ZTQ2MTJjZWI2ZjFiNzBjYzNjODNlMzlhOTc3 ZWI5DQotLSANCjIuNDEuMA0KDQo= --b1_8Lp2iWmxU8ZcJmCyIGSMkxtZaHXnz2CbTs2w9MGw--