From patchwork Sat Mar 23 08:45:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 62141 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 05D2727BBEA; Sat, 23 Mar 2024 08:49:38 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 AA49127BBE2 for ; Sat, 23 Mar 2024 08:49:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnx48-0004IQ-85; Sat, 23 Mar 2024 04:49:24 -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 ) id 1rnx46-0004I7-EZ for guix-patches@gnu.org; Sat, 23 Mar 2024 04:49:22 -0400 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 1rnx46-0007Df-4S for guix-patches@gnu.org; Sat, 23 Mar 2024 04:49:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rnx4k-0006SC-I5; Sat, 23 Mar 2024 04:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69958] [PATCH gnome-team] gnu: pdfpc: Fix build with vala 0.56. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sat, 23 Mar 2024 08:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69958@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by submit@debbugs.gnu.org id=B.171118376524691 (code B ref -1); Sat, 23 Mar 2024 08:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Mar 2024 08:49:25 +0000 Received: from localhost ([127.0.0.1]:37570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnx47-0006Q4-Ty for submit@debbugs.gnu.org; Sat, 23 Mar 2024 04:49:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:47810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rnx45-0006Pl-SP for submit@debbugs.gnu.org; Sat, 23 Mar 2024 04:49:23 -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 ) id 1rnx3P-0004E6-Ku for guix-patches@gnu.org; Sat, 23 Mar 2024 04:48:40 -0400 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rnx3N-000798-3F for guix-patches@gnu.org; Sat, 23 Mar 2024 04:48:39 -0400 Received: from planete-kraus.eu (localhost.localdomain [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 86d02d72 for ; Sat, 23 Mar 2024 08:48:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=albinoniA; bh=3b t8JfspxhFbbzhApCjFU33ADqY=; b=mZ9FY33VHUUpgHUrJDpNU1j2bPrpp27e49 CXtLIx2KQCjOQ7agi/yEhT59ccZwE+JAjogTUGfTqMEJ56fbDMOM2wNihsl+boAK ofPIfd42ZExF0lwUZJiccxA581N672qWLwx7sKjQggy0UkHRHDx56y19YdGy4MES X+rlIIXGpITIpQSdmmA8W/HGW4ixz9dnqpLo9ZIJS6FrczlnendMYTCGjyTRghX6 b0REyJ1OMALBZoE+enLGm3yjsf0SMqu/IlKjIizELyxIkKDvLx22Mf9krrZI/W7h FYT4j7+JzQCoA0xigxMEANRxWhmdeJhHtbEDBP3DPVgE3kQp0+Gg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ad5c8614 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Sat, 23 Mar 2024 08:48:34 +0000 (UTC) Message-ID: Date: Sat, 23 Mar 2024 09:45:17 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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/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 base-commit: a9951a74a591a9b22ee2d93d8efe0523c6c42c97 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@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 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/")