16 files changed, 34 insertions, 46 deletions
diff --git a/games/multimc/files/patch-CMakeLists.txt b/games/multimc/files/patch-CMakeLists.txt
deleted file mode 100644
index 4769c4d..0000000
--- a/games/multimc/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.orig	2019-07-13 18:18:48 UTC
-+++ CMakeLists.txt
-@@ -38,6 +38,9 @@ if(UNIX AND APPLE)
- endif()
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
- 
-+# Fix build with Qt 5.13
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y")
-+
- ##################################### Set Application options #####################################
- 
- ######## Set URLs ########
diff --git a/games/multimc/files/patch-api_gui_DesktopServices.cpp b/games/multimc/files/patch-launcher_DesktopServices.cpp
index eb4fd15..0bc36b6 100644
--- a/games/multimc/files/patch-api_gui_DesktopServices.cpp
+++ b/games/multimc/files/patch-launcher_DesktopServices.cpp
@@ -1,5 +1,5 @@
---- api/gui/DesktopServices.cpp.orig	2019-02-20 23:45:36 UTC
-+++ api/gui/DesktopServices.cpp
+--- launcher/DesktopServices.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/DesktopServices.cpp
 @@ -7,7 +7,7 @@
  /**
   * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing.
diff --git a/games/multimc/files/patch-api_logic_FileSystem.cpp b/games/multimc/files/patch-launcher_FileSystem.cpp
index 22c10d8..0543fae 100644
--- a/games/multimc/files/patch-api_logic_FileSystem.cpp
+++ b/games/multimc/files/patch-launcher_FileSystem.cpp
@@ -1,6 +1,6 @@
---- api/logic/FileSystem.cpp.orig	2019-03-07 17:30:10 UTC
-+++ api/logic/FileSystem.cpp
-@@ -398,7 +398,7 @@ QString getDesktopDir()
+--- launcher/FileSystem.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/FileSystem.cpp
+@@ -403,7 +403,7 @@ QString getDesktopDir()
  bool createShortCut(QString location, QString dest, QStringList args, QString name,
                            QString icon)
  {
diff --git a/games/multimc/files/patch-api_logic_FileSystem__test.cpp b/games/multimc/files/patch-launcher_FileSystem__test.cpp
index ad6a41b..c50df7e 100644
--- a/games/multimc/files/patch-api_logic_FileSystem__test.cpp
+++ b/games/multimc/files/patch-launcher_FileSystem__test.cpp
@@ -1,5 +1,5 @@
---- api/logic/FileSystem_test.cpp.orig	2019-03-07 17:32:17 UTC
-+++ api/logic/FileSystem_test.cpp
+--- launcher/FileSystem_test.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/FileSystem_test.cpp
 @@ -119,7 +119,7 @@ slots:
  
  // this is only valid on linux
diff --git a/games/multimc/files/patch-application_MultiMC.cpp b/games/multimc/files/patch-launcher_MultiMC.cpp
index e2691e4..10a72e5 100644
--- a/games/multimc/files/patch-application_MultiMC.cpp
+++ b/games/multimc/files/patch-launcher_MultiMC.cpp
@@ -1,6 +1,6 @@
---- application/MultiMC.cpp.orig	2019-03-08 00:50:32 UTC
-+++ application/MultiMC.cpp
-@@ -324,7 +324,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplicatio
+--- launcher/MultiMC.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/MultiMC.cpp
+@@ -487,7 +487,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplicatio
      // Set up paths
      {
          // Root path is used for updates.
diff --git a/games/multimc/files/patch-application_UpdateController.cpp b/games/multimc/files/patch-launcher_UpdateController.cpp
index ab49773..4dc9b99 100644
--- a/games/multimc/files/patch-application_UpdateController.cpp
+++ b/games/multimc/files/patch-launcher_UpdateController.cpp
@@ -1,5 +1,5 @@
---- application/UpdateController.cpp.orig	2019-03-08 00:52:03 UTC
-+++ application/UpdateController.cpp
+--- launcher/UpdateController.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/UpdateController.cpp
 @@ -90,7 +90,7 @@ void UpdateController::installUpdates()
      qDebug() << "Installing updates.";
  #ifdef Q_OS_WIN
diff --git a/games/multimc/files/patch-application_install__prereqs.cmake.in b/games/multimc/files/patch-launcher_install__prereqs.cmake.in
index 8ca7a44..4a442c3 100644
--- a/games/multimc/files/patch-application_install__prereqs.cmake.in
+++ b/games/multimc/files/patch-launcher_install__prereqs.cmake.in
@@ -1,5 +1,5 @@
---- application/install_prereqs.cmake.in.orig	2019-03-08 00:54:15 UTC
-+++ application/install_prereqs.cmake.in
+--- launcher/install_prereqs.cmake.in.orig	2021-09-08 22:27:46 UTC
++++ launcher/install_prereqs.cmake.in
 @@ -23,5 +23,4 @@ set(gp_cmd_paths ${gp_cmd_paths}
  )
  
diff --git a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp b/games/multimc/files/patch-launcher_java_JavaUtils.cpp
index 4bad181..156841e 100644
--- a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp
+++ b/games/multimc/files/patch-launcher_java_JavaUtils.cpp
@@ -1,5 +1,5 @@
---- api/logic/java/JavaUtils.cpp.orig	2021-07-16 14:03:58 UTC
-+++ api/logic/java/JavaUtils.cpp
+--- launcher/java/JavaUtils.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/java/JavaUtils.cpp
 @@ -31,7 +31,7 @@ JavaUtils::JavaUtils()
  {
  }
diff --git a/games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp b/games/multimc/files/patch-launcher_minecraft_MinecraftInstance.cpp
index 67276a6..c073576 100644
--- a/games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp
+++ b/games/multimc/files/patch-launcher_minecraft_MinecraftInstance.cpp
@@ -1,6 +1,6 @@
---- api/logic/minecraft/MinecraftInstance.cpp.orig	2019-03-08 14:41:15 UTC
-+++ api/logic/minecraft/MinecraftInstance.cpp
-@@ -161,7 +161,11 @@ QString MinecraftInstance::binRoot() const
+--- launcher/minecraft/MinecraftInstance.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/minecraft/MinecraftInstance.cpp
+@@ -181,7 +181,11 @@ QString MinecraftInstance::binRoot() const
  
  QString MinecraftInstance::getNativePath() const
  {
diff --git a/games/multimc/files/patch-api_logic_minecraft_OpSys.cpp b/games/multimc/files/patch-launcher_minecraft_OpSys.cpp
index 3879286..2b21d80 100644
--- a/games/multimc/files/patch-api_logic_minecraft_OpSys.cpp
+++ b/games/multimc/files/patch-launcher_minecraft_OpSys.cpp
@@ -1,5 +1,5 @@
---- api/logic/minecraft/OpSys.cpp.orig	2019-03-09 16:23:18 UTC
-+++ api/logic/minecraft/OpSys.cpp
+--- launcher/minecraft/OpSys.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/minecraft/OpSys.cpp
 @@ -17,6 +17,8 @@
  
  OpSys OpSys_fromString(QString name)
diff --git a/games/multimc/files/patch-api_logic_minecraft_OpSys.h b/games/multimc/files/patch-launcher_minecraft_OpSys.h
index 5286946..21899b8 100644
--- a/games/multimc/files/patch-api_logic_minecraft_OpSys.h
+++ b/games/multimc/files/patch-launcher_minecraft_OpSys.h
@@ -1,5 +1,5 @@
---- api/logic/minecraft/OpSys.h.orig	2019-03-09 16:25:37 UTC
-+++ api/logic/minecraft/OpSys.h
+--- launcher/minecraft/OpSys.h.orig	2021-09-08 22:27:46 UTC
++++ launcher/minecraft/OpSys.h
 @@ -18,6 +18,7 @@
  enum OpSys
  {
diff --git a/games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp b/games/multimc/files/patch-launcher_minecraft_launch_ExtractNatives.cpp
index e981539..eb49eba 100644
--- a/games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp
+++ b/games/multimc/files/patch-launcher_minecraft_launch_ExtractNatives.cpp
@@ -1,5 +1,5 @@
---- api/logic/minecraft/launch/ExtractNatives.cpp.orig	2017-12-18 00:19:43 UTC
-+++ api/logic/minecraft/launch/ExtractNatives.cpp
+--- launcher/minecraft/launch/ExtractNatives.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/minecraft/launch/ExtractNatives.cpp
 @@ -23,6 +23,14 @@
  #include "FileSystem.h"
  #include <QDir>
@@ -14,4 +14,4 @@
 +
  static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement)
  {
- 	if (!target.endsWith(suffix))
+     if (!target.endsWith(suffix))
diff --git a/games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp b/games/multimc/files/patch-launcher_minecraft_launch_PrintInstanceInfo.cpp
index be5c158..7e02127 100644
--- a/games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp
+++ b/games/multimc/files/patch-launcher_minecraft_launch_PrintInstanceInfo.cpp
@@ -1,5 +1,5 @@
---- api/logic/minecraft/launch/PrintInstanceInfo.cpp.orig	2019-03-07 21:42:07 UTC
-+++ api/logic/minecraft/launch/PrintInstanceInfo.cpp
+--- launcher/minecraft/launch/PrintInstanceInfo.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/minecraft/launch/PrintInstanceInfo.cpp
 @@ -19,8 +19,9 @@
  #include "PrintInstanceInfo.h"
  #include <launch/LaunchTask.h>
diff --git a/games/multimc/files/patch-api_logic_tools_MCEditTool.cpp b/games/multimc/files/patch-launcher_tools_MCEditTool.cpp
index 81d3825..b644a0f 100644
--- a/games/multimc/files/patch-api_logic_tools_MCEditTool.cpp
+++ b/games/multimc/files/patch-launcher_tools_MCEditTool.cpp
@@ -1,5 +1,5 @@
---- api/logic/tools/MCEditTool.cpp.orig	2019-03-09 18:30:20 UTC
-+++ api/logic/tools/MCEditTool.cpp
+--- launcher/tools/MCEditTool.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/tools/MCEditTool.cpp
 @@ -52,7 +52,7 @@ QString MCEditTool::getProgramPath()
  #else
      const QString mceditPath = path();
diff --git a/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp b/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp
index 859c764..7175349 100644
--- a/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp
+++ b/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp
@@ -1,4 +1,4 @@
---- libraries/iconfix/internal/qiconloader.cpp.orig	2019-03-09 17:22:58 UTC
+--- libraries/iconfix/internal/qiconloader.cpp.orig	2021-09-08 22:27:46 UTC
 +++ libraries/iconfix/internal/qiconloader.cpp
 @@ -320,7 +320,7 @@ Description: Make it so that the QIcon loader honors /
               icon theme specification.
diff --git a/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp b/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp
index d3d6d0b..74e972d 100644
--- a/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp
+++ b/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp
@@ -1,6 +1,6 @@
---- libraries/systeminfo/src/sys_unix.cpp.orig	2019-03-09 17:25:33 UTC
+--- libraries/systeminfo/src/sys_unix.cpp.orig	2021-09-08 22:27:46 UTC
 +++ libraries/systeminfo/src/sys_unix.cpp
-@@ -18,6 +18,7 @@ Sys::KernelInfo Sys::getKernelInfo()
+@@ -47,6 +47,7 @@ Sys::KernelInfo Sys::getKernelInfo()
  uint64_t Sys::getSystemRam()
  {
      std::string token;
@@ -8,7 +8,7 @@
      std::ifstream file("/proc/meminfo");
      while(file >> token)
      {
-@@ -36,6 +37,19 @@ uint64_t Sys::getSystemRam()
+@@ -65,6 +66,19 @@ uint64_t Sys::getSystemRam()
          // ignore rest of the line
          file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
      }