rpm/kshisen
SHA256
1
0
Fork 0
forked from pool/kshisen
Code Pull Requests Activity

Accepting request 1151017 from KDE:Applications

Browse Source 
KDE release gear 24.02.0

OBS-URL: https://build.opensuse.org/request/show/1151017
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kshisen?expand=0&rev=141
This commit is contained in:
Ana Guerrero 2024-03-11 14:31:09 +00:00 committed by Git OBS Bridge
commit 2ae6f3bded
8 changed files with 68 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
applications.keyring
View File

Binary file not shown.

25
cpp14.patch
View File

@ -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

3
kshisen-23.08.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:393203f6a69fa291a2e353599e81abf804dca7a9af160fc0948ae0d37ff1b2dd
size 1008936

16
kshisen-23.08.4.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu75QACgkQu0YzUNbv
Me/swA//SjSeOGrzyRGTPMYB0rDqwuwx9cJDTXbpgjpc59xG9EEk9l6IV88vnhP3
b87/j3i7ePf9G0w2crB8bWGToiMnY96TKNjQIXQaceGQozpKQsSgH6MJYqskQCHA
n+soKGvgpZYPN8pXL94pWpD5o2xP7UxfmT4elPOA5IYxPKarjlD1xYhZ2vvZCfy+
AxvnVVUkUEnk29v4D5Ut0+u0chr22c+DXuJbtHkuimU8XRZVo11nTstKbQo4L+KP
51Ewop/CJHoNjWnsIeKZB+1wgu6sAFFRr0TYR7aTz7UEZkaxQoJXSmyZq3VsJ0TQ
n1WLK7HDgCQmLGowwxKRzvyJ5rAk1DRZlrPNBLdT/wHDQNRuwTVlLlcbovSR6ViR
stk9XoXFcTF+Vbde810AezcEZ/FOBzaDVv7ztX5DY0bKmSnVZtdmMg23ZW+ECPgi
qIdid8h/Qu4Dj4NsQG9juUCxw7cbnClQaXJ4J0Oqnwwg8mNzdeOCbq111SdLsHUE
DBe3nH2OLAKxtrHwQ848l0Zrba5wzF9lGFc+4rD66Z4IuJrQBS0Ecz3tl9fLtalR
JF8x8sJLY09pEl68G9TI0gXtS2M61kydCfmkXRiwy6I6IB2sxnxW3TvPNiaicIDd
GxWpkiRF4JQgI0EU9RPErI1tamjD8Drc+N+laMcdx1TWrafwXM0=
=DXLW
-----END PGP SIGNATURE-----

3
kshisen-24.02.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e668e6d31123fa3bfb9400bfdc9ba87488723e5881dda6e8b2a69f408b28c0f
size 1009868

16
kshisen-24.02.0.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVrOEACgkQu0YzUNbv
Me9MNw/+KyAap/YhosZ4Cg5LJd79BkdksW3vos+Gc+h3KcnXjf66k4FoTPbhLHdO
NA/gB8NTjMF6hRGlWKMLzOENiwoYkWnGYUkR4OA3Uxg0rUjTYTrY1my9H4ErYQ0s
gpwiLi3ZNXh1ZIW+fHOpq69IlTf5G7rAZpda+X09IT0DOau6QnwLivYBxniZd8MK
VLu64asuJEW4yJ4+VAFfpyB7p1gDfDMrGIQVK0Bvnlce28uf1kZkQW8MBK9S6UL2
QyRfWOj5tn2uW0ghCPuJ2wGV2y6IJvwsVY5QKrnia/xf0qlueStIFPiSn2alJ2cu
lOSEgC8e5Fi3pfzuyORcPBO3suh6QFv45kJt745hYQtZEDbEcpNK2MVNXGn17PKC
L9U+2Xob0jNVmOhy7/mtKkGO+dk+HznqoQg5FTuEdNi9j2jYqRuANiutLQisVaqA
tU/UMEdWe3HzRcHLAvka3uyTm6U/ZVH8jZ2US57z2x2xwzHUWphLAnjsV3Y/+ILh
vRVlxsZQ3ZYn0baMmWUvS2Lmtz7cuN8Q0b9MrKm15vZd+1wLhKrK70TIL+BcgXWT
w/lex4oVFKm1BjQzXy292W9dGaBtawBQOVnjjjRWUwi84rBzRQy97yKJCMIpeHVh
K62XQv07n9H2onVoNl67Uwe+8s2BE/1qJ12eAnw8l7m/mUYej5Q=
=Y1nJ
-----END PGP SIGNATURE-----

