From ea7ecbc05ddebb16c12802fe5e7f7561df099b69 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Fri, 25 Feb 2022 00:09:09 +0000
Subject: [PATCH] Fix permissions on cairo-trace

---
 cairo-1.17.4-meson-trace.patch | 32 ++++++++++++++++++++++++++++++++
 cairo.spec                     |  7 ++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 cairo-1.17.4-meson-trace.patch

diff --git a/cairo-1.17.4-meson-trace.patch b/cairo-1.17.4-meson-trace.patch
new file mode 100644
index 0000000..524f319
--- /dev/null
+++ b/cairo-1.17.4-meson-trace.patch
@@ -0,0 +1,32 @@
+From ca478e03270868d9380f7372df25a0f3357430a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
+Date: Tue, 9 Mar 2021 10:59:57 +0000
+Subject: [PATCH] meson: make cairo-trace executable
+
+Install with exec flag set and make sure tool is
+executable in build directory as well (by making
+the input file in the source directory executable).
+
+Fixes #462
+---
+ util/cairo-trace/cairo-trace.in | 0
+ util/cairo-trace/meson.build    | 1 +
+ 2 files changed, 1 insertion(+)
+ mode change 100644 => 100755 util/cairo-trace/cairo-trace.in
+
+diff --git a/util/cairo-trace/cairo-trace.in b/util/cairo-trace/cairo-trace.in
+old mode 100644
+new mode 100755
+diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build
+index e836f98cf..7048786eb 100644
+--- a/util/cairo-trace/meson.build
++++ b/util/cairo-trace/meson.build
+@@ -31,4 +31,5 @@ configure_file(input: 'cairo-trace.in',
+   configuration: trace_conf,
+   install: true,
+   install_dir: join_paths(get_option('prefix'), get_option('bindir')),
++  install_mode: 'rwxr-xr-x',
+ )
+-- 
+2.35.1
+
diff --git a/cairo.spec b/cairo.spec
index 8f23e73..008f794 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -4,7 +4,7 @@
 
 Name:    cairo
 Version: 1.17.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A 2D graphics library
 
 License: LGPLv2 or MPLv1.1
@@ -24,6 +24,8 @@ Patch4: cairo-1.17.4-meson-xcb.patch
 # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/275
 Patch5: cairo-1.17.4-meson-xml.patch
 
+Patch6: cairo-1.17.4-meson-trace.patch
+
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: gtk-doc
@@ -165,6 +167,9 @@ This package contains tools for working with the cairo graphics library.
 %{_libdir}/cairo/
 
 %changelog
+* Fri Feb 25 2022 David King <amigadave@amigadave.com> - 1.17.4-7
+- Fix permissions on cairo-trace
+
 * Tue Feb 15 2022 David King <amigadave@amigadave.com> - 1.17.4-6
 - Switch to meson
 - Use pkgconfig for BuildRequires