make multimc launch with default xdgDataHome

5 files changed, 25 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32e9eb719c2e..217016fc72b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = multimc5
 	pkgdesc = Minecraft launcher with ability to manage multiple instances.
 	pkgver = 0.6.14
-	pkgrel = 2
+	pkgrel = 3
 	url = https://multimc.org/
 	arch = i686
 	arch = x86_64
@@ -32,8 +32,8 @@ pkgbase = multimc5
 	sha512sums = df53f8b13ceeddc7922b6553730f29fdf92662277d20c9fc97d56965df1fe2349dd724ad8f911b105b02653fad112785e72ffadbf5571458fa23a45daf473e11
 	sha512sums = ede87db7e1ce67184409123720b48f65d35884bac5dfff34cc099c5d7520fd9173be00997df82ad29da4640928134a7199ffdd1cbaa83a72101dbed72736508b
 	sha512sums = d0e3152b885ec73b019dc0269d46e1ce0c43211bbcf05776a1e97f10fdc29f442930cc2d5144c0f979133e6aec68bf68474b924c746d1fa6b8c7f604af6eb83f
-	sha512sums = 1dc559a4b463bb9b0648d221df48a8ab562db186ea44fe0a3dba1af9c51306983faa27839abe7aea0478fb4d165fcf4af0db411fe063a18dcb9ca03c06196397
-	sha512sums = 82f66f6aac1f7c09d2e242768b77af692216cfa99925585a7871fa71bec8197a246b66a3af7d9eab8856655ce80e4ced26a0fc331579a18badd8f86005b5bf53
-	sha512sums = 07a7d3c13b418d18f96e3cf46b8608c69e7346554e8cc62c5d1b54b57c3b2be8ee4481f431b30b71795395c1b5ff5964f7403a6f77bf3ba316dcea3d472b0e8c
+	sha512sums = df077c24a235117cc391ac515dd1e28c10b2082093c80aac5dcf3d6d8feaf07acacc79bfd5f111e389e7972e6f0a3b6eb217202d13e362219ed22a5437cd49c7
+	sha512sums = 1aeb819e1fc21f887e8f212f44eb22ccad320b9a1783ed9b55b8a2a9875103f079aaeb0a051b811f7ceb0708caf20f3c7b0c4ba21b5bb5dc25b0fec977dfc878
+	sha512sums = a7c4654dd5ee260c25e0eab2dba0d929f09bc38b9af1505408a55058e73eaf35986b4a0e6de7e1893ebf860c472df984011340b3989f996a9d170cbc37dfd691
 
 pkgname = multimc5
diff --git a/PKGBUILD b/PKGBUILD
index f56027d9839a..8ebfe6e8f60e 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ _pkgname=multimc
 pkgver=0.6.14
 _nbtplusplusver=dc72a20b7efd304d12af2025223fad07b4b78464
 _quazipver=b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b
-pkgrel=2
+pkgrel=3
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
 arch=('i686' 'x86_64')
 url="https://multimc.org/"
