diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /kde-apps/katomic/files | |
parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) |
gentoo resync : 18.11.2019
Diffstat (limited to 'kde-apps/katomic/files')
-rw-r--r-- | kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch | 55 | ||||
-rw-r--r-- | kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch | 24 |
2 files changed, 79 insertions, 0 deletions
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 000000000000..6dc49d2e100b --- /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 000000000000..42bc21731226 --- /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 |