From f92b47148504166baddda4d1053b9afc59bb71177b5bc6d596f87a9d0a1a38ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Thu, 10 Feb 2022 15:29:00 +0000
Subject: [PATCH] Accepting request 953134 from
 home:iznogood:branches:GNOME:Apps

Mesonfix++

OBS-URL: https://build.opensuse.org/request/show/953134
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnote?expand=0&rev=149
---
 21.patch      | 36 ++++++++++++++++++++++++++++++++++++
 gnote.changes | 11 +++++++++++
 gnote.spec    |  8 +++++++-
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 21.patch

diff --git a/21.patch b/21.patch
new file mode 100644
index 0000000..e419311
--- /dev/null
+++ b/21.patch
@@ -0,0 +1,36 @@
+From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:53:17 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:4:0: ERROR: Function does not take positional arguments.
+data/meson.build:41:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a6138165..8d16368a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ install_man('gnote.1')
+ 
+ desktop_file = 'org.gnome.Gnote.desktop'
+ gnote_desktop_file = i18n.merge_file(
+-  desktop_file,
+   type: 'desktop',
+   input: desktop_file + '.in',
+   output: desktop_file,
+@@ -39,7 +38,6 @@ configure_file(
+ 
+ gnote_appdata = 'org.gnome.Gnote.appdata.xml'
+ appdata_file = i18n.merge_file(
+-  gnote_appdata,
+   input: gnote_appdata + '.in',
+   output: gnote_appdata,
+   po_dir: '../po',
+-- 
+GitLab
+
diff --git a/gnote.changes b/gnote.changes
index 5ff5fd5..6162a8f 100644
--- a/gnote.changes
+++ b/gnote.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Feb  2 21:13:40 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add 21.patch: Fix build with meson 0.61 and newer.
+- Stop adding category TextEditor to the desktop file, it's a notes
+  application, not a text editor as such.
+- Add appstream-glib BuildRequires and a check section and
+  meson_test macro, validate appdata, desktop file and gschemas
+  during build using upstreams included tests.
+- Add explicit generic c_compiler BuildRequires.
+
 -------------------------------------------------------------------
 Mon Jan 10 20:04:41 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnote.spec b/gnote.spec
index d1ba736..99fb005 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -27,8 +27,12 @@ Group:          Productivity/Text/Editors
 URL:            https://wiki.gnome.org/Apps/Gnote
 Source0:        https://download.gnome.org/sources/gnote/41/%{name}-%{version}.tar.xz
 Source99:       gnote-rpmlintrc
+# PATCH-FIX-UPSTREAM 21.patch -- Fix build with meson 0.60 and newer
+Patch0:         https://gitlab.gnome.org/GNOME/gnote/-/merge_requests/21.patch
 
+BuildRequires:  appstream-glib
 BuildRequires:  c++_compiler
+BuildRequires:  c_compiler
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  libboost_test-devel >= 1.5.1
@@ -74,7 +78,6 @@ search results from documents.
 
 %install
 %meson_install
-desktop-file-edit --add-category TextEditor %{buildroot}%{_datadir}/applications/org.gnome.Gnote.desktop
 %fdupes %{buildroot}%{_datadir}
 %find_lang %{name} %{?no_lang_C}
 
@@ -85,6 +88,9 @@ desktop-file-edit --add-category TextEditor %{buildroot}%{_datadir}/applications
 %postun -p /sbin/ldconfig
 %endif
 
+%check
+%meson_test
+
 %files
 %license COPYING
 %doc AUTHORS NEWS README