From 2b95ef205beec7f80990ed6ee697cc0a02090717 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 6 May 2022 17:01:27 +0100
Subject: [PATCH] Backport a patch so wixl-heat can work with glib as-shiped in
 F36.

---
 ...0b2ee79438b8e35c0769165a9a105e3792a0.patch | 58 +++++++++++++++++++
 msitools.spec                                 |  6 +-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 18bc0b2ee79438b8e35c0769165a9a105e3792a0.patch

diff --git a/18bc0b2ee79438b8e35c0769165a9a105e3792a0.patch b/18bc0b2ee79438b8e35c0769165a9a105e3792a0.patch
new file mode 100644
index 0000000..5b8c74e
--- /dev/null
+++ b/18bc0b2ee79438b8e35c0769165a9a105e3792a0.patch
@@ -0,0 +1,58 @@
+From 18bc0b2ee79438b8e35c0769165a9a105e3792a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Thu, 31 Mar 2022 23:22:27 +0400
+Subject: [PATCH] wixl: fix g_path_is_absolute() assert with glib >= 2.71
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since glib commit 3a6e8bc887 ("gio: check the given child name is not an
+absolute path"), it is no longer acceptable to pass an absolute path to
+g_file_get_child().
+
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+---
+ tools/wixl/builder.vala | 27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/tools/wixl/builder.vala b/tools/wixl/builder.vala
+index 09095fa..f8a7068 100644
+--- a/tools/wixl/builder.vala
++++ b/tools/wixl/builder.vala
+@@ -777,16 +777,23 @@ namespace Wixl {
+         File? find_file (string name, out FileInfo info) throws GLib.Error {
+             info = null;
+ 
+-            foreach (var p in path) {
+-                var file = p.get_child (name);
+-                try {
+-                    info = file.query_info ("standard::*", 0, null);
+-                    if (info != null)
+-                        return file;
+-                } catch (IOError error) {
+-                    if (error is IOError.NOT_FOUND)
+-                        continue;
+-                    throw error;
++            if (Path.is_absolute (name)) {
++                var file = File.new_for_path (name);
++                info = file.query_info ("standard::*", 0, null);
++                if (info != null)
++                    return file;
++            } else {
++                foreach (var p in path) {
++                    var file = p.get_child (name);
++                    try {
++                        info = file.query_info ("standard::*", 0, null);
++                        if (info != null)
++                            return file;
++                    } catch (IOError error) {
++                        if (error is IOError.NOT_FOUND)
++                            continue;
++                        throw error;
++                    }
+                 }
+             }
+ 
+-- 
+GitLab
+
diff --git a/msitools.spec b/msitools.spec
index a4512d4..cfe683a 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -12,13 +12,14 @@
 
 Name:           msitools
 Version:        0.101.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Windows Installer tools
 
 License:        GPLv2+
 URL:            http://ftp.gnome.org/pub/GNOME/sources/%{name}
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}%{?_version_suffix}.tar.xz
 Patch0:         0001-Update-data-wixl.patch
+Patch1:         18bc0b2ee79438b8e35c0769165a9a105e3792a0.patch
 
 Requires:       libgsf >= 1.14.24-2
 
@@ -274,6 +275,9 @@ The libmsi1-devel package includes the header files for libmsi.
 
 
 %changelog
+* Fri May 06 2022 Richard Hughes <rhughes@redhat.com> - 0.101.32-4
+- Backport a patch so wixl-heat can work with glib as-shiped in F36.
+
 * Sat Jan 29 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.101.32-3
 - Fix FTBFS. rhbz#2046759