Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package devhelp for openSUSE:Factory checked in at 2022-02-04 21:49:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/devhelp (Old) and /work/SRC/openSUSE:Factory/.devhelp.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "devhelp" Fri Feb 4 21:49:08 2022 rev:92 rq:951423 version:41.2 Changes: -------- --- /work/SRC/openSUSE:Factory/devhelp/devhelp.changes 2021-10-05 22:34:26.574930977 +0200 +++ /work/SRC/openSUSE:Factory/.devhelp.new.1898/devhelp.changes 2022-02-04 21:52:18.307189326 +0100 @@ -1,0 +2,7 @@ +Wed Feb 2 08:54:49 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add 281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch and + 03b9b6b55ab1e1376b314ac7f99693512e42d80b.patch: Fix build with + meson 0.61.0 and newer. + +------------------------------------------------------------------- New: ---- 03b9b6b55ab1e1376b314ac7f99693512e42d80b.patch 281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ devhelp.spec ++++++ --- /var/tmp/diff_new_pack.lncRoa/_old 2022-02-04 21:52:18.771186135 +0100 +++ /var/tmp/diff_new_pack.lncRoa/_new 2022-02-04 21:52:18.775186108 +0100 @@ -1,7 +1,7 @@ # # spec file for package devhelp # -# 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 @@ -27,6 +27,10 @@ Group: Development/Tools/Other URL: https://wiki.gnome.org/Apps/Devhelp Source0: https://download.gnome.org/sources/devhelp/41/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch -- Fix build with meson 0.61.0 and newer +Patch0: https://gitlab.gnome.org/GNOME/devhelp/-/commit/281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch +# PATCH-FIX-UPSTREAM 03b9b6b55ab1e1376b314ac7f99693512e42d80b.patch -- Fix build with meson 0.61.0 and newer +Patch1: https://gitlab.gnome.org/GNOME/devhelp/-/commit/03b9b6b55ab1e1376b314ac7f99693512e42d80b.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 1.30.0 @@ -103,7 +107,7 @@ %lang_package %prep -%autosetup +%autosetup -p1 %build %meson \ ++++++ 03b9b6b55ab1e1376b314ac7f99693512e42d80b.patch ++++++ >From 03b9b6b55ab1e1376b314ac7f99693512e42d80b Mon Sep 17 00:00:00 2001 From: r-value <i...@rvalue.moe> Date: Wed, 17 Nov 2021 18:02:20 +0800 Subject: [PATCH] Remove incorrect arg for i18n.merge_file `i18n.merge_file` has been ignoring positional arguments and explicitly rejects with error "ERROR: Function does not take positional arguments" since meson 0.60.0 --- plugins/gedit-plugin/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build index 4f779886..877a01ff 100644 --- a/plugins/gedit-plugin/meson.build +++ b/plugins/gedit-plugin/meson.build @@ -7,7 +7,6 @@ install_data( plugin_info_file = 'devhelp.plugin' I18N.merge_file( - plugin_info_file, type: 'desktop', input: plugin_info_file + '.desktop.in', output: plugin_info_file, -- GitLab ++++++ 281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch ++++++ >From 281bade14c1925cf9e7329fa8e9cf2d82512c66f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi <eba...@gnome.org> Date: Mon, 24 Jan 2022 23:39:24 +0000 Subject: [PATCH] build: Fix i18n.merge_file() use with Meson 0.61 The function never took positional arguments. Fixes: #59 --- data/meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/meson.build b/data/meson.build index c6aeffb4..0bc531a2 100644 --- a/data/meson.build +++ b/data/meson.build @@ -19,7 +19,6 @@ appdata_conf = configuration_data() appdata_conf.set('application_id', APPLICATION_ID) appdata = APPLICATION_ID + '.appdata.xml' appdata_file = I18N.merge_file( - appdata, input: configure_file( input: 'org.gnome.Devhelp.appdata.xml.in.in', output: APPLICATION_ID + '.appdata.xml.in', @@ -45,7 +44,6 @@ desktop_conf = configuration_data() desktop_conf.set('application_id', APPLICATION_ID) desktop = APPLICATION_ID + '.desktop' desktop_file = I18N.merge_file( - desktop, type: 'desktop', input: configure_file( input: 'org.gnome.Devhelp.desktop.in.in', -- GitLab
