Accepting request 951438 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/951438
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gucharmap?expand=0&rev=102

a8ee037f8cf151b8b65354bc93c56953e41f5a22.patch

@@ -0,0 +1,32 @@
+From a8ee037f8cf151b8b65354bc93c56953e41f5a22 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Wed, 15 Dec 2021 00:03:33 +0100
+Subject: [PATCH] build: Fix build with meson 0.60
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 11e4e8a6..4bd50014 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = gucharmap_prefix / gucharmap_datadir / 'metainfo'
+ 
+ i18n.merge_file(
+-  'gucharmap.metainfo.xml',
+   input: 'gucharmap.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -42,7 +41,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  'gucharmap.desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+   type: 'desktop',
+-- 
+GitLab
+

gucharmap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  3 06:23:00 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add a8ee037f8cf151b8b65354bc93c56953e41f5a22.patch: Fix build
+  with meson 0.61 and newer.
+
 -------------------------------------------------------------------
 Mon Sep 20 20:16:27 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
 

gucharmap.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gucharmap
 #
-# 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
@@ -28,6 +28,9 @@ License:        GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          System/GUI/GNOME
 URL:            https://wiki.gnome.org/Apps/Gucharmap
 Source0:        %{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM a8ee037f8cf151b8b65354bc93c56953e41f5a22.patch -- Fix build with meson 0.61 and newer
+Patch0:         https://gitlab.gnome.org/GNOME/gucharmap/-/commit/a8ee037f8cf151b8b65354bc93c56953e41f5a22.patch
+
 BuildRequires:  appdata-tools
 BuildRequires:  fdupes
 BuildRequires:  gettext
@@ -83,7 +86,7 @@ to develop applications that require these.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 export LIBS="-ldl"