From 031dc12a20d4eac2fe78a5853639f71f718f9c48 Mon Sep 17 00:00:00 2001
From: bruno cuconato (@odanoburu) <bcclaro@gmail.com>
Date: Nov 25 2022 19:03:00 +0000
Subject: Bump to version 1.17.10 and fix recruiting crash on wayland


- add patch to fix crash when recruiting on wayland (https://github.com/wesnoth/wesnoth/issues/7104)
- fix whitespace in spec file

---

diff --git a/empty-window-stack.patch b/empty-window-stack.patch
new file mode 100644
index 0000000..a708299
--- /dev/null
+++ b/empty-window-stack.patch
@@ -0,0 +1,11 @@
+--- src/gui/widgets/text_box_base.cpp	2022-11-24 16:16:22.002103967 -0300
++++ src/gui/widgets/text_box_base.cpp	2022-11-24 16:16:39.702170887 -0300
+@@ -316,7 +316,7 @@
+ 			cursor_alpha_ = 255;
+ 			return;
+ 		default:
+-			if(get_window() != open_window_stack.back()) {
++			if(open_window_stack.size() != 0 && get_window() != open_window_stack.back()) {
+ 				cursor_alpha_ = 0;
+ 			} else {
+ 				cursor_alpha_ = (~cursor_alpha_) & 0xFF;
diff --git a/sources b/sources
index d7f9e5e..63258b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wesnoth-1.17.7.tar.bz2) = 961f5305c63e8ffd5f10f6d5204685f29fc3c0b9c50b1fd64185af57db5a6edd66a3b759cff5208aca3d958a7048bce0f6aaa9496f413af47f07c402bf9bd879
+SHA512 (wesnoth-1.17.10.tar.bz2) = 90a581befbd0899bf8ad874dd893ac55ebcd31b20f44713b55e86f8f2f1f0b9b8b6159eefbad804ca0170dae19b4c362adb4c7dd605376e45dad5456231d6958
diff --git a/wesnoth.spec b/wesnoth.spec
index 4128711..cb67243 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -1,7 +1,7 @@
 %global _hardened_build 1
 
 Name:           wesnoth
-Version:        1.17.7
+Version:        1.17.10
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -11,6 +11,7 @@ Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
 Source1:        wesnothd.service
 Source2:        %{name}.sysconfig
 Patch0:         scons-env.patch
+Patch1:         empty-window-stack.patch
 
 Requires:       wesnoth-data = %{version}
 BuildRequires:  gcc-c++
@@ -74,7 +75,7 @@ This package contains the game editor and development tools.
 %package data
 Summary:        %{summary}
 Requires:       %{name} = %{version}
-Requires:	dejavu-sans-fonts
+Requires:       dejavu-sans-fonts
 BuildArch:      noarch
 
 %description data
@@ -175,6 +176,10 @@ done
 %{_mandir}/*/man6/wesnoth*.6*
 
 %changelog
+* Fri Nov 25 2022 Bruno Cuconato <bcclaro+fedora@gmail.com> - 1.17.10-1
+- 1.17.10
+- Add patch for wayland crash when recruiting, see https://github.com/wesnoth/wesnoth/issues/7104
+
 * Mon Aug 22 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.7-1
 - 1.17.7
 
@@ -787,7 +792,7 @@ done
   dejavu-fonts (Latin)
   sazanami-fonts-gothic (Japanese)
   wqy-zenhei-fonts (Chinese)
-  We do not explicitly require these fonts.  Normally these fonts would be 
+  We do not explicitly require these fonts.  Normally these fonts would be
   already installed by your system to use that language.
 
 * Wed Dec 10 2008 Jon Ciesla <limb@jcomserv.net> - 1.4.6-4