From patchwork Sun Feb 16 00:34:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38713 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 B04E727BBE2; Sun, 16 Feb 2025 00:41:45 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 D9C5627BBEA for ; Sun, 16 Feb 2025 00:41:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjShy-0006No-4z; Sat, 15 Feb 2025 19:40:30 -0500 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 1tjShi-00067e-CV for guix-patches@gnu.org; Sat, 15 Feb 2025 19:40:14 -0500 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 1tjShi-00031C-1H for guix-patches@gnu.org; Sat, 15 Feb 2025 19:40:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=52yOh4I98drll2X3+SDhRBDueA/VPa6zx6gZfvzn0vY=; b=U8xeLHGxje9tPNEfONiN9sKkVFc+4nmwo0qVzY3no7+7kH60x3CkCTwH6yPC09zQuJ9/oYZPAxvAeukddbsC2vq2QQ9wFA+kWZ1Sj63fsAUc2/SVhkfdt+XE1nwM/Pu47k9+V5EK9HBVoJo4ntChJG3tIub0tqqxJ4Fem/lOw0vYuNyTXdqU4IZTHGNfxEpKR0SRFO1uCmg5ZRRppFnciWUCp38dEjq9fmrWnvprJBApYTDMHqKcTdxa7UYIP0JQHG5iVemu4j4vh4N9PQd0wwc3LP+63A+LhVoj5cW/cguhj0AZVZ3tG+tf1y78LcFcFuJozMN6oDfLbakkMK5RHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjShh-0004On-Re for guix-patches@gnu.org; Sat, 15 Feb 2025 19:40:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76314] [PATCH ruby-team 70/71] gnu: ruby-asciidoctor-pdf: Update to 2.3.19. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2025 00:40:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76314@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 76314-submit@debbugs.gnu.org id=B76314.173966635316586 (code B ref 76314); Sun, 16 Feb 2025 00:40:13 +0000 Received: (at 76314) by debbugs.gnu.org; 16 Feb 2025 00:39:13 +0000 Received: from localhost ([127.0.0.1]:58951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjSgi-0004JM-O8 for submit@debbugs.gnu.org; Sat, 15 Feb 2025 19:39:13 -0500 Received: from 8.mo561.mail-out.ovh.net ([87.98.172.249]:35547) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tjSf5-00048x-CC for 76314@debbugs.gnu.org; Sat, 15 Feb 2025 19:37:32 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.9.101]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4YwRh96dJ9z1LHX for <76314@debbugs.gnu.org>; Sun, 16 Feb 2025 00:37:29 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-92c24 (unknown [10.111.174.14]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 837501FE10; Sun, 16 Feb 2025 00:37:29 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-5b5ff79f4f-92c24 with ESMTPSA id tnObDEkzsWf3FgAA3mKVzg (envelope-from ); Sun, 16 Feb 2025 00:37:29 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G0016f9aa6e6-849e-4d27-a8d1-3135473fd15d, 9A8994E2D2D994E918F063C652E1CB4623A3A71F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.137.22 Date: Sun, 16 Feb 2025 01:34:38 +0100 Message-ID: <20250216003503.6348-70-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250216003503.6348-1-ngraves@ngraves.fr> References: <20250216003503.6348-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3695484969658147554 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdehgedtvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeejlefgvdetheffveevhfeugfffiedvfeffkedvudekvdfgveefudefvdefjeefkeenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhprghgvghsrdhtohdplhhinhgvshdrthhopdhimhgrghgvshdrthhonecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufeejrddvvddpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieefudegseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=52yOh4I98drll2X3+SDhRBDueA/VPa6zx6gZfvzn0vY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739666250; v=1; b=iQBvIXHcHiAOJWbhR0biIYjsP/sTSoWoUiuJHyLdvMwrayx/r10bPmBC/PRQ9K+9KFTtLWEq JdFnsQscTlmm0T/4qLjo8uTfPWbJNlyC4gzOimZuThXmaDIZo5KI+sAqt/iR8JKu2hK/VEft8jM JGlK6NAKtvLTou6mR9eBS5Xv4XVRLVg0kTG7cpXLC91dSGsR4kPo+iDJN4WC9EjufLAqO8UuVWA kVe2G42xvW2EP//HCNZz5xGVk0iuI0IHrha7s9s2nV5Bm9hO7ElltnbHfF5Do6xtRziZSvKO4D5 tu9/OOb2DyXkEnXRfTS0UREtr5JFEW9IUMuBaLXwal7bw== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/ruby.scm (ruby-asciidoctor-pdf): Update to 2.3.19. [origin]: Record patch. [arguments]<#:phases>: Remove 'strip-version-requirements phase. [propagated-inputs]: Remove old dependencies ruby-open-uri-cached, ruby-safe-yaml, ruby-thread-safe. * gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch: Add patch. * gnu/local.mk: Record patch. --- gnu/local.mk | 1 + ...ciidoctor-pdf-support-prawn-svg-0_36.patch | 107 ++++++++++++++++++ gnu/packages/ruby.scm | 15 +-- 3 files changed, 113 insertions(+), 10 deletions(-) create mode 100644 gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch diff --git a/gnu/local.mk b/gnu/local.mk index a6e10263ff..9bcf469a11 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2179,6 +2179,7 @@ dist_patch_DATA = \ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \ %D%/packages/patches/rottlog-direntry.patch \ %D%/packages/patches/ruby-actionpack-remove-browser-tests.patch \ + %D%/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch \ %D%/packages/patches/ruby-hiredis-use-system-hiredis.patch \ %D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \ %D%/packages/patches/ruby-anystyle-data-immutable-install.patch \ diff --git a/gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch b/gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch new file mode 100644 index 0000000000..2f616e1c0d --- /dev/null +++ b/gnu/packages/patches/ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch @@ -0,0 +1,107 @@ +From b5240141cde2a6428cb84d792991294c84f9f530 Mon Sep 17 00:00:00 2001 +From: Fethbita +Date: Tue, 7 Jan 2025 16:20:31 +0200 +Subject: [PATCH] Update prawn-svg to 0.36.0 +https://github.com/asciidoctor/asciidoctor-pdf/pull/2553 + +--- + asciidoctor-pdf.gemspec | 4 ++-- + spec/admonition_spec.rb | 4 ++-- + spec/cover_page_spec.rb | 2 +- + spec/image_spec.rb | 2 +- + spec/page_spec.rb | 2 +- + spec/running_content_spec.rb | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/asciidoctor-pdf.gemspec b/asciidoctor-pdf.gemspec +index 997e260e..c09a110d 100644 +--- a/asciidoctor-pdf.gemspec ++++ b/asciidoctor-pdf.gemspec +@@ -39,8 +39,8 @@ Gem::Specification.new do |s| + s.add_runtime_dependency 'matrix', '~> 0.4' # required until prawn >= 2.5.0 is released + s.add_runtime_dependency 'prawn-table', '~> 0.2.0' + s.add_runtime_dependency 'prawn-templates', '~> 0.1.0' +- s.add_runtime_dependency 'prawn-svg', '~> 0.34.0' +- s.add_runtime_dependency 'prawn-icon', '~> 3.0.0' ++ s.add_runtime_dependency 'prawn-svg', '~> 0.36.0' ++ s.add_runtime_dependency 'prawn-icon', '~> 3.1.0' + s.add_runtime_dependency 'concurrent-ruby', '~> 1.1' + s.add_runtime_dependency 'treetop', '~> 1.6.0' + +diff --git a/spec/admonition_spec.rb b/spec/admonition_spec.rb +index 0131a097..ca3eb74a 100644 +--- a/spec/admonition_spec.rb ++++ b/spec/admonition_spec.rb +@@ -709,7 +709,7 @@ + label_text = pdf.find_unique_text 'TIP' + (expect label_text).not_to be_nil + (expect label_text[:font_name]).to include 'Bold' +- end).to log_message severity: :WARN, message: %(~could not embed admonition icon image: #{fixture_file 'broken.svg'}; Missing end tag for 'rect') ++ end).to log_message severity: :WARN, message: %(~could not embed admonition icon image: #{fixture_file 'broken.svg'}; The data supplied is not a valid SVG document.) + end + + it 'should resize fallback admonition label to fit in available space if icon fails to embed' do +@@ -726,7 +726,7 @@ + label_text = pdf.find_unique_text 'WARNING' + (expect label_text).not_to be_nil + (expect label_text[:font_size]).to be < 10.5 +- end).to log_message severity: :WARN, message: %(~could not embed admonition icon image: #{fixture_file 'broken.svg'}; Missing end tag for 'rect') ++ end).to log_message severity: :WARN, message: %(~could not embed admonition icon image: #{fixture_file 'broken.svg'}; The data supplied is not a valid SVG document.) + end + + # NOTE: this test also verifies the text transform is applied as requested by theme +diff --git a/spec/cover_page_spec.rb b/spec/cover_page_spec.rb +index bd487eb1..cd034120 100644 +--- a/spec/cover_page_spec.rb ++++ b/spec/cover_page_spec.rb +@@ -75,7 +75,7 @@ + + (expect pdf.pages).to have_size 1 + (expect pdf.lines pdf.find_text page_number: 1).to eql ['content page'] +- end).to log_message severity: :WARN, message: %(~could not embed front cover image: #{fixture_file 'broken.svg'}; Missing end tag for 'rect') ++ end).to log_message severity: :WARN, message: %(~could not embed front cover image: #{fixture_file 'broken.svg'}; The data supplied is not a valid SVG document.) + end + + it 'should not add cover page if value is ~' do +diff --git a/spec/image_spec.rb b/spec/image_spec.rb +index c6c83e96..7c97c54b 100644 +--- a/spec/image_spec.rb ++++ b/spec/image_spec.rb +@@ -1084,7 +1084,7 @@ def traverse node + (expect do + pdf = to_pdf %(image#{macro_delim}broken.svg[Broken SVG]), analyze: true + (expect pdf.lines).to eql [alt_text] +- end).to log_message severity: :WARN, message: %(~could not embed image: #{fixture_file 'broken.svg'}; Missing end tag for 'rect') ++ end).to log_message severity: :WARN, message: %(~could not embed image: #{fixture_file 'broken.svg'}; The data supplied is not a valid SVG document.) + end + end + +diff --git a/spec/page_spec.rb b/spec/page_spec.rb +index 261c4ca1..2b01fa7d 100644 +--- a/spec/page_spec.rb ++++ b/spec/page_spec.rb +@@ -1698,7 +1698,7 @@ + content + EOS + (expect pdf.images).to be_empty +- end).to log_message severity: :WARN, message: %(~Missing end tag for 'rect') ++ end).to log_message severity: :WARN, message: %(~The data supplied is not a valid SVG document.) + end + + it 'should only warn once if background image cannot be loaded' do +diff --git a/spec/running_content_spec.rb b/spec/running_content_spec.rb +index 8e1264dd..7196bde8 100644 +--- a/spec/running_content_spec.rb ++++ b/spec/running_content_spec.rb +@@ -3046,7 +3046,7 @@ + pdf = to_pdf 'body', analyze: true, pdf_theme: pdf_theme, enable_footer: true + footer_text = pdf.find_unique_text font_color: '0000FF' + (expect footer_text[:string]).to eql '[no worky]' +- end).to log_message severity: :WARN, message: %(~could not embed image in running content: #{fixture_file 'broken.svg'}; Missing end tag for 'rect') ++ end).to log_message severity: :WARN, message: %(~could not embed image in running content: #{fixture_file 'broken.svg'}; The data supplied is not a valid SVG document.) + end + + it 'should resolve attribute references in target of inline image' do +-- +2.47.1 + diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 76911896a8..8ba81397f5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2502,7 +2502,7 @@ web pages.") (define-public ruby-asciidoctor-pdf (package (name "ruby-asciidoctor-pdf") - (version "2.3.4") + (version "2.3.19") (source (origin (method git-fetch) ;no test suite in the distributed gem @@ -2512,18 +2512,16 @@ web pages.") (file-name (git-file-name name version)) (sha256 (base32 - "07krhpj2ylz7h7hy8vg0js8yv828qxh3mkhx0bsrfh0p24xwbjrm")))) + "1l8my8jj4aww2yad80n6f7hs76lq5gicld8dy014pw90pk3x43mp")) + (patches + (search-patches + "ruby-asciidoctor-pdf-support-prawn-svg-0_36.patch")))) (build-system ruby-build-system) (arguments (list #:test-target "spec" #:phases #~(modify-phases %standard-phases - (add-after 'extract-gemspec 'strip-version-requirements - (lambda _ - (substitute* "asciidoctor-pdf.gemspec" - (("(.*add_.*dependency '[_A-Za-z0-9-]+').*" _ stripped) - (string-append stripped "\n"))))) ;; The tests rely on the Gem being installed, so move the check ;; phase after the install phase. (delete 'check) @@ -2544,15 +2542,12 @@ web pages.") (propagated-inputs (list ruby-asciidoctor ruby-concurrent - ruby-open-uri-cached ruby-prawn ruby-prawn-icon ruby-prawn-svg ruby-prawn-table ruby-prawn-templates - ruby-safe-yaml ruby-text-hyphen - ruby-thread-safe ruby-treetop ruby-ttfunk)) (synopsis"AsciiDoc to Portable Document Format (PDF)} converter")