Accepting request 951424 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/951424
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aisleriot?expand=0&rev=64

4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch

@@ -0,0 +1,33 @@
+From 4bf6fcf5c8043adfcadd948e678cc68f150cc998 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Tue, 14 Dec 2021 23:41:22 +0100
+Subject: [PATCH] build: Fix build with meson 0.60
+
+Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/916
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f88c2f3..c97e0b2e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = ar_prefix / ar_datadir / 'metainfo'
+ 
+ i18n.merge_file(
+-  'sol.metainfo.xml',
+   input: 'sol.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -35,7 +34,6 @@ desktop_in = files(
+ )
+ 
+ i18n.merge_file(
+-  'sol.desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+   type: 'desktop',
+-- 
+GitLab
+

aisleriot.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  2 09:23:19 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add 4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch: Fix build
+  with meson 0.61.0 and newer.
+
 -------------------------------------------------------------------
 Tue Jan 18 20:10:33 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
 

aisleriot.spec

@@ -23,6 +23,9 @@ Summary:        Solitaire Card Games for GNOME
 License:        GPL-3.0-or-later
 URL:            https://wiki.gnome.org/Apps/Aisleriot
 Source0:        https://gitlab.gnome.org/GNOME/aisleriot/-/archive/%{version}/aisleriot-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM 4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch -- Fix build with meson 0.61.0 and newer
+Patch0:         https://gitlab.gnome.org/GNOME/aisleriot/-/commit/4bf6fcf5c8043adfcadd948e678cc68f150cc998.patch
+
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 # Needed to get lsb data