From 8a34e72a4329a783b71afce8108a6630c03b07f0 Mon Sep 17 00:00:00 2001 From: dasha_uwu Date: Sat, 2 Aug 2025 23:33:14 +0500 Subject: [PATCH] remove dbus support --- CMakeLists.txt | 2 -- launcher/CMakeLists.txt | 5 ----- launcher/minecraft/MinecraftInstance.cpp | 18 ++++++------------ 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 929e1b394..c2bba2bc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -324,8 +324,6 @@ include(QtVersionlessBackport) if(Launcher_QT_VERSION_MAJOR EQUAL 6) set(QT_VERSION_MAJOR 6) find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml Core5Compat NetworkAuth OpenGL) - find_package(Qt6 COMPONENTS DBus) - list(APPEND Launcher_QT_DBUS Qt6::DBus) list(APPEND Launcher_QT_LIBS Qt6::Core5Compat) if(NOT Launcher_FORCE_BUNDLED_LIBS) diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 194694d7f..2618b29a0 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -1344,7 +1344,6 @@ target_link_libraries(Launcher_logic Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::NetworkAuth Qt${QT_VERSION_MAJOR}::OpenGL - ${Launcher_QT_DBUS} ${Launcher_QT_LIBS} ) target_link_libraries(Launcher_logic @@ -1353,10 +1352,6 @@ target_link_libraries(Launcher_logic LocalPeer Launcher_rainbow ) -if (TARGET ${Launcher_QT_DBUS}) - add_compile_definitions(WITH_QTDBUS) -endif() - if(APPLE) set(CMAKE_MACOSX_RPATH 1) set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/") diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 7749d0f6b..2a71566ad 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -99,10 +99,6 @@ #include "MangoHud.h" #endif -#ifdef WITH_QTDBUS -#include -#endif - #define IBUS "@im=ibus" [[maybe_unused]] static bool switcherooSetupGPU(QProcessEnvironment& env) @@ -687,14 +683,12 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment() } if (settings()->get("UseDiscreteGpu").toBool()) { - if (!switcherooSetupGPU(env)) { - // Open Source Drivers - env.insert("DRI_PRIME", "1"); - // Proprietary Nvidia Drivers - env.insert("__NV_PRIME_RENDER_OFFLOAD", "1"); - env.insert("__VK_LAYER_NV_optimus", "NVIDIA_only"); - env.insert("__GLX_VENDOR_LIBRARY_NAME", "nvidia"); - } + // Open Source Drivers + env.insert("DRI_PRIME", "1"); + // Proprietary Nvidia Drivers + env.insert("__NV_PRIME_RENDER_OFFLOAD", "1"); + env.insert("__VK_LAYER_NV_optimus", "NVIDIA_only"); + env.insert("__GLX_VENDOR_LIBRARY_NAME", "nvidia"); } if (settings()->get("UseZink").toBool()) {