From unknown Fri Aug 08 15:17:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69886] [PATCH] gnu: gtk: Update cairo to 1.18.0. Resent-From: Daniel Ziltener Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Mar 2024 23:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69886@debbugs.gnu.org Cc: dziltener@lyrion.ch X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171080321427437 (code B ref -1); Mon, 18 Mar 2024 23:07:03 +0000 Received: (at submit) by debbugs.gnu.org; 18 Mar 2024 23:06:54 +0000 Received: from localhost ([127.0.0.1]:49047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmM4D-00078M-Dc for submit@debbugs.gnu.org; Mon, 18 Mar 2024 19:06:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:42188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmM49-00077a-Dn for submit@debbugs.gnu.org; Mon, 18 Mar 2024 19:06:51 -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 1rmLdp-0001Vy-5K for guix-patches@gnu.org; Mon, 18 Mar 2024 18:39:37 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199] helo=lyrion.ch) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmLdl-0006TV-OY for guix-patches@gnu.org; Mon, 18 Mar 2024 18:39:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1710801568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=K0mIAMeC5lzS7LLiQg73dijpPL/4a0hTpcstxUslaho=; b=ghqmeL7T7HMvxfVv7IbhVgki5hkOW2dLTDAa1jUqGSjWXaKMXWhqeCOHYh++5n+3GELdAV 3fUL8JAzxtSM3DzkEIeiArXdmi++WOScfDkiS5IxkxYIi5SPmdPExjS7ybwMZWDRrGe4iT prdxvwwM4ljbX+dNyn/YFxzA7g0l2HsiZ9FLMc6C52Weviptbl23Jm7R+qDWf+/FiNC2Di bvN79zL4jC0aKVlW43ddct3wb+7KVa++oBVTG4h54ia8QmpscFYMHPS5yduOjsVTECyorU ObhD97SwInhXR+1o0L9KQBiWrWwmy2PKXUs0HAbLyNhMVmnu2uxKMwNjAxPJOQ== Received: from localhost ( [2a06:6880:42c:1600:50f3:a754:c01:3b8a]) by lyrion.ch (OpenSMTPD) with ESMTPSA id 1d490590 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 18 Mar 2024 22:39:27 +0000 (UTC) Message-ID: <6b76c31e120fda491be8ee8126cc5ae5@lyrion.ch> From: Daniel Ziltener Date: Mon, 18 Mar 2024 23:38:47 +0100 Received-SPF: pass client-ip=195.15.241.199; envelope-from=dziltener@lyrion.ch; helo=lyrion.ch X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --- gnu/packages/gtk.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2dcfa0edc1..9afc692e8d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -157,12 +157,11 @@ (define-public appmenu-gtk-module "This package provides a global menu applet for use with desktop panels such as mate-panel and xfce4-panel.") (home-page "https://gitlab.com/vala-panel-project/vala-panel-appmenu") - (license (list license:lgpl3)))) (define-public cairo (package (name "cairo") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) @@ -170,17 +169,16 @@ (define-public cairo (string-append "https://cairographics.org/releases/cairo-" version ".tar.xz")) (sha256 - (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")) - (patches (search-patches - "cairo-CVE-2018-19876.patch" - "cairo-CVE-2020-35492.patch")))) - (build-system glib-or-gtk-build-system) - (outputs '("out" "doc")) + (base32 + "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4")))) + (build-system meson-build-system) (arguments `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html #:configure-flags (list - "--disable-static" + "-Dgtk_doc=true" + "-Dsymbol-lookup=disabled" + "-Dspectre=disabled" ;; XXX: To be enabled. ;; "--enable-gallium=yes" ;; "--enable-gl=yes" @@ -189,15 +187,14 @@ (define-public cairo ;; "--enable-cogl=yes" ;; "--enable-directfb=yes" ;; "--enable-vg=yes" - "--enable-tee=yes" ;needed for GNU IceCat - "--enable-xml=yes" ;for cairo-xml support - (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + ))) (native-inputs `(,@(if (target-hurd?) '() `(("gobject-introspection" ,gobject-introspection))) + ("gcc-13" ,gcc-13) + ("gtk-doc" ,gtk-doc) + ("docbook-xsl" ,docbook-xsl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs @@ -236,6 +233,7 @@ (define-public cairo (list license:lgpl2.1+ license:mpl1.1)))) + (license (list license:lgpl3)))) (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cairo. -- 2.41.0 From unknown Fri Aug 08 15:17:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69886] [PATCH] gnu: gtk: Update cairo to 1.18.0. References: <6b76c31e120fda491be8ee8126cc5ae5@lyrion.ch> In-Reply-To: <6b76c31e120fda491be8ee8126cc5ae5@lyrion.ch> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Mar 2024 01:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Daniel Ziltener Cc: 69886@debbugs.gnu.org Received: via spool by 69886-submit@debbugs.gnu.org id=B69886.171081201219396 (code B ref 69886); Tue, 19 Mar 2024 01:34:01 +0000 Received: (at 69886) by debbugs.gnu.org; 19 Mar 2024 01:33:32 +0000 Received: from localhost ([127.0.0.1]:55047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmOM7-00052m-OL for submit@debbugs.gnu.org; Mon, 18 Mar 2024 21:33:32 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:24979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmOM5-00052V-GZ for 69886@debbugs.gnu.org; Mon, 18 Mar 2024 21:33:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1710811964; x=1711071164; bh=0H1KXYdMm3LDooh9ZafUm2CFluHrTtSXOnNYMQEaJSQ=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=bWUFXuUsr+cN9Tdo1T2QsaPVGKBryp0UAAhagudDt8+IzFG7TcX42IfvGk5u4gJPj IBUfLT7McBb/nmK9suIJg/kXT8xUdZnzRgvtXy4OEfbXiRvoTBz8R4VSTanqRTSiQc 5blJm3RBtts6IWkC8G0iG3tWEAm6j8if19CFHArnjy8aSDgq0KXQVf1v9rV0dtzUA5 3ezgWBLb3P65ydloJ/4xWtLmVdnd2OP8MyM93wYi/b+pgEgRfbPsCQ3TaJyCIqO83l FUMxtQzdqkCE7Q7wcaPMgoBui8tYzZwPUqgM8OOwPk7iQj6/C4OoSlK77nd5kozmFT 3vIsgtuvLQRTg== Date: Tue, 19 Mar 2024 01:32:24 +0000 From: John Kehayias Message-ID: <87y1af0zx8.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Thanks for the submission! On Mon, Mar 18, 2024 at 11:38 PM, Daniel Ziltener wrote: > (native-inputs > `(,@(if (target-hurd?) > '() > `(("gobject-introspection" ,gobject-introspection))) > + ("gcc-13" ,gcc-13) > + ("gtk-doc" ,gtk-doc) Note that this is a circular dependency as, gtk-doc depends on cairo curren= tly: --8<---------------cut here---------------start------------->8--- $ guix graph --path gtk-doc cairo gtk-doc@1.33.2 dblatex@0.3.12 imagemagick@6.9.12-4 pango@1.50.10 cairo@1.16.0 --8<---------------cut here---------------end--------------->8--- Please see for my submission as well. Since it has been a couple of weeks, I'll likely push that version on mesa-updates for testing soon, but comments welcome. John From unknown Fri Aug 08 15:17:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69886] [PATCH] gnu: gtk: Update cairo to 1.18.0. Resent-From: Daniel Ziltener Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Mar 2024 22:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias , 69886@debbugs.gnu.org, control@debbugs.gnu.org Received: via spool by 69886-submit@debbugs.gnu.org id=B69886.171088704517414 (code B ref 69886); Tue, 19 Mar 2024 22:25:02 +0000 Received: (at 69886) by debbugs.gnu.org; 19 Mar 2024 22:24:05 +0000 Received: from localhost ([127.0.0.1]:37506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmhsK-0004Wh-Ij for submit@debbugs.gnu.org; Tue, 19 Mar 2024 18:24:04 -0400 Received: from 195-15-241-199.dc3-a.pub1.etik-cloud.com ([195.15.241.199]:46404 helo=lyrion.ch) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmhsI-0004WG-Gk; Tue, 19 Mar 2024 18:24:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lyrion.ch; s=20230702; t=1710887001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n3bgalIKp5Pkda5yyEiUW6k5y4m4LDDvWBZ8186WxAQ=; b=Zr+byf4exOlLByOCzvcpbaprJ3tj6GIGVxdye88vlkjk+6/0MLjgIVsXb3e8qlkvUHhnY6 /vqenboE7sGLaXKuxbtj5qBAvAEMCNfZJOSVAX4SW0rxE9CmZyvjrzh4Dl17qAz3yB5vXF UxAQun8qXOSnSCmF++10kovYc+sjJ+2qBDxMkuSskEnx4bQAc2acILZrpcKEhBpD/Yj2FS qJQOyN+MDZzpwbI6SqkWdYFQBmbMaBxIUQk7TxFMD/BOyqTgXqGewdfjhjkXeMQ9MWdSvf d7opwEulo5iwcHYQLh4QQUUSOdAk8zY+aDNTvcVFDmkCIlDAKIw27VO7NYRUDA== Received: from [IPV6:2a06:6880:42c:1600:50f3:a754:c01:3b8a] ( [2a06:6880:42c:1600:50f3:a754:c01:3b8a]) by lyrion.ch (OpenSMTPD) with ESMTPSA id 3a692a4b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 19 Mar 2024 22:23:21 +0000 (UTC) Message-ID: <565ea2ef-e9f4-164a-d60d-d76674c9591d@lyrion.ch> Date: Tue, 19 Mar 2024 23:23:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 References: <87y1af0zx8.fsf@protonmail.com> Content-Language: en-US From: Daniel Ziltener In-Reply-To: <87y1af0zx8.fsf@protonmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.9 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.9 (---) Oh, nice, I will close this here then. close 69886 thanks