From patchwork Mon Mar 18 22:38:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Ziltener X-Patchwork-Id: 61935 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CAF9E27BBEA; Mon, 18 Mar 2024 23:06:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0B22727BBE2 for ; Mon, 18 Mar 2024 23:06:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmM3q-0006Cz-CO; Mon, 18 Mar 2024 19:06:30 -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 1rmM3m-0006CO-MP for guix-patches@gnu.org; Mon, 18 Mar 2024 19:06:26 -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 1rmM3l-00025b-Lb for guix-patches@gnu.org; Mon, 18 Mar 2024 19:06:26 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rmM4O-00079P-00 for guix-patches@gnu.org; Mon, 18 Mar 2024 19:07:04 -0400 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> 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-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: Daniel Ziltener X-ACL-Warn: , Daniel Ziltener via Guix-patches X-Patchwork-Original-From: Daniel Ziltener via Guix-patches via From: Daniel Ziltener Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- 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.