@@ -39,9 +39,9 @@ sha512sums=('SKIP'
             'df53f8b13ceeddc7922b6553730f29fdf92662277d20c9fc97d56965df1fe2349dd724ad8f911b105b02653fad112785e72ffadbf5571458fa23a45daf473e11'
             'ede87db7e1ce67184409123720b48f65d35884bac5dfff34cc099c5d7520fd9173be00997df82ad29da4640928134a7199ffdd1cbaa83a72101dbed72736508b'
             'd0e3152b885ec73b019dc0269d46e1ce0c43211bbcf05776a1e97f10fdc29f442930cc2d5144c0f979133e6aec68bf68474b924c746d1fa6b8c7f604af6eb83f'
-            '1dc559a4b463bb9b0648d221df48a8ab562db186ea44fe0a3dba1af9c51306983faa27839abe7aea0478fb4d165fcf4af0db411fe063a18dcb9ca03c06196397'
-            '82f66f6aac1f7c09d2e242768b77af692216cfa99925585a7871fa71bec8197a246b66a3af7d9eab8856655ce80e4ced26a0fc331579a18badd8f86005b5bf53'
-            '07a7d3c13b418d18f96e3cf46b8608c69e7346554e8cc62c5d1b54b57c3b2be8ee4481f431b30b71795395c1b5ff5964f7403a6f77bf3ba316dcea3d472b0e8c')
+            'df077c24a235117cc391ac515dd1e28c10b2082093c80aac5dcf3d6d8feaf07acacc79bfd5f111e389e7972e6f0a3b6eb217202d13e362219ed22a5437cd49c7'
+            '1aeb819e1fc21f887e8f212f44eb22ccad320b9a1783ed9b55b8a2a9875103f079aaeb0a051b811f7ceb0708caf20f3c7b0c4ba21b5bb5dc25b0fec977dfc878'
+            'a7c4654dd5ee260c25e0eab2dba0d929f09bc38b9af1505408a55058e73eaf35986b4a0e6de7e1893ebf860c472df984011340b3989f996a9d170cbc37dfd691')
 
 prepare() {
   cd "${srcdir}/${pkgname}"
@@ -75,11 +75,11 @@ build() {
 
   cd build
   cmake -DCMAKE_BUILD_TYPE=Release \
-    -DMultiMC_UPDATER=OFF \
     -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DMultiMC_LAYOUT=lin-system \
+    -DLauncher_LAYOUT=lin-system \
     -DLauncher_APP_BINARY_NAME="${_pkgname}" \
     -DLauncher_SHARE_DEST_DIR="share/${_pkgname}" \
+    -DLauncher_LIBRARY_DEST_DIR="lib/${_pkgname}" \
     ..
   make
 }
diff --git a/fix-jars.patch b/fix-jars.patch
index 4d276841bc88..3d60d9dadac5 100644
--- a/fix-jars.patch
+++ b/fix-jars.patch
@@ -1,7 +1,8 @@
-diff '--color=auto' --unified --recursive --text --new-file Launcher0/launcher/Application.cpp Launcher1/launcher/Application.cpp
---- Launcher0/launcher/Application.cpp	2021-12-13 06:20:23.475484553 +0000
-+++ Launcher1/launcher/Application.cpp	2021-12-13 06:24:20.661422670 +0000
-@@ -524,6 +524,10 @@
+diff --git a/launcher/Application.cpp b/launcher/Application.cpp
+index 2d0c81bb..74f250fb 100644
+--- a/launcher/Application.cpp
++++ b/launcher/Application.cpp
+@@ -524,6 +524,10 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
          FS::updateTimestamp(m_rootPath);
  #endif
  
diff --git a/mmc-brand.patch b/mmc-brand.patch
index 4296441969bd..4685c6589944 100644
--- a/mmc-brand.patch
+++ b/mmc-brand.patch
@@ -1,18 +1,7 @@
-diff '--color=auto' -x '.*' --unified --recursive --text --new-file Launcher0/launcher/Application.cpp Launcher1/launcher/Application.cpp
---- Launcher0/launcher/Application.cpp	2021-12-13 07:43:23.274019056 +0000
-+++ Launcher1/launcher/Application.cpp	2021-12-13 07:50:33.016549365 +0000
-@@ -312,7 +312,7 @@
-         QString xdgDataHome = QFile::decodeName(qgetenv("XDG_DATA_HOME"));
-         if (xdgDataHome.isEmpty())
-             xdgDataHome = QDir::homePath() + QLatin1String("/.local/share");
--        dataPath = xdgDataHome + "/devlauncher";
-+        dataPath = xdgDataHome + "/multimc";
-         adjustedBy += "XDG standard " + dataPath;
- #elif defined(Q_OS_MAC)
-         QDir foo(FS::PathCombine(applicationDirPath(), "../../Data"));
-diff '--color=auto' -x '.*' --unified --recursive --text --new-file Launcher0/launcher/resources/multimc/multimc.qrc Launcher1/launcher/resources/multimc/multimc.qrc
---- Launcher0/launcher/resources/multimc/multimc.qrc	2021-12-13 06:20:23.494484805 +0000
-+++ Launcher1/launcher/resources/multimc/multimc.qrc	2021-12-13 08:03:35.943090237 +0000
+diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
+index 5b36cb3d..f2322279 100644
+--- a/launcher/resources/multimc/multimc.qrc
++++ b/launcher/resources/multimc/multimc.qrc
 @@ -282,6 +282,9 @@
          <file>32x32/instances/herobrine.png</file>
          <file>128x128/instances/herobrine.png</file>
@@ -23,10 +12,11 @@ diff '--color=auto' -x '.*' --unified --recursive --text --new-file Launcher0/la
          <file>32x32/instances/magitech.png</file>
          <file>128x128/instances/magitech.png</file>
  
-diff '--color=auto' -x '.*' --unified --recursive --text --new-file Launcher0/notsecrets/CMakeLists.txt Launcher1/notsecrets/CMakeLists.txt
---- Launcher0/notsecrets/CMakeLists.txt	2021-12-13 06:20:23.524485203 +0000
-+++ Launcher1/notsecrets/CMakeLists.txt	2021-12-13 06:37:14.725320153 +0000
-@@ -3,14 +3,14 @@
+diff --git a/notsecrets/CMakeLists.txt b/notsecrets/CMakeLists.txt
+index b5dd3cf8..3abd8002 100644
+--- a/notsecrets/CMakeLists.txt
++++ b/notsecrets/CMakeLists.txt
+@@ -3,14 +3,14 @@ target_link_libraries(secrets Qt5::Core)
  target_compile_definitions(secrets PUBLIC -DEMBED_SECRETS)
  target_include_directories(secrets PUBLIC .)
  
diff --git a/multimc.desktop b/multimc.desktop
index ba150cabc6e2..c25be047f9f1 100644
--- a/multimc.desktop
+++ b/multimc.desktop
@@ -5,8 +5,7 @@ GenericName=Minecraft Launcher
 Comment=Free, open source launcher and instance manager for Minecraft.
 Type=Application
 Terminal=false
-# not the best idea but...it works
-Exec=sh -c "multimc -d $HOME/.local/share/multimc"
+Exec=multimc
 Icon=multimc
 Categories=Game
 Keywords=game;minecraft;