From 2a8df0eb389ec628125797abada03620cdded74d Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Mar 15 2020 11:56:43 +0000
Subject: Rebased to a1c7c5b snapshot with a separate desktop action for Wayland.


---

diff --git a/.gitignore b/.gitignore
index 46236d8..d6a1885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ goldendict-415f35e.tar.gz
 /goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz
 /goldendict-c53fe1c64061c7285b7451ff48089d443721c2a9.tar.gz
 /goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz
+/goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz
diff --git a/goldendict-add-x11-action.patch b/goldendict-add-x11-action.patch
deleted file mode 100644
index 22a8924..0000000
--- a/goldendict-add-x11-action.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a1c7c5b3762c292c2620af41428c3c6c3f758f04 Mon Sep 17 00:00:00 2001
-From: Vitaly Zaitsev <vitaly@easycoding.org>
-Date: Sun, 15 Mar 2020 10:15:58 +0100
-Subject: [PATCH] Added a desktop action as a workaround to crashes on Wayland.
-
-Also removed deprecated Encoding directive from desktop file.
-
-Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>
----
- redist/goldendict.desktop | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/redist/goldendict.desktop b/redist/goldendict.desktop
-index e4cbd42b..13a5fe8f 100755
---- a/redist/goldendict.desktop
-+++ b/redist/goldendict.desktop
-@@ -5,6 +5,10 @@ Categories=Office;Dictionary;Education;Qt;
- Name=GoldenDict
- GenericName=Multiformat Dictionary
- Comment=GoldenDict
--Encoding=UTF-8
- Icon=goldendict
- Exec=goldendict
-+Actions=X11;
-+
-+[Desktop Action X11]
-+Name=GoldenDict (X11)
-+Exec=env QT_QPA_PLATFORM=xcb goldendict
diff --git a/goldendict.spec b/goldendict.spec
index d347050..26362d2 100644
--- a/goldendict.spec
+++ b/goldendict.spec
@@ -1,17 +1,14 @@
 %global owner goldendict
-%global commit 353ea1793ed430193ce586e57c560867e4a2a55b
+%global commit a1c7c5b3762c292c2620af41428c3c6c3f758f04
 
 Name:		goldendict
 Version:	1.5
-Release:	0.25.RC2%{?dist}
+Release:	0.26.RC2%{?dist}
 Summary:	A feature-rich dictionary lookup program
 License:	GPLv3+
 URL:		http://goldendict.org
 Source0:	https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
 
-# https://github.com/goldendict/goldendict/pull/1238
-Patch100:	%{name}-add-x11-action.patch
-
 BuildRequires:	cmake(Qt5LinguistTools)
 BuildRequires:	cmake(Qt5XmlPatterns)
 BuildRequires:	cmake(Qt5Multimedia)
@@ -86,6 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/help
 
 %changelog
+* Sun Mar 15 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5-0.26.RC2
+- Rebased to a1c7c5b snapshot with a separate desktop action for Wayland.
+
 * Sun Mar 15 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5-0.25.RC2
 - Added a separate desktop icon for Gnome users with workaround.
 - Updated to 353ea17 snapshot with crash fixes under Qt 5.13+.
diff --git a/sources b/sources
index 6e7ce9a..ccec74c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz) = 6ee14aeac72796a034ef2d6f345fe7f5d5838759cbad5f59830672206b9eaae2b207c97cdbdde1964fc88e18561e26496741bcecec21e24ad7892e189ea7b025
+SHA512 (goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz) = 2bfd394bb2c8f6788a377970a5bc6e13e5082e9ac9e1d4b1ce70af67fd95d78f00aa543bf3ac161916fd3ea2dc767cffe6ec1f4321662ba39028e44caa2520b9