File 600f498946c3904064b4e4fdf96e5841f6a827e4.patch of Package font-manager

Overview Repositories Revisions Requests Users Attributes Meta

File 600f498946c3904064b4e4fdf96e5841f6a827e4.patch of Package font-manager (Revision 77109633c00703fdbb2ccd80a55bd555)

Currently displaying revision 77109633c00703fdbb2ccd80a55bd555 , Show latest

From 600f498946c3904064b4e4fdf96e5841f6a827e4 Mon Sep 17 00:00:00 2001
From: Jerry Casiano <JerryCasiano@gmail.com>
Date: Wed, 1 May 2024 19:24:20 -0400
Subject: [PATCH] - Allow build to proceed with Vala versions >= 0.56.17 -
 Closes #355

---
 meson.build                          |  3 +++
 src/font-manager/ArchiveManager.vala | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 92d58f32..24703e1c 100644
--- a/meson.build
+++ b/meson.build
@@ -10,6 +10,9 @@ valac = meson.get_compiler('vala')
 if not valac.version().version_compare('>= 0.42')
     error('Vala compiler version is @0@ but project requires >= 0.42'.format(valac.version()))
 endif
+if valac.version().version_compare('>= 0.56.17')
+    add_global_arguments('-D', 'VALA_0_56_17', language: 'vala')
+endif
 m_dep = cc.find_library('m', required: false)
 fontconfig = dependency('fontconfig', version: '>= 2.12')
 freetype = dependency('freetype2', version: '>= 2.5')
diff --git a/src/font-manager/ArchiveManager.vala b/src/font-manager/ArchiveManager.vala
index 95c6d20b..31032496 100644
--- a/src/font-manager/ArchiveManager.vala
+++ b/src/font-manager/ArchiveManager.vala
@@ -22,9 +22,13 @@
 interface FileRollerDBusService : Object {
 
     public signal void progress (double percent, string message);
-
+#if VALA_0_56_17
+    public abstract void add_to_archive (string archive, string [] uris, bool use_progress_dialog) throws DBusError, IOError;
+    public abstract void compress (string [] uris, string destination, bool use_progress_dialog) throws DBusError, IOError;
+#else
     public abstract void add_to_archive (string archive, [CCode (array_null_terminated = true)] string? [] uris, bool use_progress_dialog) throws DBusError, IOError;
     public abstract void compress ([CCode (array_null_terminated = true)] string? [] uris, string destination, bool use_progress_dialog) throws DBusError, IOError;
+#endif
     public abstract void extract (string archive, string destination, bool use_progress_dialog) throws DBusError, IOError;
     public abstract void extract_here (string archive, bool use_progress_dialog) throws DBusError, IOError;
     /* Valid actions -> "create", "create_single_file", "extract" */
@@ -90,7 +94,11 @@ namespace FontManager {
             }
         }
 
+#if VALA_0_56_17
+        public bool add_to_archive (string archive, string? [] uris, bool use_progress_dialog = true)
+#else
         public bool add_to_archive (string archive, [CCode (array_null_terminated = true)] string? [] uris, bool use_progress_dialog = true)
+#endif
         requires (file_roller != null) {
             try {
                 file_roller.add_to_archive(archive, uris, use_progress_dialog);
@@ -101,7 +109,12 @@ namespace FontManager {
             return false;
         }
 
+#if VALA_0_56_17
+        public bool compress (string? [] uris, string destination, bool use_progress_dialog = true)
+#else
         public bool compress ([CCode (array_null_terminated = true)] string? [] uris, string destination, bool use_progress_dialog = true)
+#endif
+
         requires (file_roller != null) {
             try {
                 file_roller.compress(uris, destination, use_progress_dialog);

Places

File 600f498946c3904064b4e4fdf96e5841f6a827e4.patch of Package font-manager (Revision 77109633c00703fdbb2ccd80a55bd555)

Places