Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hitori for openSUSE:Factory checked in at 2022-02-04 21:49:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hitori (Old) and /work/SRC/openSUSE:Factory/.hitori.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hitori" Fri Feb 4 21:49:13 2022 rev:30 rq:951435 version:3.38.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hitori/hitori.changes 2021-09-20 23:36:21.555411225 +0200 +++ /work/SRC/openSUSE:Factory/.hitori.new.1898/hitori.changes 2022-02-04 21:52:24.795144701 +0100 @@ -1,0 +2,11 @@ +Wed Feb 2 17:30:27 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add d25728e122f1d7b985029a5ba96810c3e57c27f7.patch: Fix build + with meson 0.61 and newer. +- Drop update-desktop-files BuildRequires and macro, no longer + needed. +- Add appstream-glib BuildRequires, add check section and + meson_test macro, validate metainfo and desktop file during + build. + +------------------------------------------------------------------- New: ---- d25728e122f1d7b985029a5ba96810c3e57c27f7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hitori.spec ++++++ --- /var/tmp/diff_new_pack.lFgtde/_old 2022-02-04 21:52:25.251141565 +0100 +++ /var/tmp/diff_new_pack.lFgtde/_new 2022-02-04 21:52:25.255141537 +0100 @@ -1,7 +1,7 @@ # # spec file for package hitori # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,13 +24,15 @@ Group: Amusements/Games/Logic URL: https://gitlab.gnome.org/GNOME/hitori Source0: https://download.gnome.org/sources/hitori/3.38/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM d25728e122f1d7b985029a5ba96810c3e57c27f7.patch -- Fix build with meson 0.61 and newer +Patch0: https://gitlab.gnome.org/GNOME/hitori/-/commit/d25728e122f1d7b985029a5ba96810c3e57c27f7.patch +BuildRequires: appstream-glib BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: itstool BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: pkgconfig(cairo) >= 1.4 BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) @@ -58,9 +60,11 @@ %install %meson_install %find_lang %{name} -%suse_update_desktop_file org.gnome.Hitori %fdupes %{buildroot}%{_prefix} +%check +%meson_test + %files %license COPYING %doc README.md ++++++ d25728e122f1d7b985029a5ba96810c3e57c27f7.patch ++++++ >From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001 From: Philip Withnall <[email protected]> Date: Tue, 2 Nov 2021 12:04:29 +0000 Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meson never took positional arguments in this function, but didn???t warn about it until Meson 0.60. Drop the unnecessary arguments to fix the warning. Signed-off-by: Philip Withnall <[email protected]> --- data/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index 97b8e68..c66a233 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,6 @@ subdir('icons') -desktop_file = i18n.merge_file('desktop-file', +desktop_file = i18n.merge_file( type: 'desktop', input: '@[email protected]'.format(application_id), output: '@[email protected]'.format(application_id), @@ -20,7 +20,7 @@ if desktop_file_validate.found() ) endif -appdata_file = i18n.merge_file('appdata-file', +appdata_file = i18n.merge_file( input: '@[email protected]'.format(application_id), output: '@[email protected]'.format(application_id), po_dir: join_paths(meson.source_root(), 'po'), -- GitLab
