Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package frogr for openSUSE:Factory checked in at 2022-02-11 23:07:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frogr (Old) and /work/SRC/openSUSE:Factory/.frogr.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frogr" Fri Feb 11 23:07:24 2022 rev:29 rq:953248 version:1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/frogr/frogr.changes 2022-01-20 00:13:30.558636074 +0100 +++ /work/SRC/openSUSE:Factory/.frogr.new.1956/frogr.changes 2022-02-11 23:08:48.274840993 +0100 @@ -1,0 +2,5 @@ +Thu Feb 10 10:18:48 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add 5.patch -- Fix build with meson 0.61 and newer. + +------------------------------------------------------------------- New: ---- 5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frogr.spec ++++++ --- /var/tmp/diff_new_pack.S1CPj0/_old 2022-02-11 23:08:48.766842415 +0100 +++ /var/tmp/diff_new_pack.S1CPj0/_new 2022-02-11 23:08:48.770842427 +0100 @@ -23,7 +23,9 @@ License: GPL-3.0-only Group: Productivity/Graphics/Other URL: https://wiki.gnome.org/Apps/Frogr -Source: http://download.gnome.org/sources/frogr/%{version}/%{name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/frogr/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5.patch -- Fix build with meson 0.61 and newer +Patch0: https://gitlab.gnome.org/GNOME/frogr/-/merge_requests/5.patch BuildRequires: libgcrypt-devel >= 1.5.0 BuildRequires: meson @@ -46,7 +48,7 @@ %lang_package %prep -%autosetup +%autosetup -p1 ### TODO: Remove this on the next release package update. # Fix meson option warning_level based on commit: ++++++ 5.patch ++++++ >From 1eeb32b94b9e14e7ea2b9267e3378bae9e3e852d Mon Sep 17 00:00:00 2001 From: Jan Beich <jbe...@freebsd.org> Date: Mon, 24 Jan 2022 12:22:25 +0000 Subject: [PATCH] meson: drop unused argument for i18n.merge_file() Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. data/meson.build:32:0: ERROR: Function does not take positional arguments. data/meson.build:42:0: ERROR: Function does not take positional arguments. --- data/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index edc6f35a..c8fa7ee9 100644 --- a/data/meson.build +++ b/data/meson.build @@ -29,7 +29,7 @@ data_conf.set('BINDIR', join_paths(prefix, bindir)) generated_desktop = configure_file(input: 'org.gnome.frogr.desktop.in.in', output: 'org.gnome.frogr.desktop.in', configuration: data_conf) -i18n.merge_file('desktop', +i18n.merge_file( input: generated_desktop, output: 'org.gnome.frogr.desktop', install: true, @@ -39,7 +39,7 @@ i18n.merge_file('desktop', # Appdata XML file appdatadir = join_paths(datadir, 'metainfo') -i18n.merge_file('appdata', +i18n.merge_file( input: 'org.gnome.frogr.appdata.xml.in', output: 'org.gnome.frogr.appdata.xml', install: true, -- GitLab
