Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gedit for openSUSE:Factory checked in at 2022-02-09 20:38:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gedit (Old) and /work/SRC/openSUSE:Factory/.gedit.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gedit" Wed Feb 9 20:38:00 2022 rev:142 rq:952876 version:41.alpha Changes: -------- --- /work/SRC/openSUSE:Factory/gedit/gedit.changes 2022-01-07 12:44:39.695773811 +0100 +++ /work/SRC/openSUSE:Factory/.gedit.new.1898/gedit.changes 2022-02-09 20:38:04.470214437 +0100 @@ -1,0 +2,5 @@ +Wed Feb 2 09:49:18 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add 124.patch: Fix build with meson 0.61.0 and newer. + +------------------------------------------------------------------- New: ---- 124.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gedit.spec ++++++ --- /var/tmp/diff_new_pack.JTUuOm/_old 2022-02-09 20:38:05.090215919 +0100 +++ /var/tmp/diff_new_pack.JTUuOm/_new 2022-02-09 20:38:05.098215939 +0100 @@ -1,7 +1,7 @@ # # spec file for package gedit # -# 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 @@ -31,6 +31,8 @@ Patch1: gedit-plugins-python-env.patch # PATCH-FIX-UPSTREAM gedit-fix-open-crash.patch -- open-selector: Fix crash introduced in GDateTime port Patch2: gedit-fix-open-crash.patch +# PATCH-FIX-UPSTREAM 124.patch -- Fix build with meson 0.61.0 and newer +Patch3: https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 0.9.3 ++++++ 124.patch ++++++ >From 023ca8a428dff764c7cf84282a97f856e162c07c Mon Sep 17 00:00:00 2001 From: rvalue <i...@rvalue.moe> Date: Wed, 15 Dec 2021 07:02:09 +0000 Subject: [PATCH] Remove incorrect args for i18n.merge_file The positional argument has been silently ignored for a time. And it causes failure with "ERROR: Function does not take positional arguments" 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 774618b3d..0077b49c5 100644 --- a/data/meson.build +++ b/data/meson.build @@ -4,7 +4,6 @@ install_man('gedit.1') appdata = 'org.gnome.gedit.appdata.xml' appdata_file = i18n.merge_file( - appdata, input: appdata + '.in', output: appdata, po_dir: '../po/', @@ -23,7 +22,6 @@ endif desktop_file = 'org.gnome.gedit.desktop' desktop_output_file = i18n.merge_file( - desktop_file, type: 'desktop', input: desktop_file + '.in', output: desktop_file, -- GitLab
