KDE Gear 24.02 RC
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kshisen?expand=0&rev=189
This commit is contained in:
Luca Beltrame
Git OBS Bridge
parent
f93f045e6f
commit
51e1c89274
Binary file not shown.
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:393203f6a69fa291a2e353599e81abf804dca7a9af160fc0948ae0d37ff1b2dd
|
||||
size 1008936
|
||||
@ -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.01.95.tar.xz
Normal file
3
kshisen-24.01.95.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d6e063e0ae8ea80473a94cdad08efbf933622eda157e768bf94eb517873d5d98
|
||||
size 1009476
|
||||
16
kshisen-24.01.95.tar.xz.sig
Normal file
16
kshisen-24.01.95.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44qUACgkQOmpNuDnq
|
||||
ptcktQ//f11RAbNDANsqpu4hWYxgzZhQdYoH0xPZNStHxLpBkBQhgE5RUQ2pwRw8
|
||||
ANULYNnRoCJgS7dqHqny3YWCUch2rBIwWViUfvb0RQCUQ3nApRZsH4v2/YlhtQou
|
||||
Wn3tLDkRnbPar70Gkd8oOsNJTRNhUX65ipJ24mOJfJcGH5A4tpkVO7CA/zEsgK0W
|
||||
9cwOHcbUJxLleneRE7SeEvJIhcsG4QyX7Serpc0jMqliY1T40B6m/JxuSWG/bM63
|
||||
xmqu20LLfOtIp3P3R8yzM8jkT544BFVDpwmL1sb5TWJRQScopIwDdsvwnHet+JDV
|
||||
4Ct5j8HmFQYf+2npDe1H14QTN+ZzpAcCV9Jdh1InJaAOKlg3LLYEAhD0TlpaM0Me
|
||||
8ACB8Ikh7MOiyrAGoUeOoqkdgngu5R5ruqRw2dB1shDoWnreogVuFog/oEeUfWRu
|
||||
kLcvB7rF+3kxrfoC6snJRD5Ekn3kO5ifYxlqoEnMNcOgEM8DDqSWHXcY3SSYjZU3
|
||||
i3SDAjXv4HhnQBlYOZtP+TmaNs5aDaSE+V5AlApwwkVS/DgqVU8qk9dJDzx+ms6A
|
||||
4ufBMlRJ46HcKZaPNLXiqZuSe4oD9CzZ00V/F6/U+aXUWrsnq8fCyDHN1dcqnY38
|
||||
IO6WvJgsWnu5QdZhUk0fasy+I21Yj8gIMpcy0B/MN4JWrzQ5KSA=
|
||||
=ioXh
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
||||
70
kshisen.spec
70
kshisen.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# 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
|
||||
# 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
|
||||
Name: kshisen
|
||||
Version: 23.08.4
|
||||
Version: 24.01.95
|
||||
Release: 0
|
||||
Summary: Shisen-Sho Mahjongg-like game
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://apps.kde.org/kshisen
|
||||
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
|
||||
%if %{with released}
|
||||
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source2: applications.keyring
|
||||
%endif
|
||||
# PATCH-FIX-OPENSUSE cpp14.patch fabian@ritter-vogt.de Use only c++11 features
|
||||
Patch1: cpp14.patch
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: xz
|
||||
BuildRequires: cmake(KF5Config)
|
||||
BuildRequires: cmake(KF5Crash)
|
||||
BuildRequires: cmake(KF5DBusAddons)
|
||||
BuildRequires: cmake(KF5DocTools)
|
||||
BuildRequires: cmake(KF5KDEGames)
|
||||
BuildRequires: cmake(KF5KMahjongglib)
|
||||
BuildRequires: cmake(KF5XmlGui)
|
||||
BuildRequires: cmake(Qt5Core)
|
||||
BuildRequires: cmake(Qt5Gui)
|
||||
BuildRequires: cmake(Qt5Test)
|
||||
Obsoletes: %{name}5 < %{version}
|
||||
Provides: %{name}5 = %{version}
|
||||
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
|
||||
BuildRequires: cmake(KDEGames6)
|
||||
BuildRequires: cmake(KF6Config) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6Crash) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6DocTools) >= %{kf6_version}
|
||||
BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
|
||||
BuildRequires: cmake(KMahjongglib6) >= 5.1.0
|
||||
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
|
||||
BuildRequires: cmake(Qt6Gui) >= %{qt6_version}
|
||||
Obsoletes: kshisen5 < %{version}
|
||||
Provides: kshisen5 = %{version}
|
||||
|
||||
%description
|
||||
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
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build
|
||||
%cmake_build
|
||||
%cmake_kf6
|
||||
|
||||
%kf6_build
|
||||
|
||||
%install
|
||||
%kf5_makeinstall -C build
|
||||
%kf6_install
|
||||
|
||||
%find_lang %{name} --with-man --all-name
|
||||
%{kf5_find_htmldocs}
|
||||
|
||||
%suse_update_desktop_file -r org.kde.kshisen Game BoardGame
|
||||
%find_lang %{name} --with-html --all-name
|
||||
|
||||
%files
|
||||
%license LICENSES/*
|
||||
%doc %lang(en) %{_kf5_htmldir}/en/kshisen/
|
||||
%{_kf5_applicationsdir}/org.kde.kshisen.desktop
|
||||
%{_kf5_appstreamdir}/org.kde.kshisen.appdata.xml
|
||||
%{_kf5_bindir}/kshisen
|
||||
%{_kf5_configkcfgdir}/
|
||||
%{_kf5_debugdir}/kshisen.categories
|
||||
%{_kf5_iconsdir}/hicolor/*/apps/kshisen.*
|
||||
%{_kf5_sharedir}/sounds/kshisen/
|
||||
%doc %lang(en) %{_kf6_htmldir}/en/kshisen/
|
||||
%{_kf6_applicationsdir}/org.kde.kshisen.desktop
|
||||
%{_kf6_appstreamdir}/org.kde.kshisen.appdata.xml
|
||||
%{_kf6_bindir}/kshisen
|
||||
%{_kf6_configkcfgdir}/kshisen.kcfg
|
||||
%{_kf6_debugdir}/kshisen.categories
|
||||
%{_kf6_iconsdir}/hicolor/*/apps/kshisen.*
|
||||
%{_kf6_sharedir}/sounds/kshisen/
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%exclude %{_kf6_htmldir}/en/kshisen/
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user