gentoo resync : 31.03.2018

3 files changed, 137 insertions, 4 deletions

diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index ff4fd6381332..21a86180e134 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,7 +1,8 @@
 AUX hedgewars-0.9.22-rpath-fix.patch 677 BLAKE2B 361eac896d7c7e9b6b3fa5daf4c24214e868b2098db96445b612f5ac0a9ce3f09ec88ec7feaaa62e75be5e2f61e62e6ecae68417519b907f54e6eac051d320c4 SHA512 d4511d1d3d6da4d30e33cc12b7c12feb6cf25d1fcdaab4b09a7c4f7a2a5282826190a152e6c1609d2afab71ac001557d2a757c232382f5cd471753f8a4cee8ee
 AUX hedgewars-0.9.23-qt5-1.patch 2138 BLAKE2B f78b271762d3c171ece0a73ef560db03e2a4b390654a354bc28fef9344104598ae7717bbee55b6d2e21ca1597eed9f018c024fc3eec16d7d0a8c4da6bda9e4bb SHA512 f84cc2d0784cb56bebcbe5e25401c7f2c9e1f7704a11b5c14bf1c13bc016c523154a987ce1dfe69ad39f1596bf17d463d7b299301ee696f5a2fc640959b12542
 AUX hedgewars-0.9.23-qt5-2.patch 16874 BLAKE2B 1491cb7fd579afdd3e58a478c5b7dc3bfe0bc3d29e4698ee8d3518289a6d102743b55e9af516c8f393a244a094a5cbf916403c7209daf0a1878e566028b5817d SHA512 1bad068d33e1f5f174ef901085fdc5e7920c36a196d59ab8097062a48ac78990a921bc39125725f50228df109dab91a9b04b5b009a3aec709072310cfebe6b48
+AUX hedgewars-0.9.23-settings-saving.patch 5295 BLAKE2B 06f55d7f13847a311aa6c15142023940fec61c88ed304354211027887536cfabac5d4f2e4c00d96995b0809bb9d109f5a0542c9547dbd9ae37e7e4212c1e401d SHA512 e1a53bd18f3159bac05f917fb97c32b66e3ff5a3e1d7407a540078026e9a5e7deb6d28649f288d1306af4e72ee606c57d92b5b2182c06ec33dd32ed420534ebd
 DIST hedgewars-src-0.9.23.tar.bz2 173042171 BLAKE2B 8458cce459e59227a92f70a1a1593ce0e222030f519e554bea067890394322e8346d062a8552472280401272691d5ebb4c2e85d9e8824b3513d70d24cca4b880 SHA512 b9bcd6d32c7bb97c2766aacbc759dd48b7a4c7a72003ab2bf31cdfac94a6e08de740a689458c276d3c35b90e89a1af6c200f98f463e9554e8b176b5706dc3090
 DIST hedgewars_0.9.22-dfsg-7.debian.tar.xz 79016 BLAKE2B dda854b87db808520e3b6405e6eb28db085d23b78e4cdcce25a94992bc2551e2436401766cc39bf52fb7c5ad0e946a9792cc333813454fdfd615d2569e3fb16a SHA512 011d44989b6fcad9ae7a20fcb11a4e2b9a75d1ace6c6e4c2139cd7e67f13ea21d90b6c8a7afb76fa9a06c32537b00b8b4b7689967b3019300e93a7a6fe3e0fbf
-EBUILD hedgewars-0.9.23-r2.ebuild 2467 BLAKE2B e42cb40bf7e2a4a8cdb09868f558f925e20ca613789af4591aba53ba7dcc9dfdae031f5e9e1725d9a785d5983b7ae9816915d7cd32f8132bc5d48edcaa625669 SHA512 905bff2a4dd51f3b966c254b757a613aeffec4afaab7a4d40567712220317c0c32c03f67e862b6a87e5e10e211f812a0f53ab6bec526fc0c69039201d48eb34d
+EBUILD hedgewars-0.9.23-r3.ebuild 2458 BLAKE2B 065513e73b353aca198529b3fceafa0bdd59deb376b731a64d18f84b413f9e3b3cfb3ccfca77daaa200fd8833ea6e418786163e82db0cd354c83b4d36da8b5cc SHA512 c3f92346a844a736f081479304cd27a4a626c29d44ebd1cce39c3c45c493ef2f5b9cf5ec0911b1786a60c8bcc501249e2847ba88ab4349791594145051f9012e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.23-settings-saving.patch b/games-strategy/hedgewars/files/hedgewars-0.9.23-settings-saving.patch
new file mode 100644
index 000000000000..3997ac37649b
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.23-settings-saving.patch
@@ -0,0 +1,134 @@
+From f8e302e5ac5033c1b7ac5d83d6d8df3f15eb6178 Mon Sep 17 00:00:00 2001
+From: Wuzzy <Wuzzy2@mail.ru>
+Date: Tue, 27 Mar 2018 17:32:23 +0200
+Subject: [PATCH] Fix team files and settings not saving properly, and remove
+ FileEngine stuff from DLC
+
+This is done by using absolute paths and removing physfs://
+---
+ QTfrontend/game.cpp             |  4 ++--
+ QTfrontend/team.cpp             | 10 +++++-----
+ QTfrontend/ui/page/pagedata.cpp |  6 ------
+ QTfrontend/util/DataManager.cpp |  4 ++--
+ 4 files changed, 9 insertions(+), 15 deletions(-)
+
+diff --git a/QTfrontend/game.cpp b/QTfrontend/game.cpp
+index 224c38350..f071ef734 100644
+--- a/QTfrontend/game.cpp
++++ b/QTfrontend/game.cpp
+@@ -536,7 +536,7 @@ void HWGame::abort()
+ void HWGame::sendCampaignVar(const QByteArray &varToSend)
+ {
+     QString varToFind = QString::fromUtf8(varToSend);
+-    QSettings teamfile(QString("physfs://Teams/%1.hwt").arg(campaignTeam), QSettings::IniFormat, 0);
++    QSettings teamfile(QString(cfgdir->absolutePath() + "/Teams/%1.hwt").arg(campaignTeam), QSettings::IniFormat, 0);
+     teamfile.setIniCodec("UTF-8");
+     QString varValue = teamfile.value("Campaign " + campaign + "/" + varToFind, "").toString();
+     QByteArray command;
+@@ -553,7 +553,7 @@ void HWGame::writeCampaignVar(const QByteArray & varVal)
+     QString varToWrite = QString::fromUtf8(varVal.left(i));
+     QString varValue = QString::fromUtf8(varVal.mid(i + 1));
+ 
+-    QSettings teamfile(QString("physfs://Teams/%1.hwt").arg(campaignTeam), QSettings::IniFormat, 0);
++    QSettings teamfile(QString(cfgdir->absolutePath() + "/Teams/%1.hwt").arg(campaignTeam), QSettings::IniFormat, 0);
+     teamfile.setIniCodec("UTF-8");
+     teamfile.setValue("Campaign " + campaign + "/" + varToWrite, varValue);
+ }
+diff --git a/QTfrontend/team.cpp b/QTfrontend/team.cpp
+index 0586e622a..740697b7f 100644
+--- a/QTfrontend/team.cpp
++++ b/QTfrontend/team.cpp
+@@ -171,7 +171,7 @@ HWTeam & HWTeam::operator = (const HWTeam & other)
+ 
+ bool HWTeam::loadFromFile()
+ {
+-    QSettings teamfile(QString("physfs://Teams/%1.hwt").arg(DataManager::safeFileName(m_name)), QSettings::IniFormat, 0);
++    QSettings teamfile(QString(cfgdir->absolutePath() + "/Teams/%1.hwt").arg(DataManager::safeFileName(m_name)), QSettings::IniFormat, 0);
+     teamfile.setIniCodec("UTF-8");
+     m_name = teamfile.value("Team/Name", m_name).toString();
+     m_grave = teamfile.value("Team/Grave", "Statue").toString();
+@@ -204,7 +204,7 @@ bool HWTeam::loadFromFile()
+ 
+ bool HWTeam::fileExists()
+ {
+-    QFile f(QString("physfs://Teams/%1.hwt").arg(DataManager::safeFileName(m_name)));
++    QFile f(QString(cfgdir->absolutePath() + "/Teams/%1.hwt").arg(DataManager::safeFileName(m_name)));
+     return f.exists();
+ }
+ 
+@@ -220,7 +220,7 @@ bool HWTeam::deleteFile()
+ {
+     if(m_isNetTeam)
+         return false;
+-    QFile cfgfile(QString("physfs://Teams/%1.hwt").arg(DataManager::safeFileName(m_name)));
++    QFile cfgfile(QString(cfgdir->absolutePath() + "/Teams/%1.hwt").arg(DataManager::safeFileName(m_name)));
+     cfgfile.remove();
+     return true;
+ }
+@@ -229,12 +229,12 @@ bool HWTeam::saveToFile()
+ {
+     if (OldTeamName != m_name)
+     {
+-        QFile cfgfile(QString("physfs://Teams/%1.hwt").arg(DataManager::safeFileName(OldTeamName)));
++        QFile cfgfile(QString(cfgdir->absolutePath() + "/Teams/%1.hwt").arg(DataManager::safeFileName(OldTeamName)));
+         cfgfile.remove();
+         OldTeamName = m_name;
+     }
+ 
+-    QString fileName = QString("physfs://Teams/%1.hwt").arg(DataManager::safeFileName(m_name));
++    QString fileName = QString(cfgdir->absolutePath() + "/Teams/%1.hwt").arg(DataManager::safeFileName(m_name));
+     DataManager::ensureFileExists(fileName);
+     QSettings teamfile(fileName, QSettings::IniFormat, 0);
+     teamfile.setIniCodec("UTF-8");
+diff --git a/QTfrontend/ui/page/pagedata.cpp b/QTfrontend/ui/page/pagedata.cpp
+index ccdea5ac4..cc7d17b2a 100644
+--- a/QTfrontend/ui/page/pagedata.cpp
++++ b/QTfrontend/ui/page/pagedata.cpp
+@@ -31,8 +31,6 @@
+ #include "pagedata.h"
+ #include "databrowser.h"
+ #include "hwconsts.h"
+-#include "DataManager.h"
+-#include "FileEngine.h"
+ 
+ QLayout * PageDataDownload::bodyLayoutDefinition()
+ {
+@@ -197,9 +195,6 @@ void PageDataDownload::fileDownloaded()
+         out.write(reply->readAll());
+ 
+         out.close();
+-
+-        // now mount it
+-        FileEngineHandler::mount(fileName);
+     }
+ }
+ 
+@@ -229,7 +224,6 @@ void PageDataDownload::onPageLeave()
+     if (m_contentDownloaded)
+     {
+         m_contentDownloaded = false;
+-        //DataManager::instance().reload();
+     }
+ }
+ 
+diff --git a/QTfrontend/util/DataManager.cpp b/QTfrontend/util/DataManager.cpp
+index 3d69931cf..5c8aa4cc5 100644
+--- a/QTfrontend/util/DataManager.cpp
++++ b/QTfrontend/util/DataManager.cpp
+@@ -172,11 +172,11 @@ QString DataManager::settingsFileName()
+ {
+     if(m_settingsFileName.isEmpty())
+     {
+-        QFile settingsFile("physfs://settings.ini");
++        QFile settingsFile(cfgdir->absoluteFilePath("settings.ini"));
+ 
+         if(!settingsFile.exists())
+         {
+-            QFile oldSettingsFile("physfs://hedgewars.ini");
++            QFile oldSettingsFile(cfgdir->absoluteFilePath("hedgewars.ini"));
+ 
+             settingsFile.open(QFile::WriteOnly);
+             settingsFile.close();
+-- 
+2.16.1
+
diff --git a/games-strategy/hedgewars/hedgewars-0.9.23-r2.ebuild b/games-strategy/hedgewars/hedgewars-0.9.23-r3.ebuild
index 8087357bde63..ae864014ed82 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.23-r2.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.23-r3.ebuild
@@ -52,6 +52,7 @@ S="${WORKDIR}"/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch
 	"${FILESDIR}"/${P}-qt5-{1,2}.patch # bug 645504
+	"${FILESDIR}"/${P}-settings-saving.patch # bug 651810
 )
 
 src_configure() {
@@ -78,9 +79,6 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-
-	doicon misc/hedgewars.png
-	make_desktop_entry ${PN} Hedgewars
 	doman man/${PN}.6
 }