Accepting request 950694 from GNOME:Next

Mesonfix and tweaks

OBS-URL: https://build.opensuse.org/request/show/950694
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/bijiben?expand=0&rev=125

158.patch

@@ -0,0 +1,46 @@
+From 72426ab909d4ead146c424007715050e8dcc5a3c Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:16:37 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 2 --
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 48a31e3c..d78d052f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ info = 'org.gnome.Notes.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index d00d98f1..556d5642 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ subdir('appdata')
+ mime = 'org.gnome.Notes.xml'
+ 
+ i18n.merge_file(
+-  mime,
+   input: mime + '.in',
+   output: mime,
+   po_dir: po_dir,
+@@ -18,7 +17,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set ('icon', application_id)
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: files (desktop + '.in'),
+-- 
+GitLab
+

bijiben.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb  2 09:29:57 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add 158.patch: Fix build with meson 0.61.0 and newer.
+- Update our Supplements to current standard.
+- Drop update-desktop-files BuildRequires and macro, no longer
+  needed.
+
 -------------------------------------------------------------------
 Thu Nov  4 14:45:01 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 

bijiben.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bijiben
 #
-# 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,12 +24,13 @@ License:        CC-BY-SA-3.0 AND GPL-3.0-or-later
 Group:          Productivity/Text/Editors
 URL:            https://wiki.gnome.org/Apps/Bijiben
 Source0:        https://download.gnome.org/sources/bijiben/40/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM 158.patch -- Fix build with meson 0.61.0 and newer
+Patch0:         https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/158.patch
 
 BuildRequires:  fdupes
 BuildRequires:  gettext
 BuildRequires:  meson >= 0.50.0
 BuildRequires:  pkgconfig
-BuildRequires:  update-desktop-files
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.58
@@ -55,7 +56,7 @@ License:        GPL-3.0-or-later
 Group:          Productivity/Office/Other
 Requires:       %{name} = %{version}
 Requires:       gnome-shell
-Supplements:    packageand(%{name}:gnome-shell)
+Supplements:    (%{name} and gnome-shell)
 
 %description -n gnome-shell-search-provider-%{name}
 Bijiben is a note editor designed to remain simple to use.
@@ -76,7 +77,6 @@ search results from documents.
 
 %install
 %meson_install
-%suse_update_desktop_file org.gnome.Notes DesktopUtility
 %fdupes -s %{buildroot}%{_datadir}
 %find_lang %{name} %{?no_lang_C}