Received: (at 76922) by debbugs.gnu.org; 12 Mar 2025 09:42:09 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 12 05:42:09 2025 Received: from localhost ([127.0.0.1]:47395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tsIbE-0007Tl-O6 for submit <at> debbugs.gnu.org; Wed, 12 Mar 2025 05:42:09 -0400 Received: from fout-b1-smtp.messagingengine.com ([202.12.124.144]:51557) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <rwv@HIDDEN>) id 1tsIbA-0007TB-Ba for 76922 <at> debbugs.gnu.org; Wed, 12 Mar 2025 05:42:02 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.stl.internal (Postfix) with ESMTP id D737111401E2; Wed, 12 Mar 2025 05:41:54 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-08.internal (MEProxy); Wed, 12 Mar 2025 05:41:54 -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=1741772514; x=1741858914; bh=DD NjTQ/DAALp1VypenlHPuEeG3i/W0tuqb4dhQRARho=; b=OVRIrxuxka1x5uSkGS +u9i7gBzsNluk9tOkhKVFiQkQB1hrStndHF758n4ZHCfkfmqPUPLdqH6t7c7Rr3l o1t8fyoRp2l4Isx0evFDdjKRco2R3fCTV8VF91RpivQDmZHB/RbjUHZNHgch/GBp +RNBspELj9Es4OS7EUEIzeVk4g79Z6NDZMZQTfwgPxorP5W08+r0k6NP4YsN3zJ9 0gN9qiGLEep4PuO/r+H2Oe0dIg1N+64xVsE8MEsfGeUmTtg3ayPtIdI1aR/TgAhG HmYeRPClx/PFj52o0MIJPYU9Blwmq9qr8AJXEhg+sCzGEAHDi7Cdt3XtxYm6Q0Cq rvJA== 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=1741772514; x=1741858914; bh=DDNjTQ/DAALp1VypenlHPuEeG3i/ W0tuqb4dhQRARho=; b=axA47zUxSWtj5CgtFbYdVYh7qfYSjrbwA3rD0KkpsD4D lMQAC8UwnUJ3UkKgoBxWzOK7ZTuNORdpIzzucrPLRkKD/37TwxdJ0PbFohp2tZ/o iqXzOWLozyrkFNhyBepfGSM4paGgWIjDhjIdga2jNhokFZg8MVHcQMBUjWo0wICt dUwhTB47vKZyIJoa5sxZGsDwqKW6HZZK0OY/Z0IQfUWcjbmDjan7t7hyGf5u5pF1 EKZufefkirK7cjdnRUOdc+4Qk3dUiw9T48iv4TRieUeQz0KePClWa0vys56TOirK S1xEo0bTyNXbJ/xr/U5KGevBF7HoVLQqBLZHjpRFaA== X-ME-Sender: <xms:4lbRZx7eSSfwmGwmu1ey0e9aXuOxJQggEojz0IB0q8feJ22DspCoOw> <xme:4lbRZ-6ioCcnPCS9jv7xh7ACgjxzkL0NiUIFLidvYSoPpIl2SWXLJbgU8O5c-hraD h7N9KzIkngwwYQMIQ> X-ME-Received: <xmr:4lbRZ4eLj8DJuRVc8bX52iZacHZaFeOlYVs26kgrbhNDFZBo9T2d0vXCjz3v7plYclCfE_6L0LHt2GTZVpOtopWIpF7xsA> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdegjeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffogggtgfesthekredtredtjeenucfhrhhomheptfgvmhgtohcuvhgrnhcukdht ucggvggvrhcuoehrvghmtghosehrvghmfihorhhkshdrnhgvtheqnecuggftrfgrthhtvg hrnhepudegheelgfefhfehffeivdeghefgfeeutdefgfeuvdefueejgfeihedukeeuffdt necuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhgpdgtrghirhhoghhrrghphh hitghsrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhf rhhomheprhifvhesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtthhopedvpdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopeejieelvddvseguvggssghughhsrdhgnhhu rdhorhhgpdhrtghpthhtoheprhgvmhgtohesrhgvmhifohhrkhhsrdhnvght X-ME-Proxy: <xmx:4lbRZ6Ie0et7EslehuZvKGCKmzi0GTbEgh8YIvabK3mNEQNBvjlgoA> <xmx:4lbRZ1JbKz9AFs4iosES6fgE_-VJOIV-tep90-uYRq3g1viP4vDidw> <xmx:4lbRZzwqAKZBpJqnu1dde1kj3Qb3Z_j9wHSXU0CMKlYOs4JHRJpWFw> <xmx:4lbRZxJ18T3oBeF2VPtWlfpQgZuDZFc4ZYtx98HePmi7GYqGTFYGGw> <xmx:4lbRZ8XA8--eCSSS1Hnlt0bg7GPqWJB-036U3hOUXzwZ78bEbwgz17e-> Feedback-ID: if0694934:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 12 Mar 2025 05:41:54 -0400 (EDT) From: Remco van 't Veer <remco@HIDDEN> To: 76922 <at> debbugs.gnu.org Subject: [PATCH v3] gnu: cairo: Fix regression writing PDFs with fonts via graft. Date: Wed, 12 Mar 2025 10:41:37 +0100 Message-ID: <441811aaba7347e1763b9d7f89eadc35b3b3f6a0.1741772497.git.remco@HIDDEN> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 76922 Cc: Remco van 't Veer <remco@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Fix out of memory errors when writing PDFs with fonts embedded in xournalpp and others. See also: https://gitlab.freedesktop.org/cairo/cairo/-/issues/870 * gnu/packages/gtk.scm (cairo)[replacement]: New field pointing to cairo-1.18.4. * gnu/packages/gtk.scm (cairo-1.18.4): Add package. Change-Id: I6efa5a3acdf39fe78e558173f896f3a6abbc5c27 --- gnu/packages/gtk.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 846103ff9e..4d49246206 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@HIDDEN> ;;; Copyright © 2024 John Kehayias <john.kehayias@HIDDEN> ;;; Copyright © 2025 Florian Pelz <pelzflorian@HIDDEN> +;;; Copyright © 2025 Remco van 't Veer <remco@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -172,6 +173,7 @@ (define cairo (package (name "cairo") (version "1.18.2") + (replacement cairo-1.18.4) (source (origin (method url-fetch) @@ -238,6 +240,19 @@ (define cairo ;; Hide and have cairo-with-documentation public. (properties '((hidden? . #t))))) +(define cairo-1.18.4 + (package + (inherit cairo) + (version "1.18.4") + (source + (origin + (method url-fetch) + (uri + (string-append "https://cairographics.org/releases/cairo-" + version ".tar.xz")) + (sha256 + (base32 "1jrcqfcna0358aqrk7rnys1hwq6k36ilr9r62bg26j3fi8hdhpj4")))))) + (define-public cairo-with-documentation ;; cairo's docs must be built in a separate package since it requires ;; gtk-doc, which in turn depends on cairo. base-commit: d0510dcd824e1b3fda62a8841e792581d7b8de8d -- 2.48.1
liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.Received: (at 76922) by debbugs.gnu.org; 12 Mar 2025 09:39:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Mar 12 05:39:46 2025 Received: from localhost ([127.0.0.1]:47386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tsIYz-0007K5-KJ for submit <at> debbugs.gnu.org; Wed, 12 Mar 2025 05:39:45 -0400 Received: from fout-b1-smtp.messagingengine.com ([202.12.124.144]:59387) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <remco@HIDDEN>) id 1tsIYw-0007Jn-7z for 76922 <at> debbugs.gnu.org; Wed, 12 Mar 2025 05:39:43 -0400 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id 48B701140225; Wed, 12 Mar 2025 05:39:36 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Wed, 12 Mar 2025 05:39:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=remworks.net; h= cc:cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1741772376; x=1741858776; bh=MzSKD1mI/n FWfW+Zbawvrhro74EZ5a1X73rjEIAcZWw=; b=WBH8Kk9YM6NO9P6mIatdgR/xMF bsDlVgC1qGs99f/Ogojs4S4FLok3nt+CXqqegTxqUdLULWu3o3fH4+AOJ+8+ILtr eT8PpW9eYXkDQArz12SrBvQz6B+C4dTpnWyzwqqwLakO+M1R7Ce9JuksHjZ7r5Kl Ciw/raq+a7QJaKYVh8RivchCSHgPVnsgwgtM+FhVPJanApjjhyvrg5l0c/RrTIzQ MfgH7Geh1Ax4uKK7jEWZYJh/aBztFJEelo3Hnw6X8AQp2vZWRVHE5QqI/YCrczqU BkOHgtXIGlB3H5e29NVc/tLvcfIQ5PIL2TVsZhrorC6H2PRNXEu+8jWgzIng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1741772376; x=1741858776; bh=MzSKD1mI/nFWfW+Zbawvrhro74EZ5a1X73r jEIAcZWw=; b=uNZj2IcCh6liha7k1npZY/rg6hqzd2WXvYZPW7QC3NLybA/RYZZ OGGZ5Jd+TaznVfhlrKeiJbS3H4anSVRonzuVFfEbTtgsay/wbzCZ8bon6YHBpJIC /7MYNFGVO2To5Dmo7vSM2/bU3NknPo1jT7xizw+mPK5Z3riEEkgSVVFUELPthdME 2WBmB3ikmiQ1fnzNCyDfz+MSEXkYObiQTF1yiJGdFgap5RvFNvv+rTnwxiDgjogi 6/iWOanQDylcWbhXtL1+Ay+Mx+P116zd4YTCeF/9CU3dkGYsFfIjZUitaHtMpq5b Phbh6VEZC6VCSb0oRBQ260uUWrNJXpg82EA== X-ME-Sender: <xms:V1bRZ_96DmUneM0JaDLCfnzbVoUGsVkE2lPYDPvApU9csWOwiAHCgA> <xme:V1bRZ7uUtdY0qRtQ1I0KDPt4ZdyaLAp1LUGb1aiZdzvDs6NQj_iRxOsKDHok5Xy3o 9RZcu5bR-mJa7h37A> X-ME-Received: <xmr:V1bRZ9CttMzTryNlyPi5PihOQwlYUReiM0wP9A3vLVl6ZngLbFoB8q9P_paF08GWgZ_I3-Yye6FlgLAzZLk2RIs5Sz1vjXisXoCQjwgmjis> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdegjeegucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefujghffgffkfggtgesthdtredttder tdenucfhrhhomheptfgvmhgtohcuvhgrnhcukdhtucggvggvrhcuoehrvghmtghosehrvg hmfihorhhkshdrnhgvtheqnecuggftrfgrthhtvghrnhepveevgfeujedttdelhfevgfeg heffjedvjeeltdeiueetgeeihfetvdekhfffueegnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheprhgvmhgtohesrhgvmhifohhrkhhsrdhnvght pdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehvih hvihgvnhesphhlrghnvghtvgdqkhhrrghushdrvghupdhrtghpthhtoheplhhilhhirghn rgdrphhrihhklhgvrhesghhmrghilhdrtghomhdprhgtphhtthhopeejieelvddvseguvg gssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepmhgrgihimhdrtghouhhrnhhohigv rhesghhmrghilhdrtghomh X-ME-Proxy: <xmx:V1bRZ7dNul1jEcsFF81VKHNiY6Aahq4Fl1YnFLtYY0T-eNuP3kJb9A> <xmx:V1bRZ0NFHd0nCShm2oZerDOTlYl5k99sklqeOI07H_gXcOWHIAPbJw> <xmx:V1bRZ9lLW-bGvQSHG_J9VeRv-0fvZnAJGBEakau5zRWa2UNKxWGL9Q> <xmx:V1bRZ-vSradjpJT7o9eDkXZSHYVEDDz4ebczMfFLQh4yhO7cnZp3xg> <xmx:WFbRZxq0UFkZ5xqUySA5CSDLwIfE4evSJCCJOO26c0PlSsgXqlpVU_KX> Feedback-ID: if0694934:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 12 Mar 2025 05:39:34 -0400 (EDT) From: Remco van 't Veer <remco@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#76922] [PATCH v2] gnu: cairo: Add patch to fix regression when writing PDFs with fonts In-Reply-To: <87h63zf5x3.fsf@HIDDEN> (Maxim Cournoyer's message of "Wed, 12 Mar 2025 09:28:56 +0900") References: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@HIDDEN> <dd428fda99674f95147a34e172d04f74514aa0f2.1741638557.git.remco@HIDDEN> <87h63zf5x3.fsf@HIDDEN> User-Agent: mu4e 1.12.9; emacs 29.4 Date: Wed, 12 Mar 2025 10:39:32 +0100 Message-ID: <874izyfuzv.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 76922 Cc: 76922 <at> debbugs.gnu.org, Vivien Kraus <vivien@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi, 2025/03/12, Maxim Cournoyer: > I've hit that bug too, it's an annoying one! Thanks for looking into > it. Your patch is fine, but I think we could also graft directly to > 1.18.4 since it's a patch version bump and should be compatible with the > 1.18.2 we have, per semver. Oh yes, that can work too. Just tried grafting with 1.18.4 and it does fix this problem in xournalpp. I'm not sure if it introduces others but it seems okay.. I'll make a v3. Cheers, Remco
guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.Received: (at 76922) by debbugs.gnu.org; 12 Mar 2025 00:29:19 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 11 20:29:19 2025 Received: from localhost ([127.0.0.1]:46384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ts9yJ-0003gC-6l for submit <at> debbugs.gnu.org; Tue, 11 Mar 2025 20:29:19 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:45220) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1ts9yG-0003fy-MB for 76922 <at> debbugs.gnu.org; Tue, 11 Mar 2025 20:29:17 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-22423adf751so90548745ad.2 for <76922 <at> debbugs.gnu.org>; Tue, 11 Mar 2025 17:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741739351; x=1742344151; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=TVvBHnIVNyVkm5jQWB0km3OptQeLO9gJzco1V0xXniI=; b=X4kyWxj2Ab7ddOe18bMyAn+6jbL/i0TQpokOiJQ1VYAtQsFRoWyIVc3/qa6Itw7B1B 8aUgOziuDQEQwabbAHQ/dh0etAx4hYzzwli4gRSnzJMcR56eHx9zdo4Ijqk3AsCceHyl UswcWndpxJMk1rXr0QhxUp8zklCdvsPU034vQDDpqLd5FrnDdzvTwA45/Y0YrL2tsclg yFvy8G8MNUD3PO5Z55pGhmCFgL4caclZxDwPLbt03GFqPIFw7yLLhztNSnGOvL1F4YlU S6izz0VGiF5+YAEwwfto+aWpQShnOfA06ck7dt7tejkojJj3pEhw2VBRr7M0G44ARrOM 9uHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741739351; x=1742344151; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TVvBHnIVNyVkm5jQWB0km3OptQeLO9gJzco1V0xXniI=; b=dEzMy5RdoCDW/altbWb82RLnb8oNFf0/rfDIYN0sovFV84sZTXyWEazxSWcaKe7xi+ aWKL3WYb7UjeNS0JdRq07gmethgXMPG5JdxCZfhvaFCa21oTtN/YBFRQKcaH1CHjBarP s/Gn2O3W2xtm1hi6oL2WGpNoKr4NNPHbyffoUyb0l+HgkV0BaUrdzF+KOihzfTpVtH+m xNO63lR9iYyFbioFyEjI51mG27FKE6Qh0NYtM1dVyXaJfSy2sbFCfXpB4P2VqjBYts52 9AbsdxR5QAZ0mg2+NF1zopQe8lw3U4MN0JdlObN4ITPqu/lHCj/ly+Q02VrfBYlAtGjo fgBg== X-Gm-Message-State: AOJu0Yx9axf4aJvSC7IcyQVTZKPbdwotuKhTLab1H6QnVTQUV3WUL7n8 DLiJ34Qhz0aSLKO17jP++dh5d3V8BMQEFb3Had53FyQjT9nkaqJi X-Gm-Gg: ASbGncst9wfqBuo4hkyNKIokLjnx3sFFmYevJKEMSk4PFwpm3e3hCbYJ9MXTS858qVs 96VsAnTUN6/N6CcvXBDRI96Am5yox3XV0qB6jKLb70sz+oc6ClI5iYr29U7446on24Xr+Lh3JrQ MBT1nmgrKSKWLSvys3T4ainXaV9FGCYBSWCQk/uRTceubRtjusVx4bJOx8zn4ifnuWwW35ojmdP 6be/7a1lwqWcQ2NL5NU6CyoaEtU1+4qH/UrKbcCYyUScdvtAVF9ACvziNeUjgEn0ymXrjfitKZY /u+qeoT35yWvnug341+/bbLkYiBZCe9QM2l+WyvmYN0= X-Google-Smtp-Source: AGHT+IG/306UEdgytwXXtM8sbm7feqsEBve36y3eFoDj1Snb7bkjfBIVNPbeZS/YfRq7mA9kJHXrwg== X-Received: by 2002:a17:903:2d1:b0:221:7b4a:476c with SMTP id d9443c01a7336-22592e2d657mr71159465ad.18.1741739350640; Tue, 11 Mar 2025 17:29:10 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3011926595dsm243692a91.33.2025.03.11.17.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 17:29:10 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Remco van 't Veer <remco@HIDDEN> Subject: Re: [bug#76922] [PATCH v2] gnu: cairo: Add patch to fix regression when writing PDFs with fonts In-Reply-To: <dd428fda99674f95147a34e172d04f74514aa0f2.1741638557.git.remco@HIDDEN> (Remco van t. Veer's message of "Mon, 10 Mar 2025 21:29:17 +0100") References: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@HIDDEN> <dd428fda99674f95147a34e172d04f74514aa0f2.1741638557.git.remco@HIDDEN> Date: Wed, 12 Mar 2025 09:28:56 +0900 Message-ID: <87h63zf5x3.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76922 Cc: 76922 <at> debbugs.gnu.org, Vivien Kraus <vivien@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Remco van 't Veer <remco@HIDDEN> writes: > 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. I've hit that bug too, it's an annoying one! Thanks for looking into it. Your patch is fine, but I think we could also graft directly to 1.18.4 since it's a patch version bump and should be compatible with the 1.18.2 we have, per semver. Reviewed-by: Maxim Cournoyer <maxim.cournoyer@HIDDEN> -- Thanks, Maxim
guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.Received: (at 76922) by debbugs.gnu.org; 12 Mar 2025 00:26:09 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 11 20:26:09 2025 Received: from localhost ([127.0.0.1]:46379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1ts9vE-0003bI-Uu for submit <at> debbugs.gnu.org; Tue, 11 Mar 2025 20:26:09 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:46259) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1ts9vC-0003an-3e for 76922 <at> debbugs.gnu.org; Tue, 11 Mar 2025 20:26:06 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-219f8263ae0so116412465ad.0 for <76922 <at> debbugs.gnu.org>; Tue, 11 Mar 2025 17:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741739160; x=1742343960; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cQei0YnF8dL0wz/b1NkYZMLrTmb3hukOKCCsrvbLSZI=; b=QRgmifVpinoa2CUlhKP+F1Ef0DqvzKzvZI8THr5xkqxzjZgKxYcuwvQiohQvDmDa1k 59XbSbbYsgmN/vfatejH+B6FrfDD/R0+TItP8lnxUZzSNx+qg3mEyj8Rf2MFRox9S04h WOt2ttfPq6J7siADBz6yJg0ojFNItUM6lbegkvfCrL+ISwmE3tGCnXfmnAJWwbE03m2p fXGn9WeAEnxalBsbk5E4sYUZ3OL0b4kJmGSmZ3+IVKeeRa0vffF8awFIc/MV3dfTeflr G0kNPFGMpZAwCd9aEZBiFTChfc7lEs/oBpLMW+8qo/D/mmi3KpWcw/6072sWndJbKsa0 J4NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741739160; x=1742343960; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cQei0YnF8dL0wz/b1NkYZMLrTmb3hukOKCCsrvbLSZI=; b=RG8GXZlw3y2SEzj8MoxBG1+wPHa3jg3vYB6VP7NhuTa+ujQieZp5720KgyD3isFH3U 2VXBKUuepwRJrsIUZXGYnM3GFs+0jeR4BN4BfrYU3tDgwRaN2Llu1QxDqtr77ZgreL5D vaCkPcckcP8vqTu5XlY+ZtWdewfcgjGGAdiS8ofrUD+Hpk8UC7wxJYKUc49lAILonE08 MiUgZiTRpb7txBawIliA98P2Q5jNHI41xMsF0yq0uP5LG3hL/Bf1+z9pDA2K9/5M7r24 U4GAu/41ml+9QdC6Lku99VUzIaZulpgU3ZM4YKa9N+GKhlMUcWUAmDYYwO69S123TTbW z1ew== X-Forwarded-Encrypted: i=1; AJvYcCWILwUZ2EZwXBHCPmvu3W/ngN3QvDU4IFdo4Edmw8xQMl5PnuT58dZ4p/6/+XP73fJZMg8UTg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YxRWOvpbtBRu6/nOAHD4eK/jiGZU28ek+bvdU0YDhnR2jA+lARI igtkfOkFZ8/f2wzz1XqSx2/oN3ACrtr6m916kTby1WxdxBqktqfu X-Gm-Gg: ASbGnctjhuBVbOGdSgWq6my+2Jd100MEGyobtlx33qo/n3pOaJ0PSYi5vHRnREzSZw9 d/cLSNOW3ET3qsOj+KyOxOHAd5TSnTj5DBbOhXqP4RdPnYa5iE3rSmSNRpQisJOW3UGQfNlNRed s4qkLng9quvGsoZBAfqpjYotFpVXvjxOU27m7+FeL5HJmAuwEjJnSobQoH47INKTVKnD2vVJctD XdLxNiF9C/T7UxjNdPO7xN0sHQsKOm6Zd3l+476ijekyYskjwC8OFYvPnnikLLSVaVr9HFizglr HhOjONtaK+PP41bVgr3+46GW2p9tlWZJf5/y54Q+0S8= X-Google-Smtp-Source: AGHT+IEHf1c1VQKriq0679EFY1wdB8fpDGR/HoiudDzzigYY4kHO+d2PLJaflycUJgoJ9jl2qGhpEQ== X-Received: by 2002:a17:902:c406:b0:220:c4e8:3b9f with SMTP id d9443c01a7336-22592d93a0cmr73543685ad.0.1741739159792; Tue, 11 Mar 2025 17:25:59 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-224109dd51bsm104192175ad.49.2025.03.11.17.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 17:25:59 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Liliana Marie Prikler <liliana.prikler@HIDDEN> Subject: Re: [bug#76922] [PATCH] gnu: cairo: Add patch to fix regression when writing PDFs with fonts In-Reply-To: <478ada27a9cb4bc518697d56945b5fb81aa25bbc.camel@HIDDEN> (Liliana Marie Prikler's message of "Mon, 10 Mar 2025 20:00:15 +0100") References: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@HIDDEN> <478ada27a9cb4bc518697d56945b5fb81aa25bbc.camel@HIDDEN> Date: Wed, 12 Mar 2025 09:25:46 +0900 Message-ID: <87ldtbf62d.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76922 Cc: 76922 <at> debbugs.gnu.org, Vivien Kraus <vivien@HIDDEN>, Remco van 't Veer <remco@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Liliana Marie Prikler <liliana.prikler@HIDDEN> writes: > Am Montag, dem 10.03.2025 um 17:15 +0100 schrieb Remco van 't Veer: >> Applied patch fixes out of memory errors when writing PDFs with fonts >> in xournalpp and others.=C2=A0 See also: >>=20 >> =C2=A0 https://gitlab.freedesktop.org/cairo/cairo/-/issues/870 >>=20 >> * 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. >>=20 >> Change-Id: Id6475d0ddb27208486bf41e18de72d116da110fb >> --- > Out of curiosity, how many packages do you need to rebuild with this > patch? It could well be that you'd need to use a graft. Too many (15k). I've hit that problem too. I'd suggest grafting to 1.18.4 directly instead of carrying patches. --=20 Thanks, Maxim
guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.Received: (at 76922) by debbugs.gnu.org; 10 Mar 2025 20:30:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 10 16:30:03 2025 Received: from localhost ([127.0.0.1]:40023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1trjl6-0001x2-5N for submit <at> debbugs.gnu.org; Mon, 10 Mar 2025 16:30:03 -0400 Received: from fhigh-a2-smtp.messagingengine.com ([103.168.172.153]:49297) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <rwv@HIDDEN>) id 1trjl0-0001wh-Hj for 76922 <at> debbugs.gnu.org; Mon, 10 Mar 2025 16:29:52 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id F36AF11401A4; Mon, 10 Mar 2025 16:29:44 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Mon, 10 Mar 2025 16:29:44 -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=1741638584; x=1741724984; bh=To EOop/fG1vDe9vpjkq43403ArdiSWlVXwXoybkpOBs=; b=l7RRLDszI7uMmNQob+ mjjpqs2sXV6XGGxlahWj/bkqf5P3fo4gdHBA4ms2v/NSqn8+3VG8jgGuTWglMzh9 4UBAzg+SvimTeV0zptC+Cz7RudFQb7FxIaWI6jsrvaVMg2YtDiZhbUKBO9YwYqL7 yCaalnXG4vDE+BGR+ONW37elD1+elR/szmtziMIo8AcPbOybkPYmAnqiYS5KKvzS 48W+1+5nq1JG5/q+ATumqPIEvU2hPfOQn+AR/fgX+IbbT19IgJD2D9enf7oLyRms 62eq15Q3mQRjCpdvncYgwD00dUnJ0LNNqpGytMrqwLh7eoUJrlFTMjdlpSLdO5R9 xNjA== 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=1741638584; x=1741724984; bh=ToEOop/fG1vDe9vpjkq43403Ardi SWlVXwXoybkpOBs=; b=DC9akZHwUtH3V15dzwPkK8dWvXjdhDmX7a2VfFSL/Hk/ 0vaJ1Fa0HKjGu20xUwaDSoOeRuyCw/DhsjxBQ3yhvcoVf9XDANfw+yzIBXknfqvG /WWH5UQ1l3WOgTqlWuA2hISMydL588Javs4VOc2FuTJWAfZqb5jjB+jC/3jcwnVo qjUs9RQrNsXOJ0oiAWEL2i/g74OzcFRHMgqyS2/U1dDlynH6CAjLwBxwYNrq51F8 N3Mv/V9ajGvHYOawY1joqfZQIPq7tOsp1hToCktVMgPuX1Nu+J9hQMAZdEJ39EPj rfyDlGFPMnIoS14Yh9Kvgg76kj3BPdX+8pYDXkYWQg== X-ME-Sender: <xms:uEvPZziZLywyaTGpzhJck6H1P8pwaFl2ceVAplJANxYk3ehCFb0V3w> <xme:uEvPZwCpgqvOqQEft0zgQ5M3ITzLdbq3j1Mr2IprNGonOFmIA5NFjkBhz4l_KSOFu EaXGGoVB0hGM-gsLA> X-ME-Received: <xmr:uEvPZzFN2C37OCiyJyrTiISKBiOg7oHhmZWc7dbIoC81U8RU5kwbGo-qlXQFll46kfa9wc_fTMBgu9ABFDfTG2upFO33hA> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvddtfeduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffogggtgfesthekredtredtjeenucfhrhhomheptfgvmhgtohcuvhgrnhcukdht ucggvggvrhcuoehrvghmtghosehrvghmfihorhhkshdrnhgvtheqnecuggftrfgrthhtvg hrnhepleekffeuffdvtdfhieegjeejgfehtdfhvdeltddvgeeuudeitdeiteetiefgkeev necuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhgnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprhifvhesfhgrshhtmhgrihhlrdgt ohhmpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhope ejieelvddvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheprhgvmhgtohes rhgvmhifohhrkhhsrdhnvght X-ME-Proxy: <xmx:uEvPZwRQgsZatbWw9v0Y-MOB0mTRIfxvE3UtHXQvSempZysv3uF1-A> <xmx:uEvPZwxuUxF4kc4tWNYEjMBK_IjfQui5t6NIK-CypAV43P3fkYEehw> <xmx:uEvPZ24_W7Hpur-3uG_QzJNMDUEkSTre07eZ9pSt3BarBtLF-w2o3g> <xmx:uEvPZ1xn3M5Mw0vrwRRwelVAMNE89k62kxZc6YXuUMip3vmeeZs_Jg> <xmx:uEvPZ7-woSUAoH8RG--HwrSIPFGW1tqzKONxFh1KkiyY-x3TmFDnAFnY> Feedback-ID: if0694934:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 10 Mar 2025 16:29:44 -0400 (EDT) From: Remco van 't Veer <remco@HIDDEN> To: 76922 <at> debbugs.gnu.org Subject: [PATCH v2] gnu: cairo: Add patch to fix regression when writing PDFs with fonts Date: Mon, 10 Mar 2025 21:29:17 +0100 Message-ID: <dd428fda99674f95147a34e172d04f74514aa0f2.1741638557.git.remco@HIDDEN> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 76922 Cc: Remco van 't Veer <remco@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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. --- gnu/local.mk | 3 +- gnu/packages/gtk.scm | 9 +++++ ...cairo-cff-dont-fail-if-no-local-subs.patch | 34 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cairo-cff-dont-fail-if-no-local-subs.patch 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 <andrew@HIDDEN> # Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN> # Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@HIDDEN> -# Copyright © 2022, 2024 Remco van 't Veer <remco@HIDDEN> +# Copyright © 2022, 2024, 2025 Remco van 't Veer <remco@HIDDEN> # Copyright © 2022, 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN> # Copyright © 2022, 2023 John Kehayias <john.kehayias@HIDDEN> # Copyright © 2022 muradm <mail@HIDDEN> @@ -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..09b1566e95 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@HIDDEN> ;;; Copyright © 2024 John Kehayias <john.kehayias@HIDDEN> ;;; Copyright © 2025 Florian Pelz <pelzflorian@HIDDEN> +;;; Copyright © 2025 Remco van 't Veer <remco@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -172,6 +173,7 @@ (define cairo (package (name "cairo") (version "1.18.2") + (replacement cairo-fixed) (source (origin (method url-fetch) @@ -238,6 +240,13 @@ (define cairo ;; Hide and have cairo-with-documentation public. (properties '((hidden? . #t))))) +(define cairo-fixed + (package + (inherit cairo) + (source (origin + (inherit (package-source cairo)) + (patches (search-patches "cairo-cff-dont-fail-if-no-local-subs.patch")))))) + (define-public cairo-with-documentation ;; cairo's docs must be built in a separate package since it requires ;; gtk-doc, which in turn depends on cairo. 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 <ajohnson@HIDDEN> +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 + base-commit: d0510dcd824e1b3fda62a8841e792581d7b8de8d -- 2.48.1
liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.Received: (at 76922) by debbugs.gnu.org; 10 Mar 2025 20:24:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 10 16:24:46 2025 Received: from localhost ([127.0.0.1]:40011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1trjg5-0001if-NS for submit <at> debbugs.gnu.org; Mon, 10 Mar 2025 16:24:45 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:53512) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1trjg3-0001iO-Rm for 76922 <at> debbugs.gnu.org; Mon, 10 Mar 2025 16:24:44 -0400 Received: by mail-wr1-x442.google.com with SMTP id ffacd0b85a97d-391342fc0b5so3998770f8f.3 for <76922 <at> debbugs.gnu.org>; Mon, 10 Mar 2025 13:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741638277; x=1742243077; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=1u72TUPGN3aUrDUVljW0t3xV6q8DlSyT1Gaopbkh8QM=; b=ksK0XY/T2QcLHIfLf0XVxpSKjt+34cFVuCURD8rQ/fwYUVGxi26opiLGHaIk+uK3wn F6pxp2HEtpnlcNRSujPa4SsqWYgvjbNvSxCSOTN3G0qbBhsTRVknPCrGxOmj79Zs6LPc yuK81CeZ4cwrFisq8KULDfF8RxbJyOuz/qu2nwgomEAK9wJTwuDguSkhwQqOL6/N8XpR ABv2iIOU6e66LwB9mLmT3qmE0TTZ5MFGGpXtKF0u+3FgL1TrnXooahzlHiTKpsJXlapZ ubTlUWrn4ahGTYjc2Ow6Pz11qh3MXCeTbNoezPIlB6QEz4alqQ0jFtf2ywEgV0IYyQiG NPVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741638277; x=1742243077; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1u72TUPGN3aUrDUVljW0t3xV6q8DlSyT1Gaopbkh8QM=; b=OBkyMTZ4Pht7+RvhvrHga2PLFrGa+bCFz52uM3BuhZWe8eemFFHK18f43Uq1llyiiC xZ8AS1ppKkN8X8kbt/CFq7M0ti74xkVSrQ7zy9DwY6zIkJWWeye6i8RMjTKTd7UAd3r6 +L1/IFTgPIvt/TsbrJyNQPyPIy8u5QnFyV8C4S1ZGoQmmIF6JMHbGreOJ+yGbmTp1HPe TiHamWhg2lzLjulM5wnSf6HDEeuV2SbxiELSNZRuGklbL2eW34ZmoJDuxvmD+yLLWKEL cK/GjKHIylxfn4e3UTfCmhnKIwMfMnLSDkHdb4UYnxtg3efMZbEmgi/ut2sV5RBIv5AI Y5dw== X-Gm-Message-State: AOJu0YxYNIJ4+83F+DbhC/LIn2azFBgbxH1ldNQ6YPN2Djli1tYYRePY CD+Pheiu6A/wquRA+2XTqD6+zgTAd4kFog0ZIR3kUflyJvgHtetf X-Gm-Gg: ASbGncsXpsHNYtyrdWC7SYaKI8cFmBJR3X+dlirAFBw7CLTpvu90CzhrGjKoiO5Vd4Y RsX0stpFV9pqpW16PtD6UNziNN8BPfq9Bm/wdn1tiDPTTIr9qysESpwdVH+gujz12EUGz7BcwzO rCwdFro6OMfgUZXrFmiaOw6nTiH5aN9kiBBdtgMCYc3HpzAiqU5xOg0nYd+gHtBZ8YHbfpm9hwf nApbdpzdz1rfS2jIEX/84KkPsJ6UiUhXIe5rHbVUeR7UMQworOmhpNTSxoIYTkk2A0zRV2U/Y2T KSMvTyxuQBmYjwgd5VLIiBRR4PVJVl3mjR5z5Fa2CNF69Xuy0zEI34J1FRzcKB37e7y+AFN/RuU 2+VgJ8rok2QZt7Ohcs+7I X-Google-Smtp-Source: AGHT+IE7oGSG0MDzcJNskM92ayYNt8cFfZJDkMEMSQjQ7MOL5UZ63lll5NKDfVbo69ZmbNAl5X10sw== X-Received: by 2002:a05:6000:2cb:b0:391:306f:57de with SMTP id ffacd0b85a97d-39132db1ac3mr14345749f8f.45.1741638276601; Mon, 10 Mar 2025 13:24:36 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfdfdfdsm16342284f8f.34.2025.03.10.13.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 13:24:36 -0700 (PDT) Message-ID: <147ec35543ca7bafacad24267729f52cf451e3c0.camel@HIDDEN> Subject: Re: [bug#76922] [PATCH] gnu: cairo: Add patch to fix regression when writing PDFs with fonts From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Remco van 't Veer <remco@HIDDEN> Date: Mon, 10 Mar 2025 21:25:45 +0100 In-Reply-To: <87ldtcfy3n.fsf@HIDDEN> References: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@HIDDEN> <478ada27a9cb4bc518697d56945b5fb81aa25bbc.camel@HIDDEN> <87ldtcfy3n.fsf@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.54.3 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76922 Cc: 76922 <at> debbugs.gnu.org, Vivien Kraus <vivien@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Am Montag, dem 10.03.2025 um 21:07 +0100 schrieb Remco van 't Veer: > =C2=A0 $ ./pre-inst-env guix refresh -l -e '(@@ (gnu packages gtk) cairo)= ' > | wc -w > =C2=A0 4279 >=20 > Would you like me to make a v2 and use a graft? Yes, please do. We can ungraft it later on core-packages-team, gnome- team, or a dedicated ungrafting branch. Cheers
guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.Received: (at 76922) by debbugs.gnu.org; 10 Mar 2025 20:08:08 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 10 16:08:08 2025 Received: from localhost ([127.0.0.1]:39987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1trjQ0-0000z7-9b for submit <at> debbugs.gnu.org; Mon, 10 Mar 2025 16:08:08 -0400 Received: from fhigh-a2-smtp.messagingengine.com ([103.168.172.153]:42503) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <remco@HIDDEN>) id 1trjPx-0000yY-JV for 76922 <at> debbugs.gnu.org; Mon, 10 Mar 2025 16:08:06 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 44A351140156; Mon, 10 Mar 2025 16:07:59 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Mon, 10 Mar 2025 16:07:59 -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:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1741637279; x=1741723679; bh=LDqgcMEHi3lGgz/XWDdaLeotjE181Vy44HrpSIgKKrA=; b= FGJrmS362T7qvN9wIxNB1bmO6BcjvIhU/qqhaTm/B/OPA7L5QG2U9r8Ayc6Hmh39 yzfBz1zlmXrfxag/FazaRfmIILJh7hT6s7sCodg1O3FggiJCZ/fqG5nI+q34A/4q QIxZninZO1KkYCH4HTNR2zImW4T6rugqTMieADd/rLeUnELg1d+9sWZwHedkYuIW l5R3m8yoC+GlkPeTPRy22VVr7XhkK5ZWPhTTrFrK8rCbF80nsJ/UhYWqfGt70R/d OGLp8zGg7GCxtCNmUzAXC8eKfYBaVs0cffgn39SrLWleoTIsVHUNHK4fLNuzzdpx ddyh1jJ5H538aG9JiuISKg== 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:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741637279; x= 1741723679; bh=LDqgcMEHi3lGgz/XWDdaLeotjE181Vy44HrpSIgKKrA=; b=N 2r9DnHzOzyFiPsLqzLdao4J/S9QTpaVzttJu+O4tDvrdPBb3Cl0l8+ODxlQuVh3H 1pWP+iprIigII0mJqbgeOEudQH0yuV3NuVatBK2Gm4pUAK1JKGupOT/dZdLyQUee CZYVW78J9B2YI7+P8WXIJiL718Uf8dVXcPIoD4Xf50Yhzx3VgxSjw3fZ5aytx9Cl GQGhiRrT7+0amBsM5XqLcGweQzpjnhyINL+Nnmuz4JJML6d1TaH4kDcbSU/H+kex V3KNHYGmpzotTpm787FEoXRCwL4Bu35o8pqijkXU4vfyfjUEsF+b0L8EhO9usQZo cvd5mWca2m5RYgDk1/CpQ== X-ME-Sender: <xms:nkbPZzKcQxq7dcjdxOXxFKHN_gH7lmEamShp6NRHTM9eW4aqWQjvjA> <xme:nkbPZ3KJLI9hV9Tg74N2f8RHgTgq9Mdo6v5h0sH_37U6Nx6NEEvW4bv3UbUyT3ry7 hWDJHLdgPyKD3JUYQ> X-ME-Received: <xmr:nkbPZ7tJ64HfE9YTz1i5dijlc6qx2laIj2qp0TcCW6Pd1Yf2dphuhLbuE9Zc-HEpU4B3koKZgqb5slXjMNQ5AhP4sTmskRedgfbmtlhKY1s> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvddtvdejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefujghffgffkfggtgfgsehtqhertddt reejnecuhfhrohhmpeftvghmtghouchvrghnucdkthcugggvvghruceorhgvmhgtohesrh gvmhifohhrkhhsrdhnvghtqeenucggtffrrghtthgvrhhnpeelvdeihfetueeivdetudeg ieeihfduhefgheehieejjeeivedvffelhfeigfetfeenucffohhmrghinhepfhhrvggvug gvshhkthhophdrohhrghdptghouggvsggvrhhgrdhorhhgnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomheprhgvmhgtohesrhgvmhifohhrkhhsrd hnvghtpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthho pehvihhvihgvnhesphhlrghnvghtvgdqkhhrrghushdrvghupdhrtghpthhtohepmhgrgi himhdrtghouhhrnhhohigvrhesghhmrghilhdrtghomhdprhgtphhtthhopeejieelvddv seguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtoheplhhilhhirghnrgdrphhrih hklhgvrhesghhmrghilhdrtghomh X-ME-Proxy: <xmx:nkbPZ8bSsxzjKeeLtDrNqehaPPAC9jPHfDFN1pIFNdsQiH0d5JD4uw> <xmx:nkbPZ6ZmugaTggqXrlHmyK18kd1AZLTPd_tUtWtly-b6fa-tpwFsPg> <xmx:nkbPZwB1hWt01Daw9GKgyn6KkYyqtMSLcpgKS6LzhQose0NxwRELLQ> <xmx:nkbPZ4Zijv1b1WJHZpb39_ZIYH06OekIQr50xpdoTt5-wvew4GJvUg> <xmx:n0bPZxV82-rVaxUVmOKTDIMl_zrZiXVOf45tJYMIXWBl4mhgZj03XBgd> Feedback-ID: if0694934:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 10 Mar 2025 16:07:57 -0400 (EDT) From: Remco van 't Veer <remco@HIDDEN> To: Liliana Marie Prikler <liliana.prikler@HIDDEN> Subject: Re: [bug#76922] [PATCH] gnu: cairo: Add patch to fix regression when writing PDFs with fonts In-Reply-To: <478ada27a9cb4bc518697d56945b5fb81aa25bbc.camel@HIDDEN> (Liliana Marie Prikler's message of "Mon, 10 Mar 2025 20:00:15 +0100") References: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@HIDDEN> <478ada27a9cb4bc518697d56945b5fb81aa25bbc.camel@HIDDEN> User-Agent: mu4e 1.12.9; emacs 29.4 Date: Mon, 10 Mar 2025 21:07:56 +0100 Message-ID: <87ldtcfy3n.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 76922 Cc: 76922 <at> debbugs.gnu.org, Vivien Kraus <vivien@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi, 2025/03/10, Liliana Marie Prikler: > Am Montag, dem 10.03.2025 um 17:15 +0100 schrieb Remco van 't Veer: >> Applied patch fixes out of memory errors when writing PDFs with fonts >> in xournalpp and others.=C2=A0 See also: >>=20 >> =C2=A0 https://gitlab.freedesktop.org/cairo/cairo/-/issues/870 >>=20 >> * 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. >>=20 >> Change-Id: Id6475d0ddb27208486bf41e18de72d116da110fb >> --- > Out of curiosity, how many packages do you need to rebuild with this > patch? It could well be that you'd need to use a graft. Yes you a probably right because I sent this patch after Ludo shooed me away when I made a PR on codeberg (https://codeberg.org/civodul/guix/pulls/17#issuecomment-2995653). $ ./pre-inst-env guix refresh -l -e '(@@ (gnu packages gtk) cairo)' | wc = -w 4279 Would you like me to make a v2 and use a graft? Cheers, Remco
guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.Received: (at 76922) by debbugs.gnu.org; 10 Mar 2025 18:59:17 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 10 14:59:17 2025 Received: from localhost ([127.0.0.1]:39791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1triLN-0002vl-0R for submit <at> debbugs.gnu.org; Mon, 10 Mar 2025 14:59:17 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:49547) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1triLK-0002vT-1B for 76922 <at> debbugs.gnu.org; Mon, 10 Mar 2025 14:59:14 -0400 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso12397705e9.3 for <76922 <at> debbugs.gnu.org>; Mon, 10 Mar 2025 11:59:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741633147; x=1742237947; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=fC2W3ZkND+hVmHDiAR1hw4CdRYl3G86s600Mfcoij8M=; b=TZsA1wl5EIvl3d+FM6/f/Z+Qn/6jPYFC3hp1NqrXzs4oStqQ4hS6o78+lnds/PpjVf xJZxpCiuWw8hwHRtbboKUbhWUz5TLnO2yBxiCBuZ8r4MubvrVLDFQbuRM92LBZiPBRUg OvWoBkG5ZJ1hQ3SLPOxNyR/ajmq3mM2gZifLxW8wq+ZhBgs7Ah1fcbUI5j2EC37oRxpd qgQY78FOcJFjK98MnP+xqlDfGiuagbqHQkIA5vedkaIS1EQTqFbvhrKLxrFbc5dhhwjs R40Jl8bYoPfuS22AskgBhRARbeeyAHO6iN7qzeV0JenN8rw4L2f+PLsWj8Miyl9ES12j KR1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741633147; x=1742237947; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fC2W3ZkND+hVmHDiAR1hw4CdRYl3G86s600Mfcoij8M=; b=fGStUyLS6xs8KeEFV6S8WGJw77SVLNdOp8hGain6j1KGKIuX19SR+42e6mYGpQZbX/ 1vSXb6rO/aOq1k4kYrqCb50TCFe6DBJmmsmi6e1q9fhfqHGs4NagRcaLM/ZSCWOvYWUR HbWj7GVt0+FxNNkJBOoc1blNxN6hlEayzUNHs0UEeBFWTdcgF/lGGpfLZ5pB+n7TPmr1 OnVNPy5M3r2yswSFqyPdgGILrFoqCKMmpSkDTFriqnOS2e1I5G1VwQHcV/2CaEBRiUxc qd0sKxdDDt+mO2prKvUMDND4wRLl9ZZxCTARa76gfU+f6x+O+dYoHUs5EDCUDXPIUpiy rlxw== X-Forwarded-Encrypted: i=1; AJvYcCXvSzkx6Fj/RQJYb9543G70Zqe1i1XnhTDTXM4V6+Fycw0CJDkYewYX8ezumD/NnNpwiicatA==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yz67363FwBgqv9gTIuFN4hVUtRHXsoO+Uy/9gKiW4jKQlDTs/Q7 bDwCgsXn0MdCfHDtyivsuWXIFEn6sWtem3pab78auHR01GUK7AqW X-Gm-Gg: ASbGncvwk57cV6SN+kZ6MVD3t+57vmEwjW+gPdqdjQJpv7f9u4sczIFY0CJNVfGmtWL IgRqlmNXlvW6p9WBkBEdzhU1kg5AKGLXEd//cjqXyC4f7qN9N+GAIEVVCbzDJvy9GbCBjdkCN5Z ly/IuO7yUi0GU96m2X+hEfLFt/BZtY+zHjUMeefXzYx24DyXhcgfwT409PCrnC21DZ/pG9eeJzc zkw0wsBnfDT3/pnbAvGZEQGNImUivSVPwwbN3Cp2c7j1uRuwjbeePHIY9TvQiqru8dXfblebS2H 33+GpU6MUavjpfmNyRxn4tsIohBiq+NxvhbCvpRTN5mEmbdUPfTBmxsBNBGi20ubh2EGdS7uwjV /vTJwCNodfuB0fUii44Q95jLBfUwzT44= X-Google-Smtp-Source: AGHT+IFOZp8BAAC4WzTnP1k/kpLRlSzsrbU2pGQ21UzLzZv9sYksIiTbeXuTj84agEHDnNRbVEfQGg== X-Received: by 2002:a05:600c:3148:b0:43b:cd0d:9457 with SMTP id 5b1f17b1804b1-43c601d901dmr115245565e9.10.1741633147229; Mon, 10 Mar 2025 11:59:07 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cfac24345sm36335555e9.22.2025.03.10.11.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 11:59:06 -0700 (PDT) Message-ID: <478ada27a9cb4bc518697d56945b5fb81aa25bbc.camel@HIDDEN> Subject: Re: [bug#76922] [PATCH] gnu: cairo: Add patch to fix regression when writing PDFs with fonts From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Remco van 't Veer <remco@HIDDEN>, 76922 <at> debbugs.gnu.org Date: Mon, 10 Mar 2025 20:00:15 +0100 In-Reply-To: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@HIDDEN> References: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.54.3 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76922 Cc: Vivien Kraus <vivien@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Am Montag, dem 10.03.2025 um 17:15 +0100 schrieb Remco van 't Veer: > Applied patch fixes out of memory errors when writing PDFs with fonts > in xournalpp and others.=C2=A0 See also: >=20 > =C2=A0 https://gitlab.freedesktop.org/cairo/cairo/-/issues/870 >=20 > * 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. >=20 > Change-Id: Id6475d0ddb27208486bf41e18de72d116da110fb > --- Out of curiosity, how many packages do you need to rebuild with this patch? It could well be that you'd need to use a graft. Cheers
guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 10 Mar 2025 16:17:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 10 12:17:03 2025 Received: from localhost ([127.0.0.1]:39458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1trfoE-0003m6-22 for submit <at> 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 <rwv@HIDDEN>) id 1trfo9-0003lo-9P for submit <at> 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 <rwv@HIDDEN>) id 1trfo0-0004sj-EF for guix-patches@HIDDEN; 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 <rwv@HIDDEN>) id 1trfnw-00018L-V2 for guix-patches@HIDDEN; 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: <xms:XxDPZ4u70bVhzRhdZqo6PucfoX16UgUCRItc1SPbXA3F3ZpBBYGn4A> <xme:XxDPZ1fY5Y6nRseobLnA4Ek00ZAMT0u7HruM4fPsNnDTNuX54IPD0uKzPKZGlSK0j 0w1FqSmhUBCQ14BPg> X-ME-Received: <xmr:XxDPZzyfzzGykQkv5uJBi5jtZUKKrTour4M1s6rqB9DbRJ_CEPviqSYynq55gNpBZHHpNdPYi2qvALPx8FE1-W6E-gVtJg> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduudelkeduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffogggtgfesthekredtredtjeenucfhrhhomheptfgvmhgtohcuvhgrnhcukdht ucggvggvrhcuoehrvghmtghosehrvghmfihorhhkshdrnhgvtheqnecuggftrfgrthhtvg hrnhepudegheelgfefhfehffeivdeghefgfeeutdefgfeuvdefueejgfeihedukeeuffdt necuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhgpdgtrghirhhoghhrrghphh hitghsrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhf rhhomheprhifvhesfhgrshhtmhgrihhlrdgtohhmpdhnsggprhgtphhtthhopedvpdhmoh guvgepshhmthhpohhuthdprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdr ohhrghdprhgtphhtthhopehrvghmtghosehrvghmfihorhhkshdrnhgvth X-ME-Proxy: <xmx:XxDPZ7MgqtZlDu_7GvKvgsY7InD2RwXnXswLT7QjgQiUoD5Nz3SU6A> <xmx:YBDPZ4-CGNsgnVma0iMEY_sXpd4NDB8k601kcU_JF_tkIsdLJGfMkA> <xmx:YBDPZzWtdi0nW8uPanweMSFFsZPjD6K9KUqakVfrn9aBHtf6wB-j2Q> <xmx:YBDPZxfvnhBO6LGj_4MiDqDKgr6g2bQ72c67HFxrCjWhSpHSqIDSYw> <xmx:YBDPZ6KyteMdB9kwr2GMKnH4rWLy_hvSJo7BrlgCFxOrb9r4AQNPGwQc> 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 <remco@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] gnu: cairo: Add patch to fix regression when writing PDFs with fonts Date: Mon, 10 Mar 2025 17:15:46 +0100 Message-ID: <0c2940ccdd7385f152c922af72bebad2f8d03a49.1741623346.git.remco@HIDDEN> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler <liliana.prikler@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Vivien Kraus <vivien@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=202.12.124.150; envelope-from=rwv@HIDDEN; 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-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Remco van 't Veer <remco@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) 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 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 <andrew@HIDDEN> # Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN> # Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@HIDDEN> -# Copyright © 2022, 2024 Remco van 't Veer <remco@HIDDEN> +# Copyright © 2022, 2024, 2025 Remco van 't Veer <remco@HIDDEN> # Copyright © 2022, 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN> # Copyright © 2022, 2023 John Kehayias <john.kehayias@HIDDEN> # Copyright © 2022 muradm <mail@HIDDEN> @@ -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 <janneke@HIDDEN> ;;; Copyright © 2024 John Kehayias <john.kehayias@HIDDEN> ;;; Copyright © 2025 Florian Pelz <pelzflorian@HIDDEN> +;;; Copyright © 2025 Remco van 't Veer <remco@HIDDEN> ;;; ;;; 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 <ajohnson@HIDDEN> +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 + base-commit: d0510dcd824e1b3fda62a8841e792581d7b8de8d -- 2.48.1
Remco van 't Veer <remco@HIDDEN>
:liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
.
Full text available.liliana.prikler@HIDDEN, maxim.cournoyer@HIDDEN, vivien@HIDDEN, guix-patches@HIDDEN
:bug#76922
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.