From patchwork Mon Mar 10 16:15:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Remco van 't Veer X-Patchwork-Id: 40056 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 8A25827BBEA; Mon, 10 Mar 2025 16:18:32 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham 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 113A127BBE2 for ; Mon, 10 Mar 2025 16:18:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trfpR-0005MN-99; Mon, 10 Mar 2025 12:18:10 -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 1trfpL-0005KI-Vc for guix-patches@gnu.org; Mon, 10 Mar 2025 12:18:05 -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 1trfpK-0001JC-W3 for guix-patches@gnu.org; Mon, 10 Mar 2025 12:18:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=2b5pztJUBtyWRdsdX9rLEVDG5UWq0TvY/YOCTX7bbbM=; b=eoMY0XV8M3B8vBeJ+nW9lrvmCN+S2831Rr2lKTfGFZZ+iprMWBmNYCkZWGBWx7zbH4vjBfwlk+kZoSioghG4oU4M1KMAt3Jl1S+gGuCJRgGVMGsY73bFc1rGPza9Iv6Fu/fBmO18gLRYSoBBJh+OAH3Tqwnbi3glL1uWFtpi1KqAx+tj4n/JhaWdM1d4AoUpMM0JyPDFIAUAjmZhKd7/9fAeM1Q8AEHWyElDBbDBE8vDNnVdjSvC+bfGuohTN2Hjb/SqKZQzRTw1tbnggnGoN0Yxh2+ifX4ts1CYgbhb0D0TKD82kwQ+LPcZ/EAzKGwWZnbEJf254sFXc7njZ/u4vA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1trfpK-0003nz-2q; Mon, 10 Mar 2025 12:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76922] [PATCH] gnu: cairo: Add patch to fix regression when writing PDFs with fonts Resent-From: Remco van 't Veer Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 10 Mar 2025 16:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76922 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76922@debbugs.gnu.org Cc: Remco van 't Veer , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by submit@debbugs.gnu.org id=B.174162342314546 (code B ref -1); Mon, 10 Mar 2025 16:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Mar 2025 16:17:03 +0000 Received: from localhost ([127.0.0.1]:39458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1trfoE-0003m6-22 for submit@debbugs.gnu.org; Mon, 10 Mar 2025 12:17:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51146) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1trfo9-0003lo-9P for submit@debbugs.gnu.org; Mon, 10 Mar 2025 12:16:50 -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 1trfo0-0004sj-EF for guix-patches@gnu.org; Mon, 10 Mar 2025 12:16:42 -0400 Received: from fout-b7-smtp.messagingengine.com ([202.12.124.150]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trfnw-00018L-V2 for guix-patches@gnu.org; Mon, 10 Mar 2025 12:16:40 -0400 Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfout.stl.internal (Postfix) with ESMTP id 91D341140115; Mon, 10 Mar 2025 12:16:32 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Mon, 10 Mar 2025 12:16:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=remworks.net; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1741623392; x=1741709792; bh=2b 5pztJUBtyWRdsdX9rLEVDG5UWq0TvY/YOCTX7bbbM=; b=GtUjK3h2XMPKxoq9gl EjvYN7kX++M7oTL37J9Td8x1Tax/Xyr6BGRksTmz7UXHNH8m6emn7BXtATq7ZWz6 rnDTSBnUOe0yExppnu5UksEznEmGO611QrXWFv7fBve2Vkq+CMII3zPhzqp0VbgF odsutSP/UVZ8a7sOfZE43BfzVbZs8pzwzHn5GCJqUD4aWuRX/Bv1xUmgT7N/K2qZ 76zKQjaLQFOezwTkLIjdh7Jwm/Qiv4Ogr81Jx+NSN3+E8mEwXIjTZOzlIr1RO2sQ lBNsy8O2k4x7E+QsyFwcGvcPwKDeXCOf8i7Vq2PRZDccIOjlChrHT7/SC7u2IIEI FFXQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1741623392; x=1741709792; bh=2b5pztJUBtyWRdsdX9rLEVDG5UWq 0TvY/YOCTX7bbbM=; b=sLCUMvT9diPnOGAtmSHRPJRA4Vn/yXmrm9mgwgJYlD6J q89AD7vC1P8Hb21oeeql7nVLOt/3Uvm+yeSv/ppRN3vkZkCze0PJLd/cB2RQRdvw XDn8zE+UdBC8bI6KMlzj+zvSc4uo2//2nYLALOB5a8Rt0RtFpKR4fkXTlm4FjziT s6OgJNl7R/g4Bh6hvoMV45VXn71vjLDIdwBZoyZUYUo872URER7UD31BU+DSArjR RNH9XczqmNPHkYp47ZHBB7B4MrPIZmGCDnt6x8sET9fCLUmcV2PBpvnnk8yimbx5 ks+3LGFXGVG+eaR4h3BB2mvXKQSFxe+9TYHR39n/5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduudelkeduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffogggtgfesthekredtredtjeenucfhrhhomheptfgvmhgtohcuvhgrnhcukdht ucggvggvrhcuoehrvghmtghosehrvghmfihorhhkshdrnhgvtheqnecuggftrfgrthhtvg hrnhepudegheelgfefhfehffeivdeghefgfeeutdefgfeuvdefueejgfeihedukeeuffdt necuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhgpdgtrghirhhoghhrrghphh hitghsrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhf rhhomheprhifvhesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtthhopedvpdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdr ohhrghdprhgtphhtthhopehrvghmtghosehrvghmfihorhhkshdrnhgvth X-ME-Proxy: Feedback-ID: if0694934:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 10 Mar 2025 12:16:31 -0400 (EDT) From: Remco van 't Veer Date: Mon, 10 Mar 2025 17:15:46 +0100 Message-ID: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@remworks.net> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=202.12.124.150; envelope-from=rwv@fastmail.com; helo=fout-b7-smtp.messagingengine.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: , 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 Applied patch fixes out of memory errors when writing PDFs with fonts in xournalpp and others. See also: https://gitlab.freedesktop.org/cairo/cairo/-/issues/870 * gnu/local.mk: Register patch. * gnu/packages/gtk.scm (cairo): Add patch. * gnu/packages/patches/cairo-cff-dont-fail-if-no-local-subs: Add patch. Change-Id: Id6475d0ddb27208486bf41e18de72d116da110fb --- gnu/local.mk | 3 +- gnu/packages/gtk.scm | 2 ++ ...cairo-cff-dont-fail-if-no-local-subs.patch | 34 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cairo-cff-dont-fail-if-no-local-subs.patch base-commit: d0510dcd824e1b3fda62a8841e792581d7b8de8d diff --git a/gnu/local.mk b/gnu/local.mk index 880af09168..f26c79b3e1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -48,7 +48,7 @@ # Copyright © 2021 Andrew Tropin # Copyright © 2021 Simon Tournier # Copyright © 2022 Daniel Meißner -# Copyright © 2022, 2024 Remco van 't Veer +# Copyright © 2022, 2024, 2025 Remco van 't Veer # Copyright © 2022, 2024 Artyom V. Poptsov # Copyright © 2022, 2023 John Kehayias # Copyright © 2022 muradm @@ -1069,6 +1069,7 @@ dist_patch_DATA = \ %D%/packages/patches/busybox-add-missing-sha-NI-guard.patch \ %D%/packages/patches/c2rust-ast-exporter-local-search.patch \ %D%/packages/patches/cadical-add-shared-library.patch \ + %D%/packages/patches/cairo-cff-dont-fail-if-no-local-subs.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 846103ff9e..f2b3f19897 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; Copyright © 2024 John Kehayias ;;; Copyright © 2025 Florian Pelz +;;; Copyright © 2025 Remco van 't Veer ;;; ;;; This file is part of GNU Guix. ;;; @@ -178,6 +179,7 @@ (define cairo (uri (string-append "https://cairographics.org/releases/cairo-" version ".tar.xz")) + (patches (search-patches "cairo-cff-dont-fail-if-no-local-subs.patch")) (sha256 (base32 "0nnli5cghygbl9bvlbjls7nspnrrzx1y1pbd7p649s154js9nax6")))) (build-system meson-build-system) diff --git a/gnu/packages/patches/cairo-cff-dont-fail-if-no-local-subs.patch b/gnu/packages/patches/cairo-cff-dont-fail-if-no-local-subs.patch new file mode 100644 index 0000000000..ed1056a0c8 --- /dev/null +++ b/gnu/packages/patches/cairo-cff-dont-fail-if-no-local-subs.patch @@ -0,0 +1,34 @@ +From f19e2fe080ddcfce93c8234a919fd882f3d63362 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson +Date: Fri, 13 Sep 2024 06:28:39 +0930 +Subject: [PATCH] cff: Don't fail if no local subs + +Fixes: #870 +--- + src/cairo-cff-subset.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c +index 076cb2b0a..8a7de0065 100644 +--- a/src/cairo-cff-subset.c ++++ b/src/cairo-cff-subset.c +@@ -952,9 +952,13 @@ cairo_cff_font_read_private_dict (cairo_cff_font_t *font, + decode_number (operand, nominal_width); + + num_subs = _cairo_array_num_elements (local_sub_index); +- *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t)); +- if (unlikely (*local_subs_used == NULL)) +- return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ if (num_subs > 0) { ++ *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t)); ++ if (unlikely (*local_subs_used == NULL)) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ } else { ++ *local_subs_used = NULL; ++ } + + if (num_subs < 1240) + *local_sub_bias = 107; +-- +GitLab +