From 94f3fd28b9e0c1e3e57951fb2ec170c9340f3b78 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Mon, 14 Jul 2025 14:44:28 +0300
Subject: [PATCH] move libarchive outside bundle libs

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 CMakeLists.txt                                     | 7 ++++---
 launcher/minecraft/mod/Mod.h                       | 2 --
 launcher/minecraft/mod/ModDetails.h                | 4 ----
 launcher/modplatform/flame/FlamePackExportTask.cpp | 1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69bd6a2c8..23e392e82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,12 +337,13 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 6)
     set(QT_LIBEXECS_DIR ${QT${QT_VERSION_MAJOR}_INSTALL_PREFIX}/${QT${QT_VERSION_MAJOR}_INSTALL_LIBEXECS})
 endif()
 
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(libarchive REQUIRED IMPORTED_TARGET libarchive)
+
 if(NOT Launcher_FORCE_BUNDLED_LIBS)
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(libarchive IMPORTED_TARGET libarchive)
     # Find toml++
     find_package(tomlplusplus 3.2.0 QUIET)
-    # Fallback to pkg-config (if available) if CMake files aren't found
+    # Fallback to pkg-config if CMake files aren't found
     if(NOT tomlplusplus_FOUND)
         pkg_check_modules(tomlplusplus IMPORTED_TARGET tomlplusplus>=3.2.0)
     endif()
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index eceb8c256..c548f5350 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -44,8 +44,6 @@
 #include <QPixmap>
 #include <QPixmapCache>
 
-#include <optional>
-
 #include "ModDetails.h"
 #include "Resource.h"
 
diff --git a/launcher/minecraft/mod/ModDetails.h b/launcher/minecraft/mod/ModDetails.h
index 9195c0368..9b81f561f 100644
--- a/launcher/minecraft/mod/ModDetails.h
+++ b/launcher/minecraft/mod/ModDetails.h
@@ -35,14 +35,10 @@
 
 #pragma once
 
-#include <memory>
-
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 
-#include "minecraft/mod/MetadataHandler.h"
-
 struct ModLicense {
     QString name = {};
     QString id = {};
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 5f03b69f4..fa1bf2c0b 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -30,7 +30,6 @@
 #include <memory>
 #include "Application.h"
 #include "Json.h"
-#include "MMCZip.h"
 #include "archive/ExportToZipTask.h"
 #include "minecraft/PackProfile.h"
 #include "minecraft/mod/ModFolderModel.h"