From b41fce9fa8196123dd1820fa48761b081b0583b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 16 Mar 2025 11:40:20 +0100 Subject: [PATCH] gnu: pdfpc: Update to 4.7.0. * gnu/packages/patches/pdfpc-build-with-vala-0.56.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove patch. * gnu/packages/pdf.scm (pdfpc): Update to 4.7.0. [source]: Remove obsolete patch. [inputs]: Replace webkitgtk-with-libsoup2 with webkitgtk-for-gtk3. Change-Id: I9ecbf8fd878fe1be943e12085ae2a01a881df744 --- gnu/local.mk | 1 - .../patches/pdfpc-build-with-vala-0.56.patch | 40 ------------------- gnu/packages/pdf.scm | 10 ++--- 3 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 gnu/packages/patches/pdfpc-build-with-vala-0.56.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8dfaf669476..415f3fdd66f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1988,7 +1988,6 @@ dist_patch_DATA = \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/password-store-tree-compat.patch \ %D%/packages/patches/pciutils-hurd64.patch \ - %D%/packages/patches/pdfpc-build-with-vala-0.56.patch \ %D%/packages/patches/pdl-2.019-glut-bitmap-fonts.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ diff --git a/gnu/packages/patches/pdfpc-build-with-vala-0.56.patch b/gnu/packages/patches/pdfpc-build-with-vala-0.56.patch deleted file mode 100644 index e9a40602485..00000000000 --- a/gnu/packages/patches/pdfpc-build-with-vala-0.56.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768 Mon Sep 17 00:00:00 2001 -Message-ID: <18beaecbbcc066e0d4c889b3aa3ecaa7351f7768.1711183363.git.vivien@planete-kraus.eu> -From: Evgeny Stambulchik -Date: Tue, 25 Apr 2023 16:11:25 +0300 -Subject: [PATCH] Create Lists of nullable types - ---- -This is the pull request for issue 686, merged in master, not released -yet. - - src/classes/drawings/drawing_commands.vala | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/classes/drawings/drawing_commands.vala b/src/classes/drawings/drawing_commands.vala -index 77e56e6..c305a8c 100644 ---- a/src/classes/drawings/drawing_commands.vala -+++ b/src/classes/drawings/drawing_commands.vala -@@ -54,8 +54,8 @@ namespace pdfpc { - } - - public void clear() { -- this.drawing_commands = new List(); -- this.redo_commands = new List(); -+ this.drawing_commands = new List(); -+ this.redo_commands = new List(); - } - - public void add_line(bool is_eraser, -@@ -70,7 +70,7 @@ namespace pdfpc { - - // After adding a new line you can no longer redo the old - // path. -- this.redo_commands = new List(); // clear -+ this.redo_commands = new List(); // clear - - bool new_path = true; - double epsilon = 1e-4; // Less than 0.1 pixel for a 1000x1000 img --- -2.41.0 - diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index de6df8da93e..0c3a0dde1b9 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2016 Andreas Enge ;;; Copyright © 2014 Mark H Weaver -;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2021, 2024 Ricardo Wurmus +;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2021, 2024, 2025 Ricardo Wurmus ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Nikita @@ -1554,7 +1554,7 @@ multiple files.") (define-public pdfpc (package (name "pdfpc") - (version "4.6.0") + (version "4.7.0") (source (origin (method git-fetch) @@ -1563,9 +1563,7 @@ multiple files.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kj84sf5hgr2v2ra6dxmxqcr173h17cpnhg9lcq36shdbdnncwg4")) - (patches - (search-patches "pdfpc-build-with-vala-0.56.patch")))) + (base32 "1sx3ivnwyfr32hf1424aafpljhq5nm6pngl2zhvjsb24gnp45y3w")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test target (inputs (list @@ -1580,7 +1578,7 @@ multiple files.") poppler pango vala - webkitgtk-with-libsoup2)) + webkitgtk-for-gtk3)) (native-inputs (list pkg-config)) (home-page "https://pdfpc.github.io/")