Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package font-manager for openSUSE:Factory checked in at 2024-05-21 18:35:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/font-manager (Old) and /work/SRC/openSUSE:Factory/.font-manager.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "font-manager" Tue May 21 18:35:19 2024 rev:6 rq:1175344 version:0.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/font-manager/font-manager.changes 2022-09-25 15:35:57.819718394 +0200 +++ /work/SRC/openSUSE:Factory/.font-manager.new.1880/font-manager.changes 2024-05-21 18:35:43.464808987 +0200 @@ -1,0 +2,6 @@ +Mon May 20 13:42:54 UTC 2024 - Jan Baier <[email protected]> + +- Add 600f498946c3904064b4e4fdf96e5841f6a827e4.patch + * Allow build to proceed with Vala versions >= 0.56.17 + +------------------------------------------------------------------- New: ---- 600f498946c3904064b4e4fdf96e5841f6a827e4.patch _service BETA DEBUG BEGIN: New: - Add 600f498946c3904064b4e4fdf96e5841f6a827e4.patch * Allow build to proceed with Vala versions >= 0.56.17 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ font-manager.spec ++++++ --- /var/tmp/diff_new_pack.IwobBM/_old 2024-05-21 18:35:44.052830507 +0200 +++ /var/tmp/diff_new_pack.IwobBM/_new 2024-05-21 18:35:44.056830654 +0200 @@ -1,7 +1,7 @@ # # spec file for package font-manager # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ License: GPL-3.0-or-later URL: https://fontmanager.github.io Source0: https://github.com/FontManager/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 600f498946c3904064b4e4fdf96e5841f6a827e4.patch -- based on commit 600f498 +Patch0: https://github.com/FontManager/font-manager/commit/600f498946c3904064b4e4fdf96e5841f6a827e4.patch BuildRequires: appstream-glib BuildRequires: gettext-runtime BuildRequires: meson @@ -103,7 +105,7 @@ This package provides integration with the Thunar file manager. %prep -%autosetup +%autosetup -p1 %build %meson \ ++++++ 600f498946c3904064b4e4fdf96e5841f6a827e4.patch ++++++ >From 600f498946c3904064b4e4fdf96e5841f6a827e4 Mon Sep 17 00:00:00 2001 From: Jerry Casiano <[email protected]> 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); ++++++ _service ++++++ <services> <service name="download_files" mode="localonly"/> </services>
