From ceaa36c87a2e9f3073120c384eb2a14a6b530db6 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 15 Oct 2022 11:13:13 +0200 Subject: [PATCH] games/multimc: update to 0.16.6 --- games/multimc/Makefile | 18 +++-- games/multimc/distinfo | 14 ++-- games/multimc/files/patch-CMakeLists.txt | 63 ++++++++++++---- .../files/patch-api_gui_DesktopServices.cpp | 56 -------------- .../files/patch-api_logic_FileSystem.cpp | 11 --- .../patch-api_logic_FileSystem__test.cpp | 11 --- .../multimc/files/patch-api_logic_Version.cpp | 11 --- .../files/patch-api_logic_java_JavaUtils.cpp | 29 -------- ...-api_logic_minecraft_MinecraftInstance.cpp | 14 ---- .../files/patch-api_logic_minecraft_OpSys.cpp | 27 ------- .../files/patch-api_logic_minecraft_OpSys.h | 26 ------- ..._logic_minecraft_launch_ExtractNatives.cpp | 17 ----- ...gic_minecraft_launch_PrintInstanceInfo.cpp | 74 ------------------- .../patch-api_logic_tools_MCEditTool.cpp | 11 --- .../files/patch-application_MultiMC.cpp | 11 --- .../patch-application_UpdateController.cpp | 11 --- ...atch-application_install__prereqs.cmake.in | 8 -- ...tch-libraries_classparser_src_javaendian.h | 41 ---------- ...libraries_iconfix_internal_qiconloader.cpp | 11 --- ...tch-libraries_systeminfo_src_sys__unix.cpp | 30 -------- games/multimc/pkg-plist | 14 ++-- 21 files changed, 74 insertions(+), 434 deletions(-) delete mode 100644 games/multimc/files/patch-api_gui_DesktopServices.cpp delete mode 100644 games/multimc/files/patch-api_logic_FileSystem.cpp delete mode 100644 games/multimc/files/patch-api_logic_FileSystem__test.cpp delete mode 100644 games/multimc/files/patch-api_logic_Version.cpp delete mode 100644 games/multimc/files/patch-api_logic_java_JavaUtils.cpp delete mode 100644 games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp delete mode 100644 games/multimc/files/patch-api_logic_minecraft_OpSys.cpp delete mode 100644 games/multimc/files/patch-api_logic_minecraft_OpSys.h delete mode 100644 games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp delete mode 100644 games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp delete mode 100644 games/multimc/files/patch-api_logic_tools_MCEditTool.cpp delete mode 100644 games/multimc/files/patch-application_MultiMC.cpp delete mode 100644 games/multimc/files/patch-application_UpdateController.cpp delete mode 100644 games/multimc/files/patch-application_install__prereqs.cmake.in delete mode 100644 games/multimc/files/patch-libraries_classparser_src_javaendian.h delete mode 100644 games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp delete mode 100644 games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp diff --git a/games/multimc/Makefile b/games/multimc/Makefile index 1592bfb89d15..928459a6e316 100644 --- a/games/multimc/Makefile +++ b/games/multimc/Makefile @@ -1,5 +1,5 @@ PORTNAME= multimc -DISTVERSION= 0.6.11 +DISTVERSION= 0.6.16 CATEGORIES= games java MAINTAINER= me@tsundoku.ne.jp @@ -14,9 +14,9 @@ RUN_DEPENDS= lwjgl>=2.9.3:games/lwjgl USES= cmake compiler:c++14-lang qt:5 USE_GITHUB= yes GH_ACCOUNT= MultiMC -GH_PROJECT= MultiMC5 -GH_TUPLE= MultiMC:libnbtplusplus:508eda8:libnbtplusplus/libraries/libnbtplusplus \ - MultiMC:quazip:3691d57:quazip/libraries/quazip +GH_PROJECT= Launcher +GH_TUPLE= MultiMC:libnbtplusplus:dc72a20:libnbtplusplus/libraries/libnbtplusplus \ + MultiMC:quazip:b1a72ac:quazip/libraries/quazip USE_LDCONFIG= yes USE_JAVA= 1.8+ USE_QT= core concurrent gui network testlib:build widgets xml \ @@ -28,7 +28,15 @@ CXXFLAGS+= -Wno-inconsistent-missing-override \ -Wno-delete-non-virtual-dtor \ -DLWJGL_DIR='\"${LOCALBASE}/lib/lwjgl\"' +DESKTOP_ENTRIES= "MultiMC" \ + "Minecraft launcher with the ability to manage multiple instances" \ + "multimc.svg" \ + "DevLauncher" \ + "game;Minecraft;" \ + false + post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libMultiMC_*.so + ${INSTALL_DATA} ${WRKSRC}/launcher/resources/iOS/scalable/multimc.svg \ + ${STAGEDIR}${PREFIX}/share/pixmaps/multimc.svg .include diff --git a/games/multimc/distinfo b/games/multimc/distinfo index 24deeb4d7c4b..610b2b615f82 100644 --- a/games/multimc/distinfo +++ b/games/multimc/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1590852396 -SHA256 (MultiMC-MultiMC5-0.6.11_GH0.tar.gz) = 7cad736f1fe3f2887aeaa7a7f3927930e16ed815c98e4cf3a7378a99c426a775 -SIZE (MultiMC-MultiMC5-0.6.11_GH0.tar.gz) = 2379632 -SHA256 (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 14f16c8e6dc264017684774cdd9c6f149855e464895b28c29f9f55ea76d34f1a -SIZE (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 47406 -SHA256 (MultiMC-quazip-3691d57_GH0.tar.gz) = 17a9457360053fa2c6c849c75fa760383036bd14d7d8f7bd0d958bfc2a584009 -SIZE (MultiMC-quazip-3691d57_GH0.tar.gz) = 103508 +TIMESTAMP = 1665823045 +SHA256 (MultiMC-Launcher-0.6.16_GH0.tar.gz) = 2ff5a4368a01bf467790667a7a1e7728b4a2639bea2a15b285aa309ff1d8a557 +SIZE (MultiMC-Launcher-0.6.16_GH0.tar.gz) = 2149521 +SHA256 (MultiMC-libnbtplusplus-dc72a20_GH0.tar.gz) = 1c7d385c4f052ee842c4bcb20e5cac36c5ee1d1b34b97606bbc815f62238eb06 +SIZE (MultiMC-libnbtplusplus-dc72a20_GH0.tar.gz) = 48427 +SHA256 (MultiMC-quazip-b1a72ac_GH0.tar.gz) = 7f558a50de718cb22018de644cad56a2a8eb3726455345785873d4f4b132526e +SIZE (MultiMC-quazip-b1a72ac_GH0.tar.gz) = 103493 diff --git a/games/multimc/files/patch-CMakeLists.txt b/games/multimc/files/patch-CMakeLists.txt index 52633d6b8512..bba9670ea79f 100644 --- a/games/multimc/files/patch-CMakeLists.txt +++ b/games/multimc/files/patch-CMakeLists.txt @@ -1,18 +1,51 @@ ---- CMakeLists.txt.orig 2020-03-29 01:12:57 UTC +--- CMakeLists.txt.orig 2022-06-09 21:50:30 UTC +++ CMakeLists.txt -@@ -32,11 +32,14 @@ set(CMAKE_C_STANDARD_REQUIRED true) - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_C_STANDARD 11) - include(GenerateExportHeader) --set(CMAKE_CXX_FLAGS " -Wall -pedantic -Werror -Wno-deprecated-declarations -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong --param=ssp-buffer-size=4 -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS}") -+set(CMAKE_CXX_FLAGS " -Wall -pedantic -Wno-deprecated-declarations -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong --param=ssp-buffer-size=4 -O3 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS}") - if(UNIX AND APPLE) - set(CMAKE_CXX_FLAGS " -stdlib=libc++ ${CMAKE_CXX_FLAGS}") - 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") +@@ -158,14 +158,18 @@ endif() + ####################################### Install layout ####################################### + + # How to install the build results +-set(Launcher_LAYOUT "auto" CACHE STRING "The layout for the launcher installation (auto, win-bundle, lin-nodeps, mac-bundle)") +-set_property(CACHE Launcher_LAYOUT PROPERTY STRINGS auto win-bundle lin-nodeps mac-bundle) ++set(Launcher_LAYOUT "auto" CACHE STRING "The layout for the launcher installation (auto, win-bundle, lin-nodeps, mac-bundle, freebsd-port)") ++set_property(CACHE Launcher_LAYOUT PROPERTY STRINGS auto win-bundle lin-nodeps mac-bundle freebsd-port) - ##################################### Set Application options ##################################### + if(Launcher_LAYOUT STREQUAL "auto") + if(UNIX AND APPLE) + set(Launcher_LAYOUT_REAL "mac-bundle") + elseif(UNIX) +- set(Launcher_LAYOUT_REAL "lin-nodeps") ++ if(LINUX) ++ set(Launcher_LAYOUT_REAL "lin-nodeps") ++ else() ++ set(Launcher_LAYOUT_REAL "freebsd-port") ++ endif() + elseif(WIN32) + set(Launcher_LAYOUT_REAL "win-bundle") + else() +@@ -240,6 +244,26 @@ elseif(Launcher_LAYOUT_REAL STREQUAL "win-bundle") + # install as bundle + set(INSTALL_BUNDLE "full") ++ ++elseif(Launcher_LAYOUT_REAL STREQUAL "freebsd-port") ++ set(BINARY_DEST_DIR "bin") ++ set(LIBRARY_DEST_DIR "lib") ++ set(PLUGIN_DEST_DIR "share/multimc/plugins") ++ set(BUNDLE_DEST_DIR "bin") ++ set(RESOURCES_DEST_DIR ".") ++ set(JARS_DEST_DIR "share/multimc/jars") ++ ++ # install as bundle with no dependencies included ++ set(INSTALL_BUNDLE "nodeps") ++ ++ # Set RPATH ++ SET(Launcher_BINARY_RPATH "$ORIGIN/") ++ ++ # Install basic runner script ++ configure_file(launcher/Launcher.in "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" @ONLY) ++ install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" DESTINATION ${BUNDLE_DEST_DIR} RENAME ${Launcher_Name}) ++ ++ + else() + message(FATAL_ERROR "No sensible install layout set.") + endif() diff --git a/games/multimc/files/patch-api_gui_DesktopServices.cpp b/games/multimc/files/patch-api_gui_DesktopServices.cpp deleted file mode 100644 index eb4fd1561b29..000000000000 --- a/games/multimc/files/patch-api_gui_DesktopServices.cpp +++ /dev/null @@ -1,56 +0,0 @@ ---- api/gui/DesktopServices.cpp.orig 2019-02-20 23:45:36 UTC -+++ api/gui/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. - */ --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - - #include - #include -@@ -83,7 +83,7 @@ bool openDirectory(const QString &path, bool ensureExi - { - return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); - }; --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - return IndirectOpen(f); - #else - return f(); -@@ -97,7 +97,7 @@ bool openFile(const QString &path) - { - return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); - }; --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - return IndirectOpen(f); - #else - return f(); -@@ -107,7 +107,7 @@ bool openFile(const QString &path) - bool openFile(const QString &application, const QString &path, const QString &workingDirectory, qint64 *pid) - { - qDebug() << "Opening file" << path << "using" << application; --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave - return IndirectOpen([&]() - { -@@ -121,7 +121,7 @@ bool openFile(const QString &application, const QStrin - bool run(const QString &application, const QStringList &args, const QString &workingDirectory, qint64 *pid) - { - qDebug() << "Running" << application << "with args" << args.join(' '); --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave - return IndirectOpen([&]() - { -@@ -139,7 +139,7 @@ bool openUrl(const QUrl &url) - { - return QDesktopServices::openUrl(url); - }; --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - return IndirectOpen(f); - #else - return f(); diff --git a/games/multimc/files/patch-api_logic_FileSystem.cpp b/games/multimc/files/patch-api_logic_FileSystem.cpp deleted file mode 100644 index 22c10d8fe260..000000000000 --- a/games/multimc/files/patch-api_logic_FileSystem.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- api/logic/FileSystem.cpp.orig 2019-03-07 17:30:10 UTC -+++ api/logic/FileSystem.cpp -@@ -398,7 +398,7 @@ QString getDesktopDir() - bool createShortCut(QString location, QString dest, QStringList args, QString name, - QString icon) - { --#if defined Q_OS_LINUX -+#if defined Q_OS_LINUX || defined(Q_OS_FREEBSD) - location = PathCombine(location, name + ".desktop"); - - QFile f(location); diff --git a/games/multimc/files/patch-api_logic_FileSystem__test.cpp b/games/multimc/files/patch-api_logic_FileSystem__test.cpp deleted file mode 100644 index ad6a41b22b57..000000000000 --- a/games/multimc/files/patch-api_logic_FileSystem__test.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- api/logic/FileSystem_test.cpp.orig 2019-03-07 17:32:17 UTC -+++ api/logic/FileSystem_test.cpp -@@ -119,7 +119,7 @@ slots: - - // this is only valid on linux - // FIXME: implement on windows, OSX, then test. --#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - void test_createShortcut_data() - { - QTest::addColumn("location"); diff --git a/games/multimc/files/patch-api_logic_Version.cpp b/games/multimc/files/patch-api_logic_Version.cpp deleted file mode 100644 index 1f58f35db809..000000000000 --- a/games/multimc/files/patch-api_logic_Version.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- api/logic/Version.cpp.orig 2020-05-30 15:28:28 UTC -+++ api/logic/Version.cpp -@@ -78,7 +78,7 @@ void Version::parse() - // FIXME: this is bad. versions can contain a lot more separators... - QStringList parts = m_string.split('.'); - -- for (const auto part : parts) -+ for (const auto& part : parts) - { - m_sections.append(Section(part)); - } diff --git a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp b/games/multimc/files/patch-api_logic_java_JavaUtils.cpp deleted file mode 100644 index 885551b20678..000000000000 --- a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- api/logic/java/JavaUtils.cpp.orig 2019-02-20 23:45:36 UTC -+++ api/logic/java/JavaUtils.cpp -@@ -31,7 +31,7 @@ JavaUtils::JavaUtils() - { - } - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH) - { - QDir mmcBin(QCoreApplication::applicationDirPath()); -@@ -83,7 +83,7 @@ QProcessEnvironment CleanEnviroment() - qDebug() << "Env: ignoring" << key << value; - continue; - } --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - // Do not pass LD_* variables to java. They were intended for MultiMC - if(key.startsWith("LD_")) - { -@@ -112,7 +112,7 @@ QProcessEnvironment CleanEnviroment() - // qDebug() << "Env: " << key << value; - env.insert(key, value); - } --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - // HACK: Workaround for QTBUG42500 - if(!env.contains("LD_LIBRARY_PATH")) - { diff --git a/games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp b/games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp deleted file mode 100644 index f781b52cd18f..000000000000 --- a/games/multimc/files/patch-api_logic_minecraft_MinecraftInstance.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 - - QString MinecraftInstance::getNativePath() const - { -+#if defined(Q_OS_FREEBSD) -+ QDir natives_dir(LWJGL_DIR "/"); -+#else - QDir natives_dir(FS::PathCombine(instanceRoot(), "natives/")); -+#endif - return natives_dir.absolutePath(); - } - diff --git a/games/multimc/files/patch-api_logic_minecraft_OpSys.cpp b/games/multimc/files/patch-api_logic_minecraft_OpSys.cpp deleted file mode 100644 index d144d4efff78..000000000000 --- a/games/multimc/files/patch-api_logic_minecraft_OpSys.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- api/logic/minecraft/OpSys.cpp.orig 2019-03-09 16:23:18 UTC -+++ api/logic/minecraft/OpSys.cpp -@@ -17,6 +17,8 @@ - - OpSys OpSys_fromString(QString name) - { -+ if (name == "freebsd") -+ return Os_FreeBSD; - if (name == "linux") - return Os_Linux; - if (name == "windows") -@@ -30,6 +32,8 @@ QString OpSys_toString(OpSys name) - { - switch (name) - { -+ case Os_FreeBSD: -+ return "freebsd"; - case Os_Linux: - return "linux"; - case Os_OSX: -@@ -39,4 +43,4 @@ QString OpSys_toString(OpSys name) - default: - return "other"; - } --} -\ No newline at end of file -+} diff --git a/games/multimc/files/patch-api_logic_minecraft_OpSys.h b/games/multimc/files/patch-api_logic_minecraft_OpSys.h deleted file mode 100644 index 547bb5b25bf0..000000000000 --- a/games/multimc/files/patch-api_logic_minecraft_OpSys.h +++ /dev/null @@ -1,26 +0,0 @@ ---- api/logic/minecraft/OpSys.h.orig 2019-03-09 16:25:37 UTC -+++ api/logic/minecraft/OpSys.h -@@ -18,6 +18,7 @@ - enum OpSys - { - Os_Windows, -+ Os_FreeBSD, - Os_Linux, - Os_OSX, - Os_Other -@@ -28,10 +29,10 @@ QString OpSys_toString(OpSys); - - #ifdef Q_OS_WIN32 - #define currentSystem Os_Windows --#else --#ifdef Q_OS_MAC -+#elif Q_OS_MAC - #define currentSystem Os_OSX -+#elif defined Q_OS_FREEBSD -+#define currentSystem Os_FreeBSD - #else - #define currentSystem Os_Linux --#endif --#endif -\ No newline at end of file -+#endif diff --git a/games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp b/games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp deleted file mode 100644 index e9815391e61a..000000000000 --- a/games/multimc/files/patch-api_logic_minecraft_launch_ExtractNatives.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- api/logic/minecraft/launch/ExtractNatives.cpp.orig 2017-12-18 00:19:43 UTC -+++ api/logic/minecraft/launch/ExtractNatives.cpp -@@ -23,6 +23,14 @@ - #include "FileSystem.h" - #include - -+//C library defines interfere with Java version check -+#ifdef major -+ #undef major -+#endif -+#ifdef minor -+ #undef minor -+#endif -+ - static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement) - { - if (!target.endsWith(suffix)) diff --git a/games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp b/games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp deleted file mode 100644 index be5c158fa55a..000000000000 --- a/games/multimc/files/patch-api_logic_minecraft_launch_PrintInstanceInfo.cpp +++ /dev/null @@ -1,74 +0,0 @@ ---- api/logic/minecraft/launch/PrintInstanceInfo.cpp.orig 2019-03-07 21:42:07 UTC -+++ api/logic/minecraft/launch/PrintInstanceInfo.cpp -@@ -19,8 +19,9 @@ - #include "PrintInstanceInfo.h" - #include - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - namespace { -+#if defined(Q_OS_LINUX) - void probeProcCpuinfo(QStringList &log) - { - std::ifstream cpuin("/proc/cpuinfo"); -@@ -66,7 +67,44 @@ void runLspci(QStringList &log) - } - pclose(lspci); - } -+#elif defined(Q_OS_FREEBSD) -+void runSysctlHwModel(QStringList &log) -+{ -+ char buff[512]; -+ FILE *hwmodel = popen("sysctl hw.model", "r"); -+ while (fgets(buff, 512, hwmodel) != NULL) -+ { -+ log << QString::fromUtf8(buff); -+ break; -+ } -+ pclose(hwmodel); -+} - -+void runPciconf(QStringList &log) -+{ -+ char buff[512]; -+ std::string strcard; -+ FILE *pciconf = popen("pciconf -lv -a vgapci0", "r"); -+ while (fgets(buff, 512, pciconf) != NULL) -+ { -+ if (strncmp(buff, " vendor", 10) == 0) -+ { -+ std::string str(buff); -+ strcard.append(str.substr(str.find_first_of("'") + 1, str.find_last_not_of("'") - (str.find_first_of("'") + 2))); -+ strcard.append(" "); -+ } -+ else if (strncmp(buff, " device", 10) == 0) -+ { -+ std::string str2(buff); -+ strcard.append(str2.substr(str2.find_first_of("'") + 1, str2.find_last_not_of("'") - (str2.find_first_of("'") + 2))); -+ } -+ log << QString::fromStdString(strcard); -+ break; -+ } -+ pclose(pciconf); -+} -+#endif -+ - void runGlxinfo(QStringList & log) - { - // FIXME: fixed size buffers... -@@ -94,10 +132,14 @@ void PrintInstanceInfo::executeTask() - auto instance = m_parent->instance(); - QStringList log; - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) - ::probeProcCpuinfo(log); - ::runLspci(log); - ::runGlxinfo(log); -+#elif defined(Q_OS_FREEBSD) -+ ::runSysctlHwModel(log); -+ ::runPciconf(log); -+ ::runGlxinfo(log); - #endif - - logLines(log, MessageLevel::MultiMC); diff --git a/games/multimc/files/patch-api_logic_tools_MCEditTool.cpp b/games/multimc/files/patch-api_logic_tools_MCEditTool.cpp deleted file mode 100644 index 81d3825a4878..000000000000 --- a/games/multimc/files/patch-api_logic_tools_MCEditTool.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- api/logic/tools/MCEditTool.cpp.orig 2019-03-09 18:30:20 UTC -+++ api/logic/tools/MCEditTool.cpp -@@ -52,7 +52,7 @@ QString MCEditTool::getProgramPath() - #else - const QString mceditPath = path(); - QDir mceditDir(mceditPath); --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - if (mceditDir.exists("mcedit.sh")) - { - return mceditDir.absoluteFilePath("mcedit.sh"); diff --git a/games/multimc/files/patch-application_MultiMC.cpp b/games/multimc/files/patch-application_MultiMC.cpp deleted file mode 100644 index e2691e4e901d..000000000000 --- a/games/multimc/files/patch-application_MultiMC.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - // Set up paths - { - // Root path is used for updates. --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - QDir foo(FS::PathCombine(binPath, "..")); - m_rootPath = foo.absolutePath(); - #elif defined(Q_OS_WIN32) diff --git a/games/multimc/files/patch-application_UpdateController.cpp b/games/multimc/files/patch-application_UpdateController.cpp deleted file mode 100644 index ab49773af6c2..000000000000 --- a/games/multimc/files/patch-application_UpdateController.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- application/UpdateController.cpp.orig 2019-03-08 00:52:03 UTC -+++ application/UpdateController.cpp -@@ -90,7 +90,7 @@ void UpdateController::installUpdates() - qDebug() << "Installing updates."; - #ifdef Q_OS_WIN - QString finishCmd = QApplication::applicationFilePath(); --#elif defined Q_OS_LINUX -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - QString finishCmd = FS::PathCombine(m_root, "MultiMC"); - #elif defined Q_OS_MAC - QString finishCmd = QApplication::applicationFilePath(); diff --git a/games/multimc/files/patch-application_install__prereqs.cmake.in b/games/multimc/files/patch-application_install__prereqs.cmake.in deleted file mode 100644 index 8ca7a4475048..000000000000 --- a/games/multimc/files/patch-application_install__prereqs.cmake.in +++ /dev/null @@ -1,8 +0,0 @@ ---- application/install_prereqs.cmake.in.orig 2019-03-08 00:54:15 UTC -+++ application/install_prereqs.cmake.in -@@ -23,5 +23,4 @@ set(gp_cmd_paths ${gp_cmd_paths} - ) - - include(BundleUtilities) --fixup_bundle("@APPS@" "${QTPLUGINS}" "@DIRS@") - diff --git a/games/multimc/files/patch-libraries_classparser_src_javaendian.h b/games/multimc/files/patch-libraries_classparser_src_javaendian.h deleted file mode 100644 index 41cbc3c38ccb..000000000000 --- a/games/multimc/files/patch-libraries_classparser_src_javaendian.h +++ /dev/null @@ -1,41 +0,0 @@ ---- libraries/classparser/src/javaendian.h.orig 2019-05-17 22:45:49 UTC -+++ libraries/classparser/src/javaendian.h -@@ -11,32 +11,32 @@ inline uint64_t bigswap(uint64_t x) - { - return x; - } --; -+ - inline uint32_t bigswap(uint32_t x) - { - return x; - } --; -+ - inline uint16_t bigswap(uint16_t x) - { - return x; - } --; -+ - inline int64_t bigswap(int64_t x) - { - return x; - } --; -+ - inline int32_t bigswap(int32_t x) - { - return x; - } --; -+ - inline int16_t bigswap(int16_t x) - { - return x; - } --; -+ - #else - inline uint64_t bigswap(uint64_t x) - { diff --git a/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp b/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp deleted file mode 100644 index 859c7647bd35..000000000000 --- a/games/multimc/files/patch-libraries_iconfix_internal_qiconloader.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libraries/iconfix/internal/qiconloader.cpp.orig 2019-03-09 17:22:58 UTC -+++ libraries/iconfix/internal/qiconloader.cpp -@@ -320,7 +320,7 @@ Description: Make it so that the QIcon loader honors / - icon theme specification. - Bug: https://bugreports.qt.nokia.com/browse/QTBUG-12874 - *********************************************************************/ --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - /* Freedesktop standard says to look in /usr/share/pixmaps last */ - if (entries.isEmpty()) - { diff --git a/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp b/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp deleted file mode 100644 index d3d6d0bc58f8..000000000000 --- a/games/multimc/files/patch-libraries_systeminfo_src_sys__unix.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- libraries/systeminfo/src/sys_unix.cpp.orig 2019-03-09 17:25:33 UTC -+++ libraries/systeminfo/src/sys_unix.cpp -@@ -18,6 +18,7 @@ Sys::KernelInfo Sys::getKernelInfo() - uint64_t Sys::getSystemRam() - { - std::string token; -+ #ifdef Q_OS_LINUX - std::ifstream file("/proc/meminfo"); - while(file >> token) - { -@@ -36,6 +37,19 @@ uint64_t Sys::getSystemRam() - // ignore rest of the line - file.ignore(std::numeric_limits::max(), '\n'); - } -+ #elif defined Q_OS_FREEBSD -+ char buff[512]; -+ FILE *fp = popen("sysctl hw.physmem", "r"); -+ if (fp != NULL) -+ { -+ while(fgets(buff, 512, fp) != NULL) -+ { -+ std::string str(buff); -+ uint64_t mem = std::stoull(str.substr(12, std::string::npos)); -+ return mem * 1024ull; -+ } -+ } -+ #endif - return 0; // nothing found - } - diff --git a/games/multimc/pkg-plist b/games/multimc/pkg-plist index 3b4048f079ff..01da1a87b720 100644 --- a/games/multimc/pkg-plist +++ b/games/multimc/pkg-plist @@ -1,10 +1,8 @@ -bin/multimc -lib/libMultiMC_gui.so -lib/libMultiMC_iconfix.so -lib/libMultiMC_logic.so -lib/libMultiMC_nbt++.so -lib/libMultiMC_quazip.so -lib/libMultiMC_rainbow.so -lib/libMultiMC_unpack200.so +bin/DevLauncher +lib/libLauncher_iconfix.so +lib/libLauncher_nbt++.so +lib/libLauncher_quazip.so +lib/libLauncher_rainbow.so %%DATADIR%%/jars/JavaCheck.jar %%DATADIR%%/jars/NewLaunch.jar +share/pixmaps/multimc.svg -- 2.38.0