~ruther/guix-local

b41fce9fa8196123dd1820fa48761b081b0583b2 — Ricardo Wurmus 1 year, 3 months ago 3dc4c7d
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
3 files changed, 4 insertions(+), 47 deletions(-)

M gnu/local.mk
D gnu/packages/patches/pdfpc-build-with-vala-0.56.patch
M gnu/packages/pdf.scm
M gnu/local.mk => gnu/local.mk +0 -1
@@ 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 \

D gnu/packages/patches/pdfpc-build-with-vala-0.56.patch => gnu/packages/patches/pdfpc-build-with-vala-0.56.patch +0 -40
@@ 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 <fnevgeny@gmail.com>
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<DrawingCommand>();
-            this.redo_commands = new List<DrawingCommand>();
+            this.drawing_commands = new List<DrawingCommand?>();
+            this.redo_commands = new List<DrawingCommand?>();
         }
 
         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<DrawingCommand>(); // clear
+            this.redo_commands = new List<DrawingCommand?>(); // clear
 
             bool new_path = true;
             double epsilon = 1e-4; // Less than 0.1 pixel for a 1000x1000 img
-- 
2.41.0


M gnu/packages/pdf.scm => gnu/packages/pdf.scm +4 -6
@@ 1,7 1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2021, 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2021, 2024, 2025 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 Nikita <nikita@n0.is>


@@ 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/")