mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2025-08-03 19:37:45 -04:00
remove quazip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
parent
ace9ad29a6
commit
1816ca6311
@ -72,7 +72,6 @@ runs:
|
|||||||
qt6-networkauth:p
|
qt6-networkauth:p
|
||||||
cmark:p
|
cmark:p
|
||||||
tomlplusplus:p
|
tomlplusplus:p
|
||||||
quazip-qt6:p
|
|
||||||
libarchive:p
|
libarchive:p
|
||||||
|
|
||||||
- name: List pacman packages (MinGW)
|
- name: List pacman packages (MinGW)
|
||||||
|
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,6 +1,3 @@
|
|||||||
[submodule "libraries/quazip"]
|
|
||||||
path = libraries/quazip
|
|
||||||
url = https://github.com/stachenov/quazip.git
|
|
||||||
[submodule "libraries/tomlplusplus"]
|
[submodule "libraries/tomlplusplus"]
|
||||||
path = libraries/tomlplusplus
|
path = libraries/tomlplusplus
|
||||||
url = https://github.com/marzer/tomlplusplus.git
|
url = https://github.com/marzer/tomlplusplus.git
|
||||||
|
@ -1,2 +1 @@
|
|||||||
libraries/nbtplusplus
|
libraries/nbtplusplus
|
||||||
libraries/quazip
|
|
||||||
|
@ -327,14 +327,6 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 6)
|
|||||||
find_package(Qt6 COMPONENTS DBus)
|
find_package(Qt6 COMPONENTS DBus)
|
||||||
list(APPEND Launcher_QT_DBUS Qt6::DBus)
|
list(APPEND Launcher_QT_DBUS Qt6::DBus)
|
||||||
list(APPEND Launcher_QT_LIBS Qt6::Core5Compat)
|
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()
|
else()
|
||||||
message(FATAL_ERROR "Qt version ${Launcher_QT_VERSION_MAJOR} is not supported")
|
message(FATAL_ERROR "Qt version ${Launcher_QT_VERSION_MAJOR} is not supported")
|
||||||
endif()
|
endif()
|
||||||
@ -496,14 +488,6 @@ if(FORCE_BUNDLED_ZLIB)
|
|||||||
else()
|
else()
|
||||||
message(STATUS "Using system zlib")
|
message(STATUS "Using system zlib")
|
||||||
endif()
|
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/rainbow) # Qt extension for colors
|
||||||
add_subdirectory(libraries/LocalPeer) # fork of a library from Qt solutions
|
add_subdirectory(libraries/LocalPeer) # fork of a library from Qt solutions
|
||||||
if(NOT tomlplusplus_FOUND)
|
if(NOT tomlplusplus_FOUND)
|
||||||
|
24
COPYING.md
24
COPYING.md
@ -212,30 +212,6 @@
|
|||||||
This license is copied below, and is also available with a FAQ at:
|
This license is copied below, and is also available with a FAQ at:
|
||||||
http://scripts.sil.org/OFL
|
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`)
|
## launcher (`libraries/launcher`)
|
||||||
|
|
||||||
PolyMC - Minecraft Launcher
|
PolyMC - Minecraft Launcher
|
||||||
|
@ -1355,7 +1355,6 @@ target_link_libraries(Launcher_logic
|
|||||||
${Launcher_QT_LIBS}
|
${Launcher_QT_LIBS}
|
||||||
)
|
)
|
||||||
target_link_libraries(Launcher_logic
|
target_link_libraries(Launcher_logic
|
||||||
QuaZip::QuaZip
|
|
||||||
cmark::cmark
|
cmark::cmark
|
||||||
LocalPeer
|
LocalPeer
|
||||||
Launcher_rainbow
|
Launcher_rainbow
|
||||||
@ -1422,7 +1421,6 @@ if(Launcher_BUILD_UPDATER)
|
|||||||
add_library(prism_updater_logic STATIC ${PRISMUPDATER_SOURCES} ${TASKS_SOURCES} ${PRISMUPDATER_UI})
|
add_library(prism_updater_logic STATIC ${PRISMUPDATER_SOURCES} ${TASKS_SOURCES} ${PRISMUPDATER_UI})
|
||||||
target_include_directories(prism_updater_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
target_include_directories(prism_updater_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
target_link_libraries(prism_updater_logic
|
target_link_libraries(prism_updater_logic
|
||||||
QuaZip::QuaZip
|
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
systeminfo
|
systeminfo
|
||||||
BuildConfig
|
BuildConfig
|
||||||
|
@ -1 +0,0 @@
|
|||||||
Subproject commit 3fd3b299b875fbd2beac4894b8a870d80022cad7
|
|
@ -82,7 +82,6 @@ stdenv.mkDerivation {
|
|||||||
cmark
|
cmark
|
||||||
kdePackages.qtbase
|
kdePackages.qtbase
|
||||||
kdePackages.qtnetworkauth
|
kdePackages.qtnetworkauth
|
||||||
kdePackages.quazip
|
|
||||||
libarchive
|
libarchive
|
||||||
tomlplusplus
|
tomlplusplus
|
||||||
zlib
|
zlib
|
||||||
|
Loading…
x
Reference in New Issue
Block a user