Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnome-font-viewer for
openSUSE:Factory checked in at 2022-02-11 23:07:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-font-viewer (Old)
and /work/SRC/openSUSE:Factory/.gnome-font-viewer.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-font-viewer"
Fri Feb 11 23:07:36 2022 rev:37 rq:953323 version:41.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-font-viewer/gnome-font-viewer.changes
2021-09-29 20:19:57.803079734 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-font-viewer.new.1956/gnome-font-viewer.changes
2022-02-11 23:09:11.418907932 +0100
@@ -1,0 +2,6 @@
+Thu Feb 10 18:41:03 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- Add 218166246e29a39e2eac8d3f06976038571b0603.patch: Fix build
+ with meson 0.61 and newer.
+
+-------------------------------------------------------------------
New:
----
218166246e29a39e2eac8d3f06976038571b0603.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-font-viewer.spec ++++++
--- /var/tmp/diff_new_pack.ATuZCX/_old 2022-02-11 23:09:11.846909169 +0100
+++ /var/tmp/diff_new_pack.ATuZCX/_new 2022-02-11 23:09:11.846909169 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-font-viewer
#
-# 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,6 +24,8 @@
Group: System/GUI/GNOME
URL: https://gitlab.gnome.org/GNOME/gnome-font-viewer
Source0:
https://download.gnome.org/sources/gnome-font-viewer/41/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM 218166246e29a39e2eac8d3f06976038571b0603.patch -- Fix
build with meson 0.61 and newer
+Patch0:
https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/commit/218166246e29a39e2eac8d3f06976038571b0603.patch
BuildRequires: meson >= 0.50.0
BuildRequires: pkgconfig
++++++ 218166246e29a39e2eac8d3f06976038571b0603.patch ++++++
>From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001
From: r-value <[email protected]>
Date: Thu, 30 Dec 2021 17:14:47 +0800
Subject: [PATCH] Fix meson build with meson 0.60.0+
`i18n.merge_file` has been ignoring positional arguments for a time
and explicitly rejects with error since meson 0.60.0
---
data/meson.build | 2 +-
src/meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index bfc9caa..8e42134 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,6 @@
appdatadir = join_paths(datadir, 'metainfo')
appdata_file = 'org.gnome.font-viewer.appdata.xml'
-merged_appdata = i18n.merge_file(appdata_file,
+merged_appdata = i18n.merge_file(
input: appdata_file + '.in',
output: appdata_file,
po_dir: '../po',
diff --git a/src/meson.build b/src/meson.build
index f863d45..826c59b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
desktop_conf = configuration_data()
desktop_conf.set('VERSION', meson.project_version())
desktop_conf.set('APPLICATION_ID', application_id)
-i18n.merge_file(desktop_file,
+i18n.merge_file(
input: configure_file(input: desktop_file + '.in.in',
output: desktop_file + '.in',
configuration: desktop_conf),
--
GitLab
