GNU bug report logs - #69958
[PATCH gnome-team] gnu: pdfpc: Fix build with vala 0.56.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69958 in the body.
You can then email your comments to 69958 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team] gnu: pdfpc: Fix build with vala 0.56.
Date: Sat, 23 Mar 2024 09:45:17 +0100

* gnu/packages/patches/pdfpc-build-with-vala-0.56.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/pdf.scm (pdfpc): Use it here.
[inputs]: Drop labels.

Change-Id: Ib762da3dd23612f952215a2f8d383552e7bc050c
---
Dear Guix,

Pdfpc does not have a new release yet, but its master branch can now build
with vala 0.56.

What do you think?

Best regards,

Vivien

 gnu/local.mk                                  |  1 +
 .../patches/pdfpc-build-with-vala-0.56.patch  | 40 +++++++++++++++++++
 gnu/packages/pdf.scm                          | 30 +++++++-------
 3 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 gnu/packages/patches/pdfpc-build-with-vala-0.56.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2ea9806b7e..5cc134d3d3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1795,6 +1795,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/pam-krb5-CVE-2020-10595.patch		\
   %D%/packages/patches/pango-skip-libthai-test.patch		\
   %D%/packages/patches/password-store-tree-compat.patch		\
+  %D%/packages/patches/pdfpc-build-with-vala-0.56.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%/packages/patches/plasp-fix-normalization.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
new file mode 100644
index 0000000000..e9a4060248
--- /dev/null
+++ b/gnu/packages/patches/pdfpc-build-with-vala-0.56.patch
@@ -0,0 +1,40 @@
+From 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768 Mon Sep 17 00:00:00 2001
+Message-ID: <18beaecbbcc066e0d4c889b3aa3ecaa7351f7768.1711183363.git.vivien <at> planete-kraus.eu>
+From: Evgeny Stambulchik <fnevgeny <at> 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
+
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 36ebf8547d..44187c192c 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -1526,22 +1526,24 @@ (define-public pdfpc
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0kj84sf5hgr2v2ra6dxmxqcr173h17cpnhg9lcq36shdbdnncwg4"))))
+        (base32 "0kj84sf5hgr2v2ra6dxmxqcr173h17cpnhg9lcq36shdbdnncwg4"))
+       (patches
+        (search-patches "pdfpc-build-with-vala-0.56.patch"))))
     (build-system cmake-build-system)
     (arguments '(#:tests? #f))           ; no test target
-    (inputs
-     `(("cairo" ,cairo)
-       ("discount" ,discount) ; libmarkdown
-       ("qrencode" ,qrencode)
-       ("gtk+" ,gtk+)
-       ("gstreamer" ,gstreamer)
-       ("gst-plugins-base" ,gst-plugins-base)
-       ("json-glib" ,json-glib)
-       ("libgee" ,libgee)
-       ("poppler" ,poppler)
-       ("pango" ,pango)
-       ("vala" ,vala)
-       ("webkitgtk" ,webkitgtk-with-libsoup2)))
+    (inputs (list
+             cairo
+             discount ; libmarkdown
+             qrencode
+             gtk+
+             gstreamer
+             gst-plugins-base
+             json-glib
+             libgee
+             poppler
+             pango
+             vala
+             webkitgtk-with-libsoup2))
     (native-inputs
      (list pkg-config))
     (home-page "https://pdfpc.github.io/")

base-commit: a9951a74a591a9b22ee2d93d8efe0523c6c42c97
-- 
2.41.0

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Vivien Kraus <vivien <at> planete-kraus.eu>
Cc: 69958-done <at> debbugs.gnu.org, rg <at> raghavgururajan.name, guix-patches <at> gnu.org,
 liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com
Subject: Re: [bug#69958] [PATCH gnome-team] gnu: pdfpc: Fix build with vala
 0.56.
Date: Sun, 24 Mar 2024 10:30:05 +0000

[Message part 1 (text/plain, inline)]

Vivien Kraus via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/patches/pdfpc-build-with-vala-0.56.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it here.
> * gnu/packages/pdf.scm (pdfpc): Use it here.
> [inputs]: Drop labels.
>
> Change-Id: Ib762da3dd23612f952215a2f8d383552e7bc050c
> ---
> Dear Guix,
>
> Pdfpc does not have a new release yet, but its master branch can now build
> with vala 0.56.
>
> What do you think?

Sounds good to me, I've pushed this to gnome-team as
85c99aa1cf5e9a54143118e498c5a8562e6140d9.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.