Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-disk-utility for openSUSE:Factory checked in at 2022-02-09 20:37:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-disk-utility (Old) and /work/SRC/openSUSE:Factory/.gnome-disk-utility.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-disk-utility" Wed Feb 9 20:37:59 2022 rev:79 rq:952875 version:41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-disk-utility/gnome-disk-utility.changes 2021-11-06 18:18:31.804900052 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-disk-utility.new.1898/gnome-disk-utility.changes 2022-02-09 20:38:03.446211988 +0100 @@ -1,0 +2,5 @@ +Tue Feb 8 17:11:36 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add 60.patch: Fix build with meson 0.61 and newer. + +------------------------------------------------------------------- New: ---- 60.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-disk-utility.spec ++++++ --- /var/tmp/diff_new_pack.p699Ia/_old 2022-02-09 20:38:04.046213422 +0100 +++ /var/tmp/diff_new_pack.p699Ia/_new 2022-02-09 20:38:04.050213432 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-disk-utility # -# 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: Hardware/Other URL: https://wiki.gnome.org/Apps/Disks Source0: https://download.gnome.org/sources/gnome-disk-utility/41/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 60.patch -- Fix build with meson 0.61 and newer +Patch0: https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/merge_requests/60.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: meson >= 0.50.0 ++++++ 60.patch ++++++ >From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001 From: rvalue <[email protected]> Date: Fri, 17 Dec 2021 12:29:30 +0000 Subject: [PATCH] build: fix arguments of i18n.merge_file `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 -- 1 file changed, 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index e38a1d8e..38fb5207 100644 --- a/data/meson.build +++ b/data/meson.build @@ -11,7 +11,6 @@ desktops = [ foreach desktop: desktops i18n.merge_file ( - desktop, type: 'desktop', input: desktop + '.in', output: desktop, @@ -38,7 +37,6 @@ install_data( info = 'org.gnome.DiskUtility.appdata.xml' i18n.merge_file( - info, input: info + '.in', output: info, po_dir: po_dir, -- GitLab
