Accepting request 443657 from home:wolfi323:branches:KDE:Applications

- Re-add cpp14.patch, it still fails to build with gcc 4.8
- Cleanup build requirements, same as https://build.opensuse.org/package/rdiff/KDE:Applications/kshisen?linkrev=base&rev=33

OBS-URL: https://build.opensuse.org/request/show/443657
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kshisen?expand=0&rev=41

cpp14.patch

@@ -0,0 +1,25 @@
+Index: kshisen-16.08.2/src/board.cpp
+===================================================================
+--- kshisen-16.08.2.orig/src/board.cpp
++++ kshisen-16.08.2/src/board.cpp
+@@ -1401,9 +1401,9 @@ void Board::madeMove(TilePos const & til
+ {
+     std::unique_ptr<Move> move;
+     if (slide.empty()) {
+-        move = std::make_unique<Move>(tilePos1, tilePos2, field(tilePos1), field(tilePos2));
++        move = std::unique_ptr<Move>(new Move(tilePos1, tilePos2, field(tilePos1), field(tilePos2)));
+     } else {
+-        move = std::make_unique<Move>(tilePos1, tilePos2, field(tilePos1), field(tilePos2), slide);
++        move = std::unique_ptr<Move>(new Move(tilePos1, tilePos2, field(tilePos1), field(tilePos2), slide));
+     }
+     m_undo.push_back(std::move(move));
+     if (!m_redo.empty()) {
+@@ -1743,7 +1743,7 @@ bool Board::hint_I(PossibleMoves & possi
+ 
+ int Board::tilesLeft() const
+ {
+-    return std::count_if(m_field.begin(), m_field.end(), [](auto field) { return field != EMPTY; });
++    return std::count_if(m_field.begin(), m_field.end(), [](int field) { return field != EMPTY; });
+ }
+ 
+ int Board::currentTime() const

kshisen.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Dec  3 22:39:17 UTC 2016 - wbauer@tmo.at
+
+- Re-add cpp14.patch, it still fails to build with gcc 4.8
+
 -------------------------------------------------------------------
 Sat Dec  3 16:38:07 UTC 2016 - tittiatcoke@gmail.com
 

kshisen.spec

@@ -27,27 +27,22 @@ License:        GPL-2.0+
 Group:          Amusements/Games/Board/Other
 Url:            http://www.kde.org
 Source0:        kshisen-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE cpp14.patch fabian@ritter-vogt.de Use only c++11 features
+Patch1:         cpp14.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kconfig-devel
-BuildRequires:  kcoreaddons-devel
-BuildRequires:  kdeclarative-devel
-BuildRequires:  kdelibs4support-devel
-BuildRequires:  kdnssd-framework-devel
-BuildRequires:  knewstuff-devel
 BuildRequires:  kxmlgui-devel
+BuildRequires:  kcrash-devel
+BuildRequires:  kdbusaddons-devel
+BuildRequires:  kdoctools-devel
 BuildRequires:  libkdegames-devel
 BuildRequires:  libkmahjongg-devel
-BuildRequires:  phonon4qt5-devel
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
-BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5QuickWidgets)
-BuildRequires:  pkgconfig(Qt5Svg)
-BuildRequires:  pkgconfig(Qt5Widgets)
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -59,6 +54,7 @@ two tiles with of the same type until no tile is left.
 
 %prep
 %setup -q -n kshisen-%{version}
+%patch1 -p1
 
 %build
   %cmake_kf5 -d build