From c5653036ded1aeafde39c00daa05c7c30acd7327 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Aug 06 2020 07:32:46 +0000
Subject: Add patch for wlr/taskbar config strings


---

diff --git a/minor-string-fixes-to-wlr-taskbar.patch b/minor-string-fixes-to-wlr-taskbar.patch
new file mode 100644
index 0000000..ef3ffc4
--- /dev/null
+++ b/minor-string-fixes-to-wlr-taskbar.patch
@@ -0,0 +1,45 @@
+From 6a2d214b55cb1e8517afccb18c3799b22e16a57e Mon Sep 17 00:00:00 2001
+From: Daniel De Graaf <code@danieldg.net>
+Date: Wed, 5 Aug 2020 20:31:57 -0400
+Subject: [PATCH 1/2] Fix titles containing & and other HTML entities
+
+---
+ src/modules/wlr/taskbar.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
+index 23a91661..025e5c19 100644
+--- a/src/modules/wlr/taskbar.cpp
++++ b/src/modules/wlr/taskbar.cpp
+@@ -306,7 +306,7 @@ std::string Task::state_string(bool shortened) const
+ 
+ void Task::handle_title(const char *title)
+ {
+-    title_ = title;
++    title_ = Glib::Markup::escape_text(title);
+ }
+ 
+ void Task::handle_app_id(const char *app_id)
+
+From 4cd31cf3c36db71c04eabf3dad1f12b877991015 Mon Sep 17 00:00:00 2001
+From: Daniel De Graaf <code@danieldg.net>
+Date: Wed, 5 Aug 2020 20:35:41 -0400
+Subject: [PATCH 2/2] Fix wlr/taskbar all-outputs config string
+
+---
+ src/modules/wlr/taskbar.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/modules/wlr/taskbar.cpp b/src/modules/wlr/taskbar.cpp
+index 025e5c19..f7e11df9 100644
+--- a/src/modules/wlr/taskbar.cpp
++++ b/src/modules/wlr/taskbar.cpp
+@@ -709,7 +709,7 @@ bool Taskbar::show_output(struct wl_output *output) const
+ 
+ bool Taskbar::all_outputs() const
+ {
+-    static bool result = config_["all_outputs"].isBool() ? config_["all_outputs"].asBool() : false;
++    static bool result = config_["all-outputs"].isBool() ? config_["all-outputs"].asBool() : false;
+ 
+     return result;
+ }
diff --git a/waybar.spec b/waybar.spec
index ac3851d..4f45619 100644
--- a/waybar.spec
+++ b/waybar.spec
@@ -6,6 +6,8 @@ Summary:        Highly customizable Wayland bar for Sway and Wlroots based compo
 License:        MIT and Boost
 URL:            https://github.com/Alexays/Waybar
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# make wlr/taskbar config options match manual
+Patch0:         %{url}/pull/798.patch#/minor-string-fixes-to-wlr-taskbar.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -40,7 +42,7 @@ Recommends:     fontawesome-fonts
 %{summary}.
 
 %prep
-%autosetup -n Waybar-%{version}
+%autosetup -p1 -n Waybar-%{version}
 
 %build
 # FIXME: disable user service until a proper way to start it has been decided
@@ -64,7 +66,8 @@ Recommends:     fontawesome-fonts
 
 %changelog
 * Wed Aug 05 2020 Aleksei Bavshin <alebastr89@gmail.com> - 0.9.3-1
-- Update to 0.9.3
+- Update to 0.9.3 (closes rhbz#1866571)
+- Add patch for wlr/taskbar config strings
 
 * Mon Aug 03 2020 Aleksei Bavshin <alebastr89@gmail.com> - 0.9.2-4
 - Rebuild (date)