Accepting request 443404 from home:luca_b:test_KA
KDE Applications - please review OBS-URL: https://build.opensuse.org/request/show/443404 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kshisen?expand=0&rev=39
This commit is contained in:
Raymond Wooninck
Git OBS Bridge
parent
bc0f69f183
commit
8daa01cc67
25
cpp14.patch
25
cpp14.patch
@ -1,25 +0,0 @@
|
||||
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
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c467377877c7936d6eb5666e480835bd61b85975e34284eb701a0519af99b276
|
||||
size 343580
|
||||
3
kshisen-16.11.80.tar.xz
Normal file
3
kshisen-16.11.80.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4169127e8c19e59dedd8476968d8d310847a9645e1cea4eba08adfe33dbc8cb1
|
||||
size 344332
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 29 12:36:40 UTC 2016 - tittiatcoke@gmail.com
|
||||
|
||||
- Update to KDE Applications 16.11.80
|
||||
* KDE Applications 16.12.0 Beta
|
||||
* https://www.kde.org/announcements/announce-applications-16.12-beta.php
|
||||
|
||||
- Dropped patches:
|
||||
+ cpp14.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 9 06:22:27 UTC 2016 - lbeltrame@kde.org
|
||||
|
||||
|
||||
52
kshisen.spec
52
kshisen.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kshisen
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,28 +17,37 @@
|
||||
|
||||
|
||||
Name: kshisen
|
||||
BuildRequires: libkdegames-devel
|
||||
BuildRequires: libkmahjongg-devel
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: kconfig-devel
|
||||
BuildRequires: kcrash-devel
|
||||
BuildRequires: kdbusaddons-devel
|
||||
BuildRequires: kdoctools-devel
|
||||
BuildRequires: kxmlgui-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(Qt5Core)
|
||||
BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: pkgconfig(Qt5Test)
|
||||
BuildRequires: xz
|
||||
Version: 16.11.80
|
||||
Release: 0
|
||||
%define kf5_version 5.26.0
|
||||
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
|
||||
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||
Summary: Shisen-Sho Mahjongg-like game
|
||||
License: GPL-2.0+
|
||||
Group: Amusements/Games/Board/Other
|
||||
Url: http://www.kde.org
|
||||
Version: 16.08.3
|
||||
Release: 0
|
||||
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: 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(Qt5Quick)
|
||||
BuildRequires: pkgconfig(Qt5QuickWidgets)
|
||||
BuildRequires: pkgconfig(Qt5Svg)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
Obsoletes: %{name}5 < %{version}
|
||||
Provides: %{name}5 = %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -48,11 +57,8 @@ Shisen-Sho (KShishen) is a game similar to Mahjongg. The object of the
|
||||
game is to remove all tiles from the field. This is done by removing
|
||||
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
|
||||
@ -62,7 +68,7 @@ two tiles with of the same type until no tile is left.
|
||||
%kf5_makeinstall -C build
|
||||
%suse_update_desktop_file -r org.kde.kshisen Game BoardGame
|
||||
|
||||
%files
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING COPYING.DOC
|
||||
%{_kf5_bindir}/kshisen
|
||||
@ -72,7 +78,7 @@ two tiles with of the same type until no tile is left.
|
||||
%{_kf5_configkcfgdir}/
|
||||
%{_kf5_sharedir}/sounds/kshisen/
|
||||
%{_kf5_kxmlguidir}/
|
||||
%dir %{_kf5_appstreamdir}
|
||||
%{_kf5_appstreamdir}/org.kde.kshisen.appdata.xml
|
||||
%dir %{_kf5_appstreamdir}
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user