From 39fca55fe3faafdaaf8c644b1b79abbd0fddbb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 10 Jun 2022 13:57:44 +0200
Subject: [PATCH] Fix build with meson 0.61+

---
 6da47128e8.patch | 32 ++++++++++++++++++++++++++++++++
 efdd5338b0.patch | 23 +++++++++++++++++++++++
 glade.spec       | 14 ++++++++++++--
 3 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 6da47128e8.patch
 create mode 100644 efdd5338b0.patch

diff --git a/6da47128e8.patch b/6da47128e8.patch
new file mode 100644
index 0000000..0a10568
--- /dev/null
+++ b/6da47128e8.patch
@@ -0,0 +1,32 @@
+From 6da47128e8da04edccccdfcbc9101940fc15fe3a Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH] meson: i18n.merge_file() does not take a positional argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+ 
+ i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Glade.appdata.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
diff --git a/efdd5338b0.patch b/efdd5338b0.patch
new file mode 100644
index 0000000..df31d25
--- /dev/null
+++ b/efdd5338b0.patch
@@ -0,0 +1,23 @@
+From efdd5338b034a11c5d617684d92d11edc600965e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+-- 
+GitLab
+
diff --git a/glade.spec b/glade.spec
index ce457da..26d8413 100644
--- a/glade.spec
+++ b/glade.spec
@@ -1,6 +1,6 @@
 Name:           glade
 Version:        3.38.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        User Interface Designer for GTK+
 
 # - /usr/bin/glade is GPLv2+
@@ -11,6 +11,12 @@ License:        GPLv2+ and LGPLv2+
 URL:            https://glade.gnome.org/
 Source0:        https://download.gnome.org/sources/glade/3.38/glade-%{version}.tar.xz
 
+# meson 0.61+: i18n.merge_file() does not take a positional argument
+#              Remove duplicate entry for 'da' from help/LINGUAS 
+# Fixes https://bugzilla.redhat.com/2082581
+Patch:          https://gitlab.gnome.org/GNOME/glade/-/commit/6da47128e8.patch
+Patch:          https://gitlab.gnome.org/GNOME/glade/-/commit/efdd5338b0.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-style-xsl
 BuildRequires:  gcc
@@ -56,7 +62,7 @@ developing applications that use Glade widget library.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 
 %build
@@ -115,6 +121,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Glade.de
 
 
 %changelog
+* Fri Jun 10 2022 Miro Hrončok <mhroncok@redhat.com> - 3.38.2-6
+- Fix build with meson 0.61+
+- Fixes: rhbz#2082581
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild