add data_location patch

3 files changed, 30 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fad08845966..77d81d4915cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = commander-wars
 	pkgdesc = Advance Wars Clone with a lot of additions customizations and modding support
 	pkgver = 0.22.3.1
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/Robosturm/Commander_Wars
 	arch = x86_64
@@ -14,7 +14,9 @@ pkgbase = commander-wars
 	options = !emptydirs
 	source = https://github.com/Robosturm/Commander_Wars/archive/Beta_22_3_1.tar.gz
 	source = Commander Wars.desktop
+	source = data_location.patch
 	sha512sums = d025313ba93751c0c641f84ae00bfe7c389b2d61aab97f39c75b9c09977df8830a14f8110b276c92dca789eba5e0050f939aa41de918f90d7954fc1f309c5602
 	sha512sums = 7d670b514cc373423420879433eb72e18eed75ae9b5288b24e47fa3c8d5acd3ca33d86cd53a0992d8a11a6550cfc711a3d6ad37a3ada889bea3d19497e8d9fe7
+	sha512sums = 577ecfa46c049443c992fb17e5469451f12ceedfc0056a9805a4e732696dbc2bd79bce1a958d40b05c7f540e4a3a4a764be1c374d9dffdbcd1df54cb4c9652d9
 
 pkgname = commander-wars
diff --git a/PKGBUILD b/PKGBUILD
index f7e491bc4704..ac510cf2d4bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=commander-wars
 pkgver=0.22.3.1
 _pkgtag="${pkgver:2}"
 _pkgtag="Beta_${_pkgtag//./_}"
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Advance Wars Clone with a lot of additions customizations and modding support"
 arch=("$CARCH")
@@ -14,14 +14,17 @@ options=(!emptydirs)
 depends=('qt6-base' 'qt6-multimedia' 'qt6-wayland')
 makedepends=('samurai' 'qt6-tools')
 source=("https://github.com/Robosturm/Commander_Wars/archive/$_pkgtag.tar.gz"
-        "Commander Wars.desktop")
+        "Commander Wars.desktop"
+        "data_location.patch")
 sha512sums=('d025313ba93751c0c641f84ae00bfe7c389b2d61aab97f39c75b9c09977df8830a14f8110b276c92dca789eba5e0050f939aa41de918f90d7954fc1f309c5602'
-            '7d670b514cc373423420879433eb72e18eed75ae9b5288b24e47fa3c8d5acd3ca33d86cd53a0992d8a11a6550cfc711a3d6ad37a3ada889bea3d19497e8d9fe7')
+            '7d670b514cc373423420879433eb72e18eed75ae9b5288b24e47fa3c8d5acd3ca33d86cd53a0992d8a11a6550cfc711a3d6ad37a3ada889bea3d19497e8d9fe7'
+            '577ecfa46c049443c992fb17e5469451f12ceedfc0056a9805a4e732696dbc2bd79bce1a958d40b05c7f540e4a3a4a764be1c374d9dffdbcd1df54cb4c9652d9')
 
 prepare()
 {
 	cd "$srcdir/Commander_Wars-$_pkgtag"
 	mkdir -p build
+	patch -Np1 -i "$srcdir/data_location.patch"
 }
 
 build()
diff --git a/data_location.patch b/data_location.patch
new file mode 100644
index 000000000000..751b38a228f2
--- /dev/null
+++ b/data_location.patch
@@ -0,0 +1,21 @@
+diff --git a/coreengine/settings.cpp b/coreengine/settings.cpp
+index ca98e1fe0..60216b482 100644
+--- a/coreengine/settings.cpp
++++ b/coreengine/settings.cpp
+@@ -17,7 +17,7 @@
+ #include <QInputDevice>
+ #include "3rd_party/oxygine-framework/oxygine-framework.h"
+ 
+-const QString Settings::m_settingFile = "Commander_Wars.ini";
++const QString Settings::m_settingFile = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/Commander_Wars.ini";
+ float Settings::m_mouseSensitivity   = -0.75f;
+ qint32 Settings::m_x                 = 0;
+ qint32 Settings::m_y                 = 0;
+@@ -178,6 +178,7 @@ Settings::Settings()
+         defaultPath = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/commander_wars/";
+         defaultCoCount = 1;
+     }
++    defaultPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
+     auto devices = QInputDevice::devices();
+     bool hasTouch = false;
+     for (const auto & device: qAsConst(devices))