From 6cb444aa241cf310e97d1e7a448759f71d617ccb Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Thu, 27 Jan 2022 11:23:05 +0000
Subject: [PATCH] Add Vala 0.55.1 patch from upstream (#2047106)

---
 vte291-0.66.2-vala-accessibility.patch | 44 ++++++++++++++++++++++++++
 vte291.spec                            |  4 ++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 vte291-0.66.2-vala-accessibility.patch

diff --git a/vte291-0.66.2-vala-accessibility.patch b/vte291-0.66.2-vala-accessibility.patch
new file mode 100644
index 0000000..0974708
--- /dev/null
+++ b/vte291-0.66.2-vala-accessibility.patch
@@ -0,0 +1,44 @@
+From 069b68f393c46ebfc6734708f1446419ceed95da Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 1 Dec 2021 08:21:36 +0100
+Subject: [PATCH] vala: Fix accessibility of constant intializer expression
+
+---
+ bindings/vala/app.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
+index 8ab27e5a..faaefe47 100644
+--- a/bindings/vala/app.vala
++++ b/bindings/vala/app.vala
+@@ -822,11 +822,11 @@ class App : Gtk.Application
+   {
+     public static bool audible = false;
+     public static string? command = null;
+-    private static string? cjk_ambiguous_width_string = null;
+-    private static string? cursor_blink_mode_string = null;
+-    private static string? cursor_background_color_string = null;
+-    private static string? cursor_foreground_color_string = null;
+-    private static string? cursor_shape_string = null;
++    public static string? cjk_ambiguous_width_string = null;
++    public static string? cursor_blink_mode_string = null;
++    public static string? cursor_background_color_string = null;
++    public static string? cursor_foreground_color_string = null;
++    public static string? cursor_shape_string = null;
+     public static string[]? dingus = null;
+     public static bool debug = false;
+     public static string? encoding = null;
+@@ -834,8 +834,8 @@ class App : Gtk.Application
+     public static int extra_margin = 0;
+     public static string? font_string = null;
+     public static string? geometry = null;
+-    private static string? hl_bg_color_string = null;
+-    private static string? hl_fg_color_string = null;
++    public static string? hl_bg_color_string = null;
++    public static string? hl_fg_color_string = null;
+     public static string? icon_title = null;
+     public static bool keep = false;
+     public static bool no_argb_visual = false;
+-- 
+GitLab
+
diff --git a/vte291.spec b/vte291.spec
index 3222d5e..b00fd92 100644
--- a/vte291.spec
+++ b/vte291.spec
@@ -24,6 +24,8 @@ Source0:        https://download.gnome.org/sources/vte/0.66/vte-%{version}.tar.x
 # https://bugzilla.redhat.com/show_bug.cgi?id=1103380
 # https://pagure.io/fedora-workstation/issue/216
 Patch0:         vte291-cntnr-precmd-preexec-scroll.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2047106
+Patch1:         vte291-0.66.2-vala-accessibility.patch
 
 BuildRequires:  pkgconfig(fribidi) >= %{fribidi_version}
 BuildRequires:  pkgconfig(gio-2.0) >= %{glib2_version}
@@ -131,7 +133,7 @@ sed -i -e "/^vte_systemduserunitdir =/s|vte_prefix|'/usr'|" meson.build
 %{_sysconfdir}/profile.d/vte.sh
 
 %changelog
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.66.2-2
+* Thu Jan 27 2022 David King <amigadave@amigadave.com> - 0.66.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
 * Thu Dec 16 2021 David King <amigadave@amigadave.com> - 0.66.2-1