summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-11-10 20:11:31 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-11-10 22:30:22 +0100
commit3fa6d920893766911f27b7775c0492b409944e6a (patch)
tree108d14d03f0cae1229fb85b03791e4cc3f3a8bb9 /kde-apps/katomic
parentkde-frameworks: Add KDE Frameworks 5.64.0 (diff)
downloadgentoo-3fa6d920893766911f27b7775c0492b409944e6a.tar.gz
gentoo-3fa6d920893766911f27b7775c0492b409944e6a.tar.bz2
gentoo-3fa6d920893766911f27b7775c0492b409944e6a.zip
kde-apps: Add KDE Applications 19.08.3
Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/katomic')
-rw-r--r--kde-apps/katomic/Manifest1
-rw-r--r--kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch55
-rw-r--r--kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch24
-rw-r--r--kde-apps/katomic/katomic-19.08.3.ebuild38
4 files changed, 118 insertions, 0 deletions
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 516a6d054b1..06fa7d578ee 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,2 +1,3 @@
DIST katomic-19.04.3.tar.xz 1422248 BLAKE2B afdda00fcb810e4c45ee855e5b1c7731f0f506fc2c9f81563799e21cd7f26678508655f3afc6075f0a3a39137399902bf79133bac6e7cd829754e3128b642ade SHA512 7a65cca9f49004d594b58aa911d46dd8e749da30e1f014804e89d62e95f669584c21064cb902cc1a6e7511c70467216b51f5142fc7f4dcafadb935d2c663e48d
DIST katomic-19.08.2.tar.xz 1422816 BLAKE2B b6565b13150edfaf50c10494f9573a44ef08c83b458b3970139c1a499c6d54d8f7e9f015eeffa2924b8a87a8c9a2388695fa151879c1e85b3d57132ce42db6a1 SHA512 75b4c1d2a3ca709c639d2cb1aad61ef145c6fbc00141c26ad0ddd3db4dd7d9a07b705b9875b5b84e8c95b28cbad62b7fbcd304abe07bfdc22af82d15f9251fdd
+DIST katomic-19.08.3.tar.xz 1423744 BLAKE2B 89c4a6c7a53a086d9da899d65ee552a12c86c663261f27239fe8efe64117342bc5667db6564a573954d86c26b7c6106c6a8b426083d6fcc74250d9fa63eda6dc SHA512 cbf777134dd7e6a8fe1684643943ac665c5a87e2e57d6633e61e6fee0528da2eb9b874506e6b4d8f4d83024f0d62c187296bae9a496f4f9bc3b1ad293baf8671
diff --git a/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch
new file mode 100644
index 00000000000..6dc49d2e100
--- /dev/null
+++ b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,55 @@
+From 8e1a20b26d60976afdc068f7203cf35147b94a85 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 19 Sep 2019 07:16:58 +0200
+Subject: Make it compile without deprecated method
+
+---
+ levelset.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/levelset.cpp b/levelset.cpp
+index 5e001c1..98e4b6d 100644
+--- a/levelset.cpp
++++ b/levelset.cpp
+@@ -176,13 +176,12 @@ const LevelData* LevelSet::levelData(int levelNum) const
+ const LevelData* LevelSet::readLevel(int levelNum) const
+ {
+ KConfigGroup config = m_levelsFile->group(QStringLiteral("Level")+QString::number(levelNum));
+- QString key;
+
+ QList<LevelData::Element> elements;
+
+ for (int j = 0; j < FIELD_SIZE; j++)
+ {
+- key.sprintf("feld_%02d", j);
++ const QString key = QString::asprintf("feld_%02d", j);
+ QString line = config.readEntry(key,QString());
+
+ for (int i = 0; i < FIELD_SIZE; i++)
+@@ -227,14 +226,13 @@ const Molecule* LevelSet::readLevelMolecule(int levelNum) const
+ Molecule* mol = new Molecule();
+ KConfigGroup config = m_levelsFile->group(QStringLiteral("Level")+QString::number(levelNum));
+
+- QString key;
+
+ atom current;
+
+ int atom_index = 1;
+ QString value;
+ while (true) {
+- key.sprintf("atom_%c", int2atom(atom_index));
++ const QString key = QString::asprintf("atom_%c", int2atom(atom_index));
+ value = config.readEntry(key,QString());
+ if (value.isEmpty())
+ break;
+@@ -259,7 +257,7 @@ const Molecule* LevelSet::readLevelMolecule(int levelNum) const
+ int max_i = -1;
+ for (int j = 0; j < MOLECULE_SIZE; j++) {
+
+- key.sprintf("mole_%d", j);
++ const QString key = QString::asprintf("mole_%d", j);
+ line = config.readEntry(key,QString());
+
+ int max_non_null_i = -1;
+--
+cgit v1.1
diff --git a/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch
new file mode 100644
index 00000000000..42bc2173122
--- /dev/null
+++ b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,24 @@
+From d8cf83cf8554914ea357920473ff4c722cf794bf Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 31 Oct 2019 13:30:42 +0100
+Subject: Make it compile against 5.15. This enum was unused
+
+---
+ gamewidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gamewidget.cpp b/gamewidget.cpp
+index d70213b..3639847 100644
+--- a/gamewidget.cpp
++++ b/gamewidget.cpp
+@@ -58,7 +58,7 @@ GameWidget::GameWidget ( const QString& levelSet, QWidget *parent )
+ // TODO uncomment DontSavePainterState optimization back after this bug in Qt 4.6 preview will be
+ // fixed (darktears promised it will get fixed in 4.6.0 release). Bug is about wrong coordinates
+ // for QPainter passed to QGS::drawForeground() function
+- m_view->setOptimizationFlags( QGraphicsView::DontClipPainter |
++ m_view->setOptimizationFlags(
+ //QGraphicsView::DontSavePainterState |
+ QGraphicsView::DontAdjustForAntialiasing );
+
+--
+cgit v1.1
diff --git a/kde-apps/katomic/katomic-19.08.3.ebuild b/kde-apps/katomic/katomic-19.08.3.ebuild
new file mode 100644
index 00000000000..1038eacef7a
--- /dev/null
+++ b/kde-apps/katomic/katomic-19.08.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Atomic Entertainment Game"
+HOMEPAGE="
+ https://kde.org/applications/games/katomic/
+ https://games.kde.org/game.php?game=katomic
+"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${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 )