Accepting request 407208 from home:favogt:branches:KDE:Applications

Fix build by removing upstreamed fix-endless-loop.patch

OBS-URL: https://build.opensuse.org/request/show/407208
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmahjongg?expand=0&rev=35

fix-endless-loop.patch

@@ -1,29 +0,0 @@
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Fri, 01 Jul 2016 11:30:27 +0000
-Subject: Fix endless loop when configured layout cannot be loaded
-X-Git-Url: http://quickgit.kde.org/?p=kmahjongg.git&a=commitdiff&h=22600c69edbf59bc83377e3b96e3899ba935b1a3
----
-Fix endless loop when configured layout cannot be loaded
-
-Adjust the configured layout when the default is loaded as fallback.
-Otherwise loadSettings() will think that the layout has been changed in
-the settings, load the layout again and call startNewGame(), which in
-turn calls loadSettings() again, resulting in an endless loop.
-
-BUG: 361132
-FIXED-IN: 16.04.3
-REVIEW: 128279
----
-
-
---- a/kmahjongg.cpp
-+++ b/kmahjongg.cpp
-@@ -266,6 +266,7 @@
-         qCDebug(KMAHJONGG_LOG) << "Error loading the layout. Try to load the default layout.";
- 
-         m_boardLayout->loadDefault();
-+        Prefs::setLayout(m_boardLayout->path());
-     }
- }
- 
-

kmahjongg.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul  8 06:34:32 UTC 2016 - fvogt@suse.com
+
+- Fix build by removing upstreamed fix-endless-loop.patch
+
 -------------------------------------------------------------------
 Fri Jul  8 00:02:46 UTC 2016 - tittiatcoke@gmail.com
 

kmahjongg.spec

@@ -43,8 +43,6 @@ Url:            http://www.kde.org
 Version:        16.04.3
 Release:        0
 Source0:        kmahjongg-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM fix-endless-loop.patch boo#983173, kde#361132 -- fixes endless loop on startup if the configured layout cannot be loaded
-Patch:          fix-endless-loop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -55,7 +53,6 @@ by removing pieces of the same type.
 
 %prep
 %setup -q -n kmahjongg-%{version}
-%patch -p1
 
 %build
   %cmake_kf5 -d build