15
kshisen.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Feb 23 14:00:15 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.02.0
* New feature release
- No code change since 24.01.95
-------------------------------------------------------------------
Fri Feb 9 16:09:21 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 24.01.95
* https://kde.org/announcements/megarelease/6/rc2/
- Drop patch, no longer needed:
* cpp14.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 5 14:20:11 UTC 2023 - Christophe Marin <christophe@krop.fr> Tue Dec 5 14:20:11 UTC 2023 - Christophe Marin <christophe@krop.fr>

70
kshisen.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package kshisen # spec file for package kshisen
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,35 +16,34 @@
# #
%define kf6_version 5.246.0
%define qt6_version 6.6.0
%bcond_without released %bcond_without released
Name: kshisen Name: kshisen
Version: 23.08.4 Version: 24.02.0
Release: 0 Release: 0
Summary: Shisen-Sho Mahjongg-like game Summary: Shisen-Sho Mahjongg-like game
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://apps.kde.org/kshisen URL: https://apps.kde.org/kshisen
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz
%if %{with released} %if %{with released}
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source1: %{name}-%{version}.tar.xz.sig
Source2: applications.keyring Source2: applications.keyring
%endif %endif
# PATCH-FIX-OPENSUSE cpp14.patch fabian@ritter-vogt.de Use only c++11 features BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
Patch1: cpp14.patch BuildRequires: cmake(KDEGames6)
BuildRequires: extra-cmake-modules BuildRequires: cmake(KF6Config) >= %{kf6_version}
BuildRequires: update-desktop-files BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
BuildRequires: xz BuildRequires: cmake(KF6Crash) >= %{kf6_version}
BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version}
BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF6DocTools) >= %{kf6_version}
BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KMahjongglib6) >= 5.1.0
BuildRequires: cmake(KF5KDEGames) BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(KF5KMahjongglib) BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
BuildRequires: cmake(KF5XmlGui) Obsoletes: kshisen5 < %{version}
BuildRequires: cmake(Qt5Core) Provides: kshisen5 = %{version}
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Test)
Obsoletes: %{name}5 < %{version}
Provides: %{name}5 = %{version}
%description %description
Shisen-Sho (KShishen) is a game similar to Mahjongg. The object of the Shisen-Sho (KShishen) is a game similar to Mahjongg. The object of the
@ -57,28 +56,27 @@ two tiles with of the same type until no tile is left.
%autosetup -p1 %autosetup -p1
%build %build
%cmake_kf5 -d build %cmake_kf6
%cmake_build
%kf6_build
%install %install
%kf5_makeinstall -C build %kf6_install
%find_lang %{name} --with-man --all-name %find_lang %{name} --with-html --all-name
%{kf5_find_htmldocs}
%suse_update_desktop_file -r org.kde.kshisen Game BoardGame
%files %files
%license LICENSES/* %license LICENSES/*
%doc %lang(en) %{_kf5_htmldir}/en/kshisen/ %doc %lang(en) %{_kf6_htmldir}/en/kshisen/
%{_kf5_applicationsdir}/org.kde.kshisen.desktop %{_kf6_applicationsdir}/org.kde.kshisen.desktop
%{_kf5_appstreamdir}/org.kde.kshisen.appdata.xml %{_kf6_appstreamdir}/org.kde.kshisen.appdata.xml
%{_kf5_bindir}/kshisen %{_kf6_bindir}/kshisen
%{_kf5_configkcfgdir}/ %{_kf6_configkcfgdir}/kshisen.kcfg
%{_kf5_debugdir}/kshisen.categories %{_kf6_debugdir}/kshisen.categories
%{_kf5_iconsdir}/hicolor/*/apps/kshisen.* %{_kf6_iconsdir}/hicolor/*/apps/kshisen.*
%{_kf5_sharedir}/sounds/kshisen/ %{_kf6_sharedir}/sounds/kshisen/
%files lang -f %{name}.lang %files lang -f %{name}.lang
%exclude %{_kf6_htmldir}/en/kshisen/
%changelog %changelog