diff --git a/.github/actions/setup-dependencies/windows/action.yml b/.github/actions/setup-dependencies/windows/action.yml index 2e6615aa5..f2985fd1b 100644 --- a/.github/actions/setup-dependencies/windows/action.yml +++ b/.github/actions/setup-dependencies/windows/action.yml @@ -81,7 +81,6 @@ runs: cmark:p qrencode:p tomlplusplus:p - quazip-qt6:p libarchive:p - name: List pacman packages (MinGW) diff --git a/.gitmodules b/.gitmodules index 7ad40becb..246d9d791 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "libraries/quazip"] - path = libraries/quazip - url = https://github.com/stachenov/quazip.git [submodule "libraries/tomlplusplus"] path = libraries/tomlplusplus url = https://github.com/marzer/tomlplusplus.git diff --git a/.markdownlintignore b/.markdownlintignore index a8669d01d..96f627ad9 100644 --- a/.markdownlintignore +++ b/.markdownlintignore @@ -1,2 +1 @@ libraries/nbtplusplus -libraries/quazip diff --git a/CMakeLists.txt b/CMakeLists.txt index 86fa72ff6..705bb695b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,14 +327,6 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 6) 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) - find_package(QuaZip-Qt6 1.3 QUIET) - endif() - if (NOT QuaZip-Qt6_FOUND) - set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}" FORCE) - set(FORCE_BUNDLED_QUAZIP 1) - endif() else() message(FATAL_ERROR "Qt version ${Launcher_QT_VERSION_MAJOR} is not supported") endif() @@ -514,14 +506,6 @@ if(FORCE_BUNDLED_ZLIB) else() message(STATUS "Using system zlib") endif() -if (FORCE_BUNDLED_QUAZIP) - message(STATUS "Using bundled QuaZip") - set(BUILD_SHARED_LIBS 0) # link statically to avoid conflicts. - set(QUAZIP_INSTALL 0) - add_subdirectory(libraries/quazip) # zip manipulation library -else() - message(STATUS "Using system QuaZip") -endif() add_subdirectory(libraries/rainbow) # Qt extension for colors add_subdirectory(libraries/LocalPeer) # fork of a library from Qt solutions if(NOT tomlplusplus_FOUND) diff --git a/COPYING.md b/COPYING.md index 8588c8951..fb33844f7 100644 --- a/COPYING.md +++ b/COPYING.md @@ -212,30 +212,6 @@ This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL -## Quazip - - Copyright (C) 2005-2021 Sergey A. Tachenov - - The QuaZip library is licensed under the GNU Lesser General Public - License V2.1 plus a static linking exception. - - The original ZIP/UNZIP package (MiniZip) is copyrighted by Gilles - Vollant and contributors, see quazip/(un)zip.h files for details. - Basically it's the zlib license. - - STATIC LINKING EXCEPTION - - The copyright holders give you permission to link this library with - independent modules to produce an executable, regardless of the license - terms of these independent modules, and to copy and distribute the - resulting executable under terms of your choice, provided that you also - meet, for each linked independent module, the terms and conditions of - the license of that module. An independent module is a module which is - not derived from or based on this library. If you modify this library, - you must extend this exception to your version of the library. - - See COPYING file for the full LGPL text. - ## launcher (`libraries/launcher`) PolyMC - Minecraft Launcher diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 341a944dc..c144157ab 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -1347,7 +1347,6 @@ target_link_libraries(Launcher_logic ${Launcher_QT_LIBS} ) target_link_libraries(Launcher_logic - QuaZip::QuaZip cmark::cmark LocalPeer Launcher_rainbow @@ -1414,7 +1413,6 @@ if(Launcher_BUILD_UPDATER) add_library(prism_updater_logic STATIC ${PRISMUPDATER_SOURCES} ${TASKS_SOURCES} ${PRISMUPDATER_UI}) target_include_directories(prism_updater_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(prism_updater_logic - QuaZip::QuaZip ${ZLIB_LIBRARIES} systeminfo BuildConfig diff --git a/libraries/quazip b/libraries/quazip deleted file mode 160000 index 3fd3b299b..000000000 --- a/libraries/quazip +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3fd3b299b875fbd2beac4894b8a870d80022cad7 diff --git a/nix/unwrapped.nix b/nix/unwrapped.nix index e6bef012a..2aaba42a1 100644 --- a/nix/unwrapped.nix +++ b/nix/unwrapped.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation { cmark kdePackages.qtbase kdePackages.qtnetworkauth - kdePackages.quazip qrencode libarchive tomlplusplus