Accepting request 952876 from GNOME:Factory

- Add 124.patch: Fix build with meson 0.61.0 and newer. (forwarded request 952767 from iznogood)

OBS-URL: https://build.opensuse.org/request/show/952876
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gedit?expand=0&rev=142

124.patch

@@ -0,0 +1,34 @@
+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
+

gedit.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb  2 09:49:18 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add 124.patch: Fix build with meson 0.61.0 and newer.
+
 -------------------------------------------------------------------
 Fri Nov  5 07:51:35 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 

gedit.spec

@@ -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 @@ Patch0:         gedit-desktop.patch
 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