diff options
Diffstat (limited to 'kde-apps/kdiamond')
| -rw-r--r-- | kde-apps/kdiamond/Manifest | 1 | ||||
| -rw-r--r-- | kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch | 24 | ||||
| -rw-r--r-- | kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch | 33 | ||||
| -rw-r--r-- | kde-apps/kdiamond/kdiamond-19.08.3.ebuild | 37 |
4 files changed, 95 insertions, 0 deletions
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest index a435066d6e1b..30a33c45ab05 100644 --- a/kde-apps/kdiamond/Manifest +++ b/kde-apps/kdiamond/Manifest @@ -1,2 +1,3 @@ DIST kdiamond-19.04.3.tar.xz 4720096 BLAKE2B 82918744f40ac9688263b4d326c51af90586fcf1732a35c43fa7942893a602813f510687c06cc73624de577f6294be8454f481be814d2985151c5bf56ee9dcc5 SHA512 04888283d7efeff81e9b5354fd8b1ee64e66100a36d247182781a40c74b73c3ce485c54f2e3d840297d5863a37eb2b8e849316b8acfbda6447608ebdc86f5c87 DIST kdiamond-19.08.2.tar.xz 4694124 BLAKE2B 7037fcf7cdb43dbb217326066b30aa47ffd23125f36d00578076d84d7a62a2ef63e65c792a30f25690dc4913f414ee54cf76a7f7e5519287f93484c95a5670b2 SHA512 3626805431c7acf3a00ed0d3a8c1d3e6f0cf7fe5cd4712235e916d06697a61e1433e97deea5a6eb96411ce08df660cbf008a22fe98c2e0489c9f28c2f9755f76 +DIST kdiamond-19.08.3.tar.xz 4694440 BLAKE2B c5026fb0afbde5368cbc6efb658ab692e6e7d941bed40e10279f4027f335345838bc64d804cc2ac2c52b846380355ef069b817aaaa2b932cef7ea1fe227dc39b SHA512 68fd61fd0212a6605ac891b845b763f4fa9c1b6dae7906d67059d85d99fd7f3a4e30e2333e06dc7c1e4fb026f7ebab9d5cc951b5251e25381896cd52f9b7741d diff --git a/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch new file mode 100644 index 000000000000..e0ea1ef57877 --- /dev/null +++ b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch @@ -0,0 +1,24 @@ +From df737a7dd5134ba021dc6228fe815974af4a6bfc Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Sun, 8 Sep 2019 21:15:26 +0200 +Subject: GIT_SILENT: QLatin1Literal->QLatin1String + +--- + src/main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.cpp b/src/main.cpp +index 6afdc2a..5f9f431 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -46,7 +46,7 @@ int main(int argc, char **argv) + + qsrand(time(nullptr)); + KLocalizedString::setApplicationDomain("kdiamond"); +- KAboutData about(QStringLiteral("kdiamond"), i18nc("The application's name", "KDiamond"), QLatin1Literal(version), i18n(description), ++ KAboutData about(QStringLiteral("kdiamond"), i18nc("The application's name", "KDiamond"), QLatin1String(version), i18n(description), + KAboutLicense::GPL, i18n("(C) 2008-2010 Stefan Majewsky and others"), QStringLiteral("http://games.kde.org/kdiamond")); + about.addAuthor(i18n("Stefan Majewsky"), i18n("Original author and current maintainer"), QStringLiteral("majewsky@gmx.net")); + about.addAuthor(i18n("Paul Bunbury"), i18n("Gameplay refinement"), QStringLiteral("happysmileman@googlemail.com")); +-- +cgit v1.1 diff --git a/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch new file mode 100644 index 000000000000..9002776d0d08 --- /dev/null +++ b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch @@ -0,0 +1,33 @@ +From fe17299b2757d3c0106fbfff325440de0830048f Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Tue, 17 Sep 2019 13:39:44 +0200 +Subject: Make it compiles against qt5.14 + +--- + src/game-state.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/game-state.cpp b/src/game-state.cpp +index c0c35d5..b2c2416 100644 +--- a/src/game-state.cpp ++++ b/src/game-state.cpp +@@ -19,7 +19,7 @@ + #include "game-state.h" + #include "settings.h" + +-#include <QTime> ++#include <QElapsedTimer> + #include <KLocalizedString> + #include <KNotification> + +@@ -32,7 +32,7 @@ public: + GameStatePrivate(); + ~GameStatePrivate(); + +- QTime m_gameTime, m_pauseTime; ++ QElapsedTimer m_gameTime, m_pauseTime; + + Mode m_mode; + State m_state; +-- +cgit v1.1 diff --git a/kde-apps/kdiamond/kdiamond-19.08.3.ebuild b/kde-apps/kdiamond/kdiamond-19.08.3.ebuild new file mode 100644 index 000000000000..3ec0152cbb2f --- /dev/null +++ b/kde-apps/kdiamond/kdiamond-19.08.3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +PVCUT=$(ver_cut 1-3) +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Single player three-in-a-row game" +HOMEPAGE="https://kde.org/applications/games/kdiamond/ +https://games.kde.org/game.php?game=kdiamond" +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND=" + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-apps/libkdegames-${PVCUT}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch ) |