commit 71cb4b80c75dfa6b0a93bc270b81461d2628c7c0 · pyrox.dev/nixpkgs

-16

pkgs/by-name/rp/rpi-imager/lsblkCheckFix.patch

···

       1
       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       -
       index 170ce7a..063a137 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -332,11 +332,6 @@ else()

     

       6
       6
       -
                if (NOT LSBLK)

     

       7
       7
       -
                    message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)")

     

       8
       8
       -
                endif()

     

       9
       9
       -
       -

     

       10
       10
       -
       -        execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret)

     

       11
       11
       -
       -        if (ret EQUAL "1")

     

       12
       12
       -
       -            message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)")

     

       13
       13
       -
       -        endif()

     

       14
       14
       -
            endif()

     

       15
       15
       -
       

     

       16
       16
       -
            configure_file(

+21 -11

pkgs/by-name/rp/rpi-imager/package.nix

···

       12
       12
        
         util-linux,

     

       13
       13
        
         xz,

     

       14
       14
        
         gnutls,

     

       15
       15
       +
         zstd,

     

       16
       16
       +
         libtasn1,

     

       15
       17
        
         enableTelemetry ? false,

     

       16
       18
        
       }:

     

       17
       19
        
       

     

       18
       20
        
       stdenv.mkDerivation (finalAttrs: {

     

       19
       21
        
         pname = "rpi-imager";

     

       20
       20
       -
         version = "1.9.0";

     

       22
       22
       +
         version = "1.9.4";

     

       21
       23
        
       

     

       22
       24
        
         src = fetchFromGitHub {

     

       23
       25
        
           owner = "raspberrypi";

     

       24
       26
        
           repo = "rpi-imager";

     

       25
       27
        
           tag = "v${finalAttrs.version}";

     

       26
       26
       -
           hash = "sha256-7rkoOKG0yMSIgQjqBBFUMgX/4szHn2NXoBR+5PnKlH4=";

     

       28
       28
       +
           hash = "sha256-Ih7FeAKTKSvuwsrMgKQ0VEUYHHT6L99shxfAIjAzErk=";

     

       27
       29
        
         };

     

       28
       30
        
       

     

       29
       31
        
         sourceRoot = "${finalAttrs.src.name}/src";

     
···

       31
       33
        
         # By default, the builder checks for JSON support in lsblk by running "lsblk --json",

     

       32
       34
        
         # but that throws an error, as /sys/dev doesn't exist in the sandbox.

     

       33
       35
        
         # This patch removes the check.

     

       34
       34
       -
         patches = [ ./lsblkCheckFix.patch ];

     

       36
       36
       +
         # remove-vendoring.patch from

     

       37
       37
       +
         # https://gitlab.archlinux.org/archlinux/packaging/packages/rpi-imager/-/raw/main/remove-vendoring.patch

     

       38
       38
       +
         patches = [ ./remove-vendoring-and-lsblk-check.patch ];

     

       35
       39
        
       

     

       36
       36
       -
         # avoid duplicate path prefixes

     

       37
       40
        
         postPatch = ''

     

       38
       38
       -
           substituteInPlace dependencies/xz-5.6.2/CMakeLists.txt \

     

       39
       39
       -
             --replace-fail '\''${D}/' ""

     

       41
       41
       +
           substituteInPlace ../debian/org.raspberrypi.rpi-imager.desktop \

     

       42
       42
       +
             --replace-fail "/usr/bin/" ""

     

       40
       43
        
         '';

     

       41
       44
        
       

     

       42
       45
        
         nativeBuildInputs = [

     
···

       56
       59
        
             qt6.qttools

     

       57
       60
        
             xz

     

       58
       61
        
             gnutls

     

       62
       62
       +
             zstd

     

       63
       63
       +
             libtasn1

     

       59
       64
        
           ]

     

       60
       65
        
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       61
       66
        
             qt6.qtwayland

     

       62
       67
        
           ];

     

       63
       68
        
       

     

       64
       64
       -
         # Disable telemetry and update check.

     

       65
       65
       -
         cmakeFlags = lib.optionals (!enableTelemetry) [

     

       66
       66
       -
           "-DENABLE_CHECK_VERSION=OFF"

     

       67
       67
       -
           "-DENABLE_TELEMETRY=OFF"

     

       68
       68
       -
         ];

     

       69
       69
       +
         cmakeFlags =

     

       70
       70
       +
           # Disable vendoring

     

       71
       71
       +
           [

     

       72
       72
       +
             (lib.cmakeBool "ENABLE_VENDORING" false)

     

       73
       73
       +
           ]

     

       74
       74
       +
           # Disable telemetry and update check.

     

       75
       75
       +
           ++ lib.optionals (!enableTelemetry) [

     

       76
       76
       +
             (lib.cmakeBool "ENABLE_CHECK_VERSION" false)

     

       77
       77
       +
             (lib.cmakeBool "ENABLE_TELEMETRY" false)

     

       78
       78
       +
           ];

     

       69
       79
        
       

     

       70
       80
        
         passthru = {

     

       71
       81
        
           tests.version = testers.testVersion {

+575

pkgs/by-name/rp/rpi-imager/remove-vendoring-and-lsblk-check.patch

···

       1
       1
       +
       --- a/CMakeLists.txt

     

       2
       2
       +
       +++ b/CMakeLists.txt

     

       3
       3
       +
       @@ -4,6 +4,7 @@

     

       4
       4
       +
        cmake_minimum_required(VERSION 3.22)

     

       5
       5
       +
        OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON)

     

       6
       6
       +
        OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)

     

       7
       7
       +
       +OPTION (ENABLE_VENDORING "Use vendored dependencies" ON)

     

       8
       8
       +
        

     

       9
       9
       +
        # We use FetchContent_Populate() instead of FetchContent_MakeAvailable() to allow EXCLUDE_FROM_ALL

     

       10
       10
       +
        # This prevents the dependencies from being built by default, which is our desired behavior

     

       11
       11
       +
       @@ -58,410 +59,156 @@ if (APPLE)

     

       12
       12
       +
            endforeach()

     

       13
       13
       +
        endif(APPLE)

     

       14
       14
       +
        

     

       15
       15
       +
       +## Preferentially build the bundled code. Full vendoring is to follow in a later version.

     

       16
       16
       +
       +

     

       17
       17
       +
        # Bundled code will occasionally use identical options - eg, BUILD_TESTING.

     

       18
       18
       +
        set(BUILD_TESTING OFF)

     

       19
       19
       +
        set(BUILD_STATIC_LIBS ON)

     

       20
       20
       +
        set(BUILD_SHARED_LIBS OFF)

     

       21
       21
       +
        

     

       22
       22
       +
       -include(FetchContent)

     

       23
       23
       +
       -

     

       24
       24
       +
       -# Bundled liblzma

     

       25
       25
       +
       -set(LIBLZMA_VERSION "5.8.1")

     

       26
       26
       +
       -FetchContent_Declare(xz

     

       27
       27
       +
       -    GIT_REPOSITORY https://github.com/tukaani-project/xz.git

     

       28
       28
       +
       -    GIT_TAG v${LIBLZMA_VERSION}

     

       29
       29
       +
       -    ${USE_OVERRIDE_FIND_PACKAGE}

     

       30
       30
       +
       -)

     

       31
       31
       +
       -set(XZ_MICROLZMA_DECODER OFF CACHE BOOL "" FORCE)

     

       32
       32
       +
       -set(XZ_MICROLZMA_ENCODER OFF CACHE BOOL "" FORCE)

     

       33
       33
       +
       -set(XZ_LZIP_DECODER OFF CACHE BOOL "" FORCE)

     

       34
       34
       +
       -set(XZ_ENABLE_SANDBOX OFF CACHE BOOL "" FORCE)

     

       35
       35
       +
       -set(XZ_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)

     

       36
       36
       +
       -set(XZ_ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE)

     

       37
       37
       +
       -set(XZ_DECODERS

     

       38
       38
       +
       -    lzma1

     

       39
       39
       +
       -    lzma2

     

       40
       40
       +
       -    delta

     

       41
       41
       +
       -)

     

       42
       42
       +
       -set(XZ_ENCODERS

     

       43
       43
       +
       -    lzma1

     

       44
       44
       +
       -    lzma2

     

       45
       45
       +
       -    delta

     

       46
       46
       +
       -)

     

       47
       47
       +
       -set(CREATE_LZMA_SYMLINKS OFF CACHE BOOL "" FORCE)

     

       48
       48
       +
       -set(CREATE_XZ_SYMLINKS OFF CACHE BOOL "" FORCE)

     

       49
       49
       +
       -FetchContent_GetProperties(xz)

     

       50
       50
       +
       -if(NOT xz_POPULATED)

     

       51
       51
       +
       -    FetchContent_Populate(xz)

     

       52
       52
       +
       -    add_subdirectory(${xz_SOURCE_DIR} ${xz_BINARY_DIR} EXCLUDE_FROM_ALL)

     

       53
       53
       +
       -endif()

     

       54
       54
       +
       -unset(XZ_MICROLZMA_DECODER)

     

       55
       55
       +
       -unset(XZ_MICROLZMA_ENCODER)

     

       56
       56
       +
       -unset(XZ_LZIP_DECODER)

     

       57
       57
       +
       -unset(XZ_ENABLE_SANDBOX)

     

       58
       58
       +
       -unset(XZ_BUILD_SHARED_LIBS)

     

       59
       59
       +
       -unset(XZ_ENABLE_DOXYGEN)

     

       60
       60
       +
       -unset(CREATE_LZMA_SYMLINKS)

     

       61
       61
       +
       -unset(CREATE_XZ_SYMLINKS)

     

       62
       62
       +
       -set(LIBLZMA_FOUND true CACHE BOOL "" FORCE)

     

       63
       63
       +
       -set(LIBLZMA_INCLUDE_DIR ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)

     

       64
       64
       +
       -set(LIBLZMA_INCLUDE_DIRS ${xz_SOURCE_DIR}/src/liblzma/api CACHE PATH "" FORCE)

     

       65
       65
       +
       -set(LIBLZMA_LIBRARY liblzma CACHE FILEPATH "" FORCE)

     

       66
       66
       +
       -set(LIBLZMA_LIBRARIES ${xz_BINARY_DIR}/liblzma.a CACHE FILEPATH "" FORCE)

     

       67
       67
       +
       -set(LIBLZMA_HAS_AUTO_DECODER true CACHE BOOL "" FORCE)

     

       68
       68
       +
       -set(LIBLZMA_HAS_EASY_ENCODER true CACHE BOOL "" FORCE)

     

       69
       69
       +
       -set(LIBLZMA_HAS_LZMA_PRESET true CACHE BOOL "" FORCE)

     

       70
       70
       +
       -

     

       71
       71
       +
       -# Bundled zstd

     

       72
       72
       +
       -set(ZSTD_VERSION "1.5.7")

     

       73
       73
       +
       -FetchContent_Declare(zstd

     

       74
       74
       +
       -    GIT_REPOSITORY https://github.com/facebook/zstd.git

     

       75
       75
       +
       -    GIT_TAG v${ZSTD_VERSION}

     

       76
       76
       +
       -    SOURCE_SUBDIR build/cmake

     

       77
       77
       +
       -    ${USE_OVERRIDE_FIND_PACKAGE}

     

       78
       78
       +
       -)

     

       79
       79
       +
       -set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE)

     

       80
       80
       +
       -set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)

     

       81
       81
       +
       -set(ZSTD_BUILD_STATIC ON CACHE BOOL "" FORCE)

     

       82
       82
       +
       -set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)

     

       83
       83
       +
       -set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)

     

       84
       84
       +
       -FetchContent_GetProperties(zstd)

     

       85
       85
       +
       -if(NOT zstd_POPULATED)

     

       86
       86
       +
       -    FetchContent_Populate(zstd)

     

       87
       87
       +
       -    add_subdirectory(${zstd_SOURCE_DIR}/build/cmake ${zstd_BINARY_DIR} EXCLUDE_FROM_ALL)

     

       88
       88
       +
       -endif()

     

       89
       89
       +
       -unset(ZSTD_BUILD_PROGRAMS)

     

       90
       90
       +
       -unset(ZSTD_BUILD_SHARED)

     

       91
       91
       +
       -unset(ZSTD_BUILD_STATIC)

     

       92
       92
       +
       -unset(ZSTD_BUILD_TESTS)

     

       93
       93
       +
       -unset(ZSTD_BUILD_DICTBUILDER)

     

       94
       94
       +
       -set(ZSTD_FOUND true CACHE BOOL "" FORCE)

     

       95
       95
       +
       -set(Zstd_VERSION ${ZSTD_VERSION} CACHE STRING "" FORCE)

     

       96
       96
       +
       -set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)

     

       97
       97
       +
       -set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)

     

       98
       98
       +
       -set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)

     

       99
       99
       +
       -set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-src/lib CACHE PATH "" FORCE)

     

       100
       100
       +
       -set(Zstd_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)

     

       101
       101
       +
       -set(ZSTD_LIBRARIES libzstd_static CACHE FILEPATH "" FORCE)

     

       102
       102
       +
       -set(ZSTD_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/_deps/zstd-build/lib/libzstd.a CACHE FILEPATH "" FORCE)

     

       103
       103
       +
       -

     

       104
       104
       +
       -# Remote nghttp2

     

       105
       105
       +
       -set(NGHTTP2_VERSION "1.65.0")

     

       106
       106
       +
       -FetchContent_Declare(nghttp2

     

       107
       107
       +
       -    GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git

     

       108
       108
       +
       -    GIT_TAG        v${NGHTTP2_VERSION}

     

       109
       109
       +
       -    ${USE_OVERRIDE_FIND_PACKAGE}

     

       110
       110
       +
       -)

     

       111
       111
       +
       -set(BUILD_EXAMPLES OFF)

     

       112
       112
       +
       -set(ENABLE_LIB_ONLY ON)

     

       113
       113
       +
       -set(ENABLE_FAILMALLOC OFF)

     

       114
       114
       +
       -FetchContent_GetProperties(nghttp2)

     

       115
       115
       +
       -if(NOT nghttp2_POPULATED)

     

       116
       116
       +
       -    FetchContent_Populate(nghttp2)

     

       117
       117
       +
       -    add_subdirectory(${nghttp2_SOURCE_DIR} ${nghttp2_BINARY_DIR} EXCLUDE_FROM_ALL)

     

       118
       118
       +
       -endif()

     

       119
       119
       +
       -unset(ENABLE_LIB_ONLY)

     

       120
       120
       +
       -unset(ENABLE_FAILMALLOC)

     

       121
       121
       +
       -unset(BUILD_EXAMPLES)

     

       122
       122
       +
       -set(NGHTTP2_LIBRARIES nghttp2_static CACHE FILEPATH "" FORCE)

     

       123
       123
       +
       -set(NGHTTP2_LIBRARY nghttp2_static CACHE FILEPATH "" FORCE)

     

       124
       124
       +
       -set(NGHTTP2_INCLUDE_DIR ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)

     

       125
       125
       +
       -set(NGHTTP2_INCLUDE_DIRS ${nghttp2_SOURCE_DIR}/lib CACHE PATH "" FORCE)

     

       126
       126
       +
       -set(NGHTTP2_FOUND true CACHE BOOL "" FORCE)

     

       127
       127
       +
       -

     

       128
       128
       +
       -

     

       129
       129
       +
       -# Bundled zlib

     

       130
       130
       +
       -set(ZLIB_VERSION "1.4.1.1")

     

       131
       131
       +
       -set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)

     

       132
       132
       +
       -set(ZLIB_BUILD_SHARED OFF CACHE BOOL "" FORCE)

     

       133
       133
       +
       -set(ZLIB_BUILD_STATIC ON CACHE BOOL "" FORCE)

     

       134
       134
       +
       -set(ZLIB_BUILD_TESTS OFF CACHE BOOL "" FORCE)

     

       135
       135
       +
       -set(SKIP_INSTALL_ALL ON CACHE BOOL "" FORCE)

     

       136
       136
       +
       -FetchContent_Declare(zlib

     

       137
       137
       +
       -    GIT_REPOSITORY https://github.com/madler/zlib.git

     

       138
       138
       +
       -    GIT_TAG 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71 # v1.4.1.1, as of 27/05/2025

     

       139
       139
       +
       -    ${USE_OVERRIDE_FIND_PACKAGE}

     

       140
       140
       +
       -)

     

       141
       141
       +
       -FetchContent_GetProperties(zlib)

     

       142
       142
       +
       -if(NOT zlib_POPULATED)

     

       143
       143
       +
       -    FetchContent_Populate(zlib)

     

       144
       144
       +
       -    add_subdirectory(${zlib_SOURCE_DIR} ${zlib_BINARY_DIR} EXCLUDE_FROM_ALL)

     

       145
       145
       +
       -endif()

     

       146
       146
       +
       -unset(ZLIB_BUILD_EXAMPLES)

     

       147
       147
       +
       -unset(ZLIB_BUILD_SHARED)

     

       148
       148
       +
       -unset(ZLIB_BUILD_STATIC)

     

       149
       149
       +
       -unset(ZLIB_BUILD_TESTS)

     

       150
       150
       +
       -unset(SKIP_INSTALL_ALL)

     

       151
       151
       +
       -# Set zlib variables that libarchive's CMake will use

     

       152
       152
       +
       -set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) # This is to help FindZlib.cmake find the static library over the shared one

     

       153
       153
       +
       -set(ZLIB_ROOT ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)

     

       154
       154
       +
       -

     

       155
       155
       +
       -# On Windows with MinGW, zlib builds with .a extension, not .lib

     

       156
       156
       +
       -# Set the correct library path before find_package

     

       157
       157
       +
       -if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX)

     

       158
       158
       +
       -    set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libzlibstatic.a CACHE FILEPATH "" FORCE)

     

       159
       159
       +
       -    set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libzlibstatic.a CACHE STRING "" FORCE)

     

       160
       160
       +
       -else()

     

       161
       161
       +
       -    set(ZLIB_LIBRARY ${zlib_BINARY_DIR}/libz.a CACHE FILEPATH "" FORCE)

     

       162
       162
       +
       -    set(ZLIB_LIBRARIES ${zlib_BINARY_DIR}/libz.a CACHE STRING "" FORCE)

     

       163
       163
       +
       -endif()

     

       164
       164
       +
       -

     

       165
       165
       +
       -# Since we're building zlib ourselves with EXCLUDE_FROM_ALL, we don't need find_package

     

       166
       166
       +
       -# Instead, we'll create the ZLIB::ZLIB target manually and set all required variables

     

       167
       167
       +
       -set(ZLIB_INCLUDE_DIR ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)

     

       168
       168
       +
       -set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} CACHE PATH "" FORCE)

     

       169
       169
       +
       -

     

       170
       170
       +
       -# Create ZLIB::ZLIB target manually since we're not using find_package

     

       171
       171
       +
       -# Set zlib variables that other packages expect

     

       172
       172
       +
       -set(ZLIB_FOUND TRUE CACHE BOOL "" FORCE)

     

       173
       173
       +
       -add_library(ZLIB::ZLIB STATIC IMPORTED)

     

       174
       174
       +
       -if (WIN32 AND CMAKE_COMPILER_IS_GNUCXX)

     

       175
       175
       +
       -    set_target_properties(ZLIB::ZLIB PROPERTIES

     

       176
       176
       +
       -        IMPORTED_LOCATION "${zlib_BINARY_DIR}/libzlibstatic.a"

     

       177
       177
       +
       -        INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}"

     

       178
       178
       +
       -    )

     

       179
       179
       +
       -    add_dependencies(ZLIB::ZLIB zlibstatic)

     

       180
       180
       +
       -else()

     

       181
       181
       +
       -    set_target_properties(ZLIB::ZLIB PROPERTIES

     

       182
       182
       +
       -        IMPORTED_LOCATION "${zlib_BINARY_DIR}/libz.a"

     

       183
       183
       +
       -        INTERFACE_INCLUDE_DIRECTORIES "${zlib_SOURCE_DIR};${zlib_BINARY_DIR}"

     

       184
       184
       +
       +if(ENABLE_VENDORING)

     

       185
       185
       +
       +    # Bundled liblzma

     

       186
       186
       +
       +    set(XZ_MICROLZMA_DECODER OFF)

     

       187
       187
       +
       +    set(XZ_MICROLZMA_ENCODER OFF)

     

       188
       188
       +
       +    set(XZ_LZIP_DECODER OFF)

     

       189
       189
       +
       +    set(XZ_ENABLE_SANDBOX OFF)

     

       190
       190
       +
       +    set(XZ_BUILD_SHARED_LIBS OFF)

     

       191
       191
       +
       +    set(XZ_ENABLE_DOXYGEN OFF)

     

       192
       192
       +
       +    set(XZ_DECODERS

     

       193
       193
       +
       +        lzma1

     

       194
       194
       +
       +        lzma2

     

       195
       195
       +
       +        delta

     

       196
       196
       +
            )

     

       197
       197
       +
       -    add_dependencies(ZLIB::ZLIB zlibstatic)

     

       198
       198
       +
       -endif()

     

       199
       199
       +
       -

     

       200
       200
       +
       -# Debug output

     

       201
       201
       +
       -message(STATUS "ZLIB_LIBRARY set to: ${ZLIB_LIBRARY}")

     

       202
       202
       +
       -message(STATUS "ZLIB_LIBRARIES set to: ${ZLIB_LIBRARIES}")

     

       203
       203
       +
       -message(STATUS "ZLIB_INCLUDE_DIRS set to: ${ZLIB_INCLUDE_DIRS}")

     

       204
       204
       +
       -

     

       205
       205
       +
       -# Bundled libarchive

     

       206
       206
       +
       -

     

       207
       207
       +
       -set(ENABLE_WERROR OFF CACHE BOOL "")

     

       208
       208
       +
       -set(ENABLE_INSTALL OFF CACHE BOOL "")

     

       209
       209
       +
       -set(ENABLE_TEST OFF CACHE BOOL "")

     

       210
       210
       +
       -set(ENABLE_CNG OFF CACHE BOOL "")

     

       211
       211
       +
       -set(ENABLE_MBEDTLS OFF CACHE BOOL "")

     

       212
       212
       +
       -set(ENABLE_NETTLE OFF CACHE BOOL "")

     

       213
       213
       +
       -set(ENABLE_OPENSSL OFF CACHE BOOL "")

     

       214
       214
       +
       -# Configure libarchive with explicit zlib support

     

       215
       215
       +
       -set(ENABLE_ZLIB ON CACHE BOOL "")

     

       216
       216
       +
       -set(ENABLE_BZip2 OFF CACHE BOOL "")

     

       217
       217
       +
       -set(ENABLE_LZ4 OFF CACHE BOOL "")

     

       218
       218
       +
       -set(ENABLE_LZO OFF CACHE BOOL "")

     

       219
       219
       +
       -set(ENABLE_LIBB2 OFF CACHE BOOL "")

     

       220
       220
       +
       -set(ENABLE_LIBXML2 OFF CACHE BOOL "")

     

       221
       221
       +
       -set(ENABLE_EXPAT OFF CACHE BOOL "")

     

       222
       222
       +
       -set(ENABLE_PCREPOSIX OFF CACHE BOOL "")

     

       223
       223
       +
       -set(ENABLE_PCRE2POSIX OFF CACHE BOOL "")

     

       224
       224
       +
       -set(ENABLE_LIBGCC OFF CACHE BOOL "")

     

       225
       225
       +
       -set(ENABLE_TAR OFF CACHE BOOL "")

     

       226
       226
       +
       -set(ENABLE_CPIO OFF CACHE BOOL "")

     

       227
       227
       +
       -set(ENABLE_CAT OFF CACHE BOOL "")

     

       228
       228
       +
       -set(BUILD_SHARED_LIBS OFF CACHE BOOL "")

     

       229
       229
       +
       -set(ARCHIVE_BUILD_STATIC_LIBS ON CACHE BOOL "")

     

       230
       230
       +
       -set(ARCHIVE_BUILD_EXAMPLES OFF CACHE BOOL "")

     

       231
       231
       +
       -set(ENABLE_ZSTD ON CACHE BOOL "")

     

       232
       232
       +
       -set(POSIX_REGEX_LIB "libc" CACHE STRING "" FORCE)

     

       233
       233
       +
       -set(LIBARCHIVE_VERSION "3.8.0")

     

       234
       234
       +
       -

     

       235
       235
       +
       -# Create a patch script to fix ZSTD detection in libarchive

     

       236
       236
       +
       -set(LIBARCHIVE_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/libarchive_zstd_patch.cmake")

     

       237
       237
       +
       -file(WRITE ${LIBARCHIVE_PATCH_FILE} "

     

       238
       238
       +
       -# Read the original CMakeLists.txt

     

       239
       239
       +
       -file(READ \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" CONTENT)

     

       240
       240
       +
       -

     

       241
       241
       +
       -# Find the start and end of the ZSTD section

     

       242
       242
       +
       -string(FIND \"\${CONTENT}\" \"IF(ZSTD_FOUND)\" ZSTD_START)

     

       243
       243
       +
       -string(FIND \"\${CONTENT}\" \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\" ZSTD_END)

     

       244
       244
       +
       -

     

       245
       245
       +
       -if(ZSTD_START GREATER -1 AND ZSTD_END GREATER -1)

     

       246
       246
       +
       -    # Calculate positions

     

       247
       247
       +
       -    math(EXPR ZSTD_END \"\${ZSTD_END} + 40\") # Length of \"MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\"

     

       248
       248
       +
       -    

     

       249
       249
       +
       -    # Extract parts before and after the ZSTD section

     

       250
       250
       +
       -    string(SUBSTRING \"\${CONTENT}\" 0 \${ZSTD_START} BEFORE_ZSTD)

     

       251
       251
       +
       -    string(SUBSTRING \"\${CONTENT}\" \${ZSTD_END} -1 AFTER_ZSTD)

     

       252
       252
       +
       -    

     

       253
       253
       +
       -    # Create the new ZSTD section

     

       254
       254
       +
       -    set(NEW_ZSTD_SECTION \"IF(ZSTD_FOUND)

     

       255
       255
       +
       -  SET(HAVE_ZSTD_H 1)

     

       256
       256
       +
       -  INCLUDE_DIRECTORIES(\\\${ZSTD_INCLUDE_DIR})

     

       257
       257
       +
       -  LIST(APPEND ADDITIONAL_LIBS \\\${ZSTD_LIBRARY})

     

       258
       258
       +
       -  

     

       259
       259
       +
       -  # Check if ZSTD variables were provided externally (indicating static build)

     

       260
       260
       +
       -  get_property(ZSTD_LIB_IS_CACHE CACHE ZSTD_LIBRARY PROPERTY TYPE)

     

       261
       261
       +
       -  get_property(ZSTD_INC_IS_CACHE CACHE ZSTD_INCLUDE_DIR PROPERTY TYPE)

     

       262
       262
       +
       -  if(ZSTD_LIB_IS_CACHE AND ZSTD_INC_IS_CACHE)

     

       263
       263
       +
       -    # Skip function checks for static builds and assume all functions are available

     

       264
       264
       +
       -    message(STATUS \\\"Using provided ZSTD library: \\\${ZSTD_LIBRARY}\\\")

     

       265
       265
       +
       -    SET(HAVE_LIBZSTD 1)

     

       266
       266
       +
       -    SET(HAVE_ZSTD_compressStream 1)

     

       267
       267
       +
       -    SET(HAVE_ZSTD_minCLevel 1)

     

       268
       268
       +
       -  else()

     

       269
       269
       +
       -    # Original function checks for dynamic builds

     

       270
       270
       +
       -    CMAKE_PUSH_CHECK_STATE()

     

       271
       271
       +
       -    SET(CMAKE_REQUIRED_LIBRARIES \\\${ZSTD_LIBRARY})

     

       272
       272
       +
       -    SET(CMAKE_REQUIRED_INCLUDES \\\${ZSTD_INCLUDE_DIR})

     

       273
       273
       +
       -    CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD)

     

       274
       274
       +
       -    CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream)

     

       275
       275
       +
       -    CHECK_FUNCTION_EXISTS(ZSTD_minCLevel HAVE_ZSTD_minCLevel)

     

       276
       276
       +
       -    CMAKE_POP_CHECK_STATE()

     

       277
       277
       +
       -  endif()

     

       278
       278
       +
       -ENDIF(ZSTD_FOUND)

     

       279
       279
       +
       -MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)\")

     

       280
       280
       +
       -    

     

       281
       281
       +
       -    # Combine the parts

     

       282
       282
       +
       -    set(NEW_CONTENT \"\${BEFORE_ZSTD}\${NEW_ZSTD_SECTION}\")

     

       283
       283
       +
       -    

     

       284
       284
       +
       -    # Write the modified content back

     

       285
       285
       +
       -    file(WRITE \"\${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" \"\${NEW_CONTENT}\${AFTER_ZSTD}\")

     

       286
       286
       +
       -    message(STATUS \"Patched libarchive CMakeLists.txt for static ZSTD support\")

     

       287
       287
       +
       -else()

     

       288
       288
       +
       -    message(WARNING \"Could not find ZSTD section in libarchive CMakeLists.txt\")

     

       289
       289
       +
       -endif()

     

       290
       290
       +
       -")

     

       291
       291
       +
       -

     

       292
       292
       +
       -FetchContent_Declare(libarchive

     

       293
       293
       +
       -    GIT_REPOSITORY https://github.com/libarchive/libarchive.git

     

       294
       294
       +
       -    GIT_TAG v${LIBARCHIVE_VERSION}

     

       295
       295
       +
       -    PATCH_COMMAND ${CMAKE_COMMAND} -P ${LIBARCHIVE_PATCH_FILE}

     

       296
       296
       +
       -    ${USE_OVERRIDE_FIND_PACKAGE}

     

       297
       297
       +
       -)

     

       298
       298
       +
       -FetchContent_GetProperties(libarchive)

     

       299
       299
       +
       -if(NOT libarchive_POPULATED)

     

       300
       300
       +
       -    FetchContent_Populate(libarchive)

     

       301
       301
       +
       -    add_subdirectory(${libarchive_SOURCE_DIR} ${libarchive_BINARY_DIR} EXCLUDE_FROM_ALL)

     

       302
       302
       +
       -endif()

     

       303
       303
       +
       -

     

       304
       304
       +
       -# Ensure libarchive is built after zlib

     

       305
       305
       +
       -if (TARGET archive_static AND TARGET ZLIB::ZLIB)

     

       306
       306
       +
       -    add_dependencies(archive_static ZLIB::ZLIB)

     

       307
       307
       +
       -endif()

     

       308
       308
       +
       -

     

       309
       309
       +
       -unset(POSIX_REGEX_LIB)

     

       310
       310
       +
       -unset(ENABLE_WERROR)

     

       311
       311
       +
       -unset(ENABLE_INSTALL)

     

       312
       312
       +
       -unset(ENABLE_TEST)

     

       313
       313
       +
       -unset(ENABLE_CNG)

     

       314
       314
       +
       -unset(ENABLE_MBEDTLS)

     

       315
       315
       +
       -unset(ENABLE_NETTLE)

     

       316
       316
       +
       -unset(ENABLE_OPENSSL)

     

       317
       317
       +
       -unset(ENABLE_ZLIB)

     

       318
       318
       +
       -unset(ENABLE_BZip2)

     

       319
       319
       +
       -unset(ENABLE_LZ4)

     

       320
       320
       +
       -unset(ENABLE_LZO)

     

       321
       321
       +
       -unset(ENABLE_LIBB2)

     

       322
       322
       +
       -unset(ENABLE_LIBXML2)

     

       323
       323
       +
       -unset(ENABLE_EXPAT)

     

       324
       324
       +
       -unset(ENABLE_PCREPOSIX)

     

       325
       325
       +
       -unset(ENABLE_PCRE2POSIX)

     

       326
       326
       +
       -unset(ENABLE_LIBGCC)

     

       327
       327
       +
       -unset(ENABLE_TAR)

     

       328
       328
       +
       -unset(ENABLE_CPIO)

     

       329
       329
       +
       -unset(ENABLE_CAT)

     

       330
       330
       +
       -unset(ARCHIVE_BUILD_SHARED_LIBS)

     

       331
       331
       +
       -unset(ENABLE_ZSTD)

     

       332
       332
       +
       -set(LibArchive_FOUND true CACHE BOOL "" FORCE)

     

       333
       333
       +
       -set(LibArchive_LIBRARIES archive_static CACHE FILEPATH "" FORCE)

     

       334
       334
       +
       -set(LibArchive_INCLUDE_DIR ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)

     

       335
       335
       +
       -set(LibArchive_INCLUDE_DIRS ${libarchive_SOURCE_DIR}/libarchive CACHE PATH "" FORCE)

     

       336
       336
       +
       -

     

       337
       337
       +
       -# Bundled libcurl

     

       338
       338
       +
       -set(CURL_VERSION "8.13.0")

     

       339
       339
       +
       -string(REPLACE "." "_" CURL_TAG ${CURL_VERSION})

     

       340
       340
       +
       -FetchContent_Declare(curl

     

       341
       341
       +
       -    GIT_REPOSITORY https://github.com/curl/curl.git

     

       342
       342
       +
       -    GIT_TAG curl-${CURL_TAG}

     

       343
       343
       +
       -    ${USE_OVERRIDE_FIND_PACKAGE}

     

       344
       344
       +
       -)

     

       345
       345
       +
       -set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)

     

       346
       346
       +
       -set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE)

     

       347
       347
       +
       -set(BUILD_MISC_DOCS OFF CACHE BOOL "" FORCE)

     

       348
       348
       +
       -set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE)

     

       349
       349
       +
       -set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)

     

       350
       350
       +
       -set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE)

     

       351
       351
       +
       -set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE)

     

       352
       352
       +
       -set(CURL_DISABLE_ALTSVC ON CACHE BOOL "" FORCE)

     

       353
       353
       +
       -set(CURL_DISABLE_KERBEROS_AUTH ON CACHE BOOL "" FORCE)

     

       354
       354
       +
       -set(CURL_DISABLE_DICT ON CACHE BOOL "" FORCE)

     

       355
       355
       +
       -set(CURL_DISABLE_DISABLE_FORM_API ON CACHE BOOL "" FORCE)

     

       356
       356
       +
       -set(CURL_DISABLE_FTP ON CACHE BOOL "" FORCE)

     

       357
       357
       +
       -set(CURL_DISABLE_GOPHER ON CACHE BOOL "" FORCE)

     

       358
       358
       +
       -set(CURL_DISABLE_IMAP ON CACHE BOOL "" FORCE)

     

       359
       359
       +
       -set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE)

     

       360
       360
       +
       -set(CURL_DISABLE_LDAPS ON CACHE BOOL "" FORCE)

     

       361
       361
       +
       -set(CURL_DISABLE_MQTT ON CACHE BOOL "" FORCE)

     

       362
       362
       +
       -set(CURL_DISABLE_NETRC ON CACHE BOOL "" FORCE)

     

       363
       363
       +
       -set(CURL_DISABLE_POP3 ON CACHE BOOL "" FORCE)

     

       364
       364
       +
       -set(CURL_DISABLE_RTSP ON CACHE BOOL "" FORCE)

     

       365
       365
       +
       -set(CURL_DISABLE_SMTP ON CACHE BOOL "" FORCE)

     

       366
       366
       +
       -set(CURL_DISABLE_TELNET ON CACHE BOOL "" FORCE)

     

       367
       367
       +
       -set(CURL_DISABLE_TFTP ON CACHE BOOL "" FORCE)

     

       368
       368
       +
       -set(CURL_ZSTD ON)

     

       369
       369
       +
       -set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)

     

       370
       370
       +
       -set(CURL_DISABLE_INSTALL ON)

     

       371
       371
       +
       -if (APPLE)

     

       372
       372
       +
       -    # TODO: SecureTransport is a deprecated API in macOS, supporting

     

       373
       373
       +
       -    #       only up to TLS v1.2. cURL has not implemented the replacement,

     

       374
       374
       +
       -    #       Network.framework, and so we will need to select an alternative.

     

       375
       375
       +
       -    #       Best recommendation: Libressl, as used by Apple in the curl binary

     

       376
       376
       +
       -    #       on macOS.

     

       377
       377
       +
       -    set(CURL_USE_SECTRANSP ON)

     

       378
       378
       +
       -    set(CURL_DEFAULT_SSL_BACKEND "secure-transport")

     

       379
       379
       +
       -    set(USE_APPLE_IDN ON)

     

       380
       380
       +
       -else()

     

       381
       381
       +
       -    if (WIN32)

     

       382
       382
       +
       -        set(CURL_USE_SCHANNEL ON)

     

       383
       383
       +
       -        set(CURL_DEFAULT_SSL_BACKEND "schannel")

     

       384
       384
       +
       -    else ()

     

       385
       385
       +
       -        set(CURL_USE_GNUTLS ON)

     

       386
       386
       +
       -        set(CURL_DEFAULT_SSL_BACKEND "gnutls")

     

       387
       387
       +
       -    endif(WIN32)

     

       388
       388
       +
       -endif(APPLE)

     

       389
       389
       +
       -

     

       390
       390
       +
       -FetchContent_GetProperties(curl)

     

       391
       391
       +
       -if(NOT curl_POPULATED)

     

       392
       392
       +
       -    FetchContent_Populate(curl)

     

       393
       393
       +
       -    add_subdirectory(${curl_SOURCE_DIR} ${curl_BINARY_DIR} EXCLUDE_FROM_ALL)

     

       394
       394
       +
       +    set(XZ_ENCODERS "")

     

       395
       395
       +
       +    set(CREATE_LZMA_SYMLINKS OFF)

     

       396
       396
       +
       +    set(CREATE_XZ_SYMLINKS OFF)

     

       397
       397
       +
       +    add_subdirectory(dependencies/xz-5.8.1)

     

       398
       398
       +
       +    set(LIBLZMA_FOUND true)

     

       399
       399
       +
       +    set(LIBLZMA_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE)

     

       400
       400
       +
       +    set(LIBLZMA_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/xz-5.8.1/src/liblzma/api FORCE)

     

       401
       401
       +
       +    set(LIBLZMA_LIBRARY liblzma)

     

       402
       402
       +
       +    set(LIBLZMA_LIBRARIES liblzma)

     

       403
       403
       +
       +

     

       404
       404
       +
       +    # Bundled zstd

     

       405
       405
       +
       +    set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "" FORCE)

     

       406
       406
       +
       +    set(ZSTD_BUILD_SHARED OFF CACHE BOOL "" FORCE)

     

       407
       407
       +
       +    set(ZSTD_BUILD_TESTS OFF CACHE BOOL "" FORCE)

     

       408
       408
       +
       +    set(ZSTD_BUILD_DICTBUILDER OFF CACHE BOOL "" FORCE)

     

       409
       409
       +
       +    add_subdirectory(dependencies/zstd-1.5.7/build/cmake)

     

       410
       410
       +
       +    set(Zstd_FOUND true)

     

       411
       411
       +
       +    set(ZSTD_FOUND true)

     

       412
       412
       +
       +    set(Zstd_VERSION "1.5.7")

     

       413
       413
       +
       +    set(ZSTD_VERSION "1.5.7")

     

       414
       414
       +
       +    set(Zstd_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)

     

       415
       415
       +
       +    set(ZSTD_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)

     

       416
       416
       +
       +    set(Zstd_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)

     

       417
       417
       +
       +    set(ZSTD_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zstd-1.5.7/lib)

     

       418
       418
       +
       +    set(Zstd_LIBRARIES libzstd_static)

     

       419
       419
       +
       +    set(ZSTD_LIBRARIES libzstd_static)

     

       420
       420
       +
       +    set(ZSTD_LIBRARY libzstd_static)

     

       421
       421
       +
       +

     

       422
       422
       +
       +    # Bundled zlib

     

       423
       423
       +
       +    set(ZLIB_BUILD_EXAMPLES OFF)

     

       424
       424
       +
       +    set(SKIP_INSTALL_ALL ON)

     

       425
       425
       +
       +    add_subdirectory(dependencies/zlib-1.4.1.1)

     

       426
       426
       +
       +    set(ZLIB_FOUND TRUE)

     

       427
       427
       +
       +    set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir")

     

       428
       428
       +
       +    set(ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/zlib-1.4.1.1 CACHE PATH "zlib include dir")

     

       429
       429
       +
       +    set(ZLIB_LIBRARY zlibstatic)

     

       430
       430
       +
       +    set(ZLIB_LIBRARIES zlibstatic)

     

       431
       431
       +
       +

     

       432
       432
       +
       +    # Bundled libarchive

     

       433
       433
       +
       +    set(ARCHIVE_ENABLE_WERROR OFF CACHE BOOL "")

     

       434
       434
       +
       +    set(ARCHIVE_ENABLE_INSTALL OFF CACHE BOOL "")

     

       435
       435
       +
       +    set(ARCHIVE_ENABLE_TEST OFF CACHE BOOL "")

     

       436
       436
       +
       +    set(ARCHIVE_ENABLE_CNG OFF CACHE BOOL "")

     

       437
       437
       +
       +    set(ARCHIVE_ENABLE_MBEDTLS OFF CACHE BOOL "")

     

       438
       438
       +
       +    set(ARCHIVE_ENABLE_NETTLE OFF CACHE BOOL "")

     

       439
       439
       +
       +    set(ARCHIVE_ENABLE_OPENSSL OFF CACHE BOOL "")

     

       440
       440
       +
       +    set(ARCHIVE_ENABLE_BZip2 OFF CACHE BOOL "")

     

       441
       441
       +
       +    set(ARCHIVE_ENABLE_LZ4 OFF CACHE BOOL "")

     

       442
       442
       +
       +    set(ARCHIVE_ENABLE_LZO OFF CACHE BOOL "")

     

       443
       443
       +
       +    set(ARCHIVE_ENABLE_LIBB2 OFF CACHE BOOL "")

     

       444
       444
       +
       +    set(ARCHIVE_ENABLE_LIBXML2 OFF CACHE BOOL "")

     

       445
       445
       +
       +    set(ARCHIVE_ENABLE_EXPAT OFF CACHE BOOL "")

     

       446
       446
       +
       +    set(ARCHIVE_ENABLE_PCREPOSIX OFF CACHE BOOL "")

     

       447
       447
       +
       +    set(ARCHIVE_ENABLE_PCRE2POSIX OFF CACHE BOOL "")

     

       448
       448
       +
       +    set(ARCHIVE_ENABLE_LIBGCC OFF CACHE BOOL "")

     

       449
       449
       +
       +    set(ARCHIVE_ENABLE_TAR OFF CACHE BOOL "")

     

       450
       450
       +
       +    set(ARCHIVE_ENABLE_CPIO OFF CACHE BOOL "")

     

       451
       451
       +
       +    set(ARCHIVE_ENABLE_CAT OFF CACHE BOOL "")

     

       452
       452
       +
       +    set(ARCHIVE_BUILD_SHARED_LIBS OFF CACHE BOOL "")

     

       453
       453
       +
       +    add_subdirectory(dependencies/libarchive-3.7.7)

     

       454
       454
       +
       +    set(LibArchive_FOUND true)

     

       455
       455
       +
       +    set(LibArchive_LIBRARIES archive_static)

     

       456
       456
       +
       +    set(LibArchive_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/libarchive-3.7.8/libarchive)

     

       457
       457
       +
       +

     

       458
       458
       +
       +    # Bundled libcurl

     

       459
       459
       +
       +    set(CMAKE_CURL_INCLUDES)

     

       460
       460
       +
       +    set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)

     

       461
       461
       +
       +    set(BUILD_LIBCURL_DOCS OFF CACHE BOOL "" FORCE)

     

       462
       462
       +
       +    set(ENABLE_CURL_MANUAL OFF CACHE BOOL "" FORCE)

     

       463
       463
       +
       +    set(CURL_USE_LIBPSL OFF)

     

       464
       464
       +
       +    set(CURL_USE_LIBSSH2 OFF)

     

       465
       465
       +
       +    set(CURL_DISABLE_ALTSVC ON)

     

       466
       466
       +
       +    set(CURL_DISABLE_KERBEROS_AUTH ON)

     

       467
       467
       +
       +    set(CURL_DISABLE_DICT ON)

     

       468
       468
       +
       +    set(CURL_DISABLE_DISABLE_FORM_API ON)

     

       469
       469
       +
       +    set(CURL_DISABLE_FTP ON)

     

       470
       470
       +
       +    set(CURL_DISABLE_GOPHER ON)

     

       471
       471
       +
       +    set(CURL_DISABLE_IMAP ON)

     

       472
       472
       +
       +    set(CURL_DISABLE_LDAP ON)

     

       473
       473
       +
       +    set(CURL_DISABLE_LDAPS ON)

     

       474
       474
       +
       +    set(CURL_DISABLE_MQTT ON)

     

       475
       475
       +
       +    set(CURL_DISABLE_NETRC ON)

     

       476
       476
       +
       +    set(CURL_DISABLE_POP3 ON)

     

       477
       477
       +
       +    set(CURL_DISABLE_RTSP ON)

     

       478
       478
       +
       +    set(CURL_DISABLE_SMTP ON)

     

       479
       479
       +
       +    set(CURL_DISABLE_TELNET ON)

     

       480
       480
       +
       +    set(CURL_DISABLE_TFTP ON)

     

       481
       481
       +
       +    set(CURL_ZSTD ON)

     

       482
       482
       +
       +    set(CURL_ENABLE_EXPORT_TARGET OFF CACHE BOOL "" FORCE)

     

       483
       483
       +
       +    set(CURL_DISABLE_INSTALL ON)

     

       484
       484
       +
       +    if (APPLE)

     

       485
       485
       +
       +        # TODO: SecureTransport is a deprecated API in macOS, supporting

     

       486
       486
       +
       +        #       only up to TLS v1.2. cURL has not implemented the replacement,

     

       487
       487
       +
       +        #       Network.framework, and so we will need to select an alternative.

     

       488
       488
       +
       +        #       Best recommendation: Libressl, as used by Apple in the curl binary

     

       489
       489
       +
       +        #       on macOS.

     

       490
       490
       +
       +        set(CURL_USE_SECTRANSP ON)

     

       491
       491
       +
       +        set(CURL_DEFAULT_SSL_BACKEND "secure-transport")

     

       492
       492
       +
       +        set(USE_APPLE_IDN ON)

     

       493
       493
       +
       +    else()

     

       494
       494
       +
       +        if (WIN32)

     

       495
       495
       +
       +            set(CURL_USE_SCHANNEL ON)

     

       496
       496
       +
       +            set(CURL_DEFAULT_SSL_BACKEND "schannel")

     

       497
       497
       +
       +        else ()

     

       498
       498
       +
       +            set(CURL_USE_GNUTLS ON)

     

       499
       499
       +
       +            set(CURL_DEFAULT_SSL_BACKEND "gnutls")

     

       500
       500
       +
       +        endif(WIN32)

     

       501
       501
       +
       +    endif(APPLE)

     

       502
       502
       +
       +

     

       503
       503
       +
       +    add_subdirectory(dependencies/curl-8.13.0)

     

       504
       504
       +
       +    set(CURL_FOUND true)

     

       505
       505
       +
       +    set(CURL_LIBRARIES libcurl_static)

     

       506
       506
       +
       +    set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include)

     

       507
       507
       +
       +    set(CURL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.13.0/include)

     

       508
       508
       +
       +

     

       509
       509
       +
       +elseif (NOT ENABLE_VENDORING AND UNIX)

     

       510
       510
       +
       +    # Find the libraries that were subject to vendoring in the system instead,

     

       511
       511
       +
       +    # To keep the possibility of delivery via Linux distro packages

     

       512
       512
       +
       +    find_package(ZLIB)

     

       513
       513
       +
       +    if(ZLIB_FOUND)

     

       514
       514
       +
       +        set(EXTRALIBS ${EXTRALIBS} ZLIB::ZLIB)

     

       515
       515
       +
       +    endif()

     

       516
       516
       +
       +    find_package(LibLZMA)

     

       517
       517
       +
       +    if(LIBLZMA_FOUND)

     

       518
       518
       +
       +        set(EXTRALIBS ${EXTRALIBS} LibLZMA::LibLZMA)

     

       519
       519
       +
       +    endif()

     

       520
       520
       +
       +    find_package(CURL 8.13.0 REQUIRED)

     

       521
       521
       +
       +    find_package(LibArchive 3.7.8 REQUIRED)

     

       522
       522
       +
        endif()

     

       523
       523
       +
        

     

       524
       524
       +
       -unset(BUILD_CURL_EXE)

     

       525
       525
       +
       -unset(BUILD_LIBCURL_DOCS)

     

       526
       526
       +
       -unset(BUILD_MISC_DOCS)

     

       527
       527
       +
       -unset(ENABLE_CURL_MANUAL)

     

       528
       528
       +
       -unset(BUILD_EXAMPLES)

     

       529
       529
       +
       -unset(CURL_USE_LIBPSL)

     

       530
       530
       +
       -unset(CURL_USE_LIBSSH2)

     

       531
       531
       +
       -unset(CURL_DISABLE_ALTSVC)

     

       532
       532
       +
       -unset(CURL_DISABLE_KERBEROS_AUTH)

     

       533
       533
       +
       -unset(CURL_DISABLE_DICT)

     

       534
       534
       +
       -unset(CURL_DISABLE_DISABLE_FORM_API)

     

       535
       535
       +
       -unset(CURL_DISABLE_FTP)

     

       536
       536
       +
       -unset(CURL_DISABLE_GOPHER)

     

       537
       537
       +
       -unset(CURL_DISABLE_IMAP)

     

       538
       538
       +
       -unset(CURL_DISABLE_LDAP)

     

       539
       539
       +
       -unset(CURL_DISABLE_LDAPS)

     

       540
       540
       +
       -unset(CURL_DISABLE_MQTT)

     

       541
       541
       +
       -unset(CURL_DISABLE_NETRC)

     

       542
       542
       +
       -unset(CURL_DISABLE_POP3)

     

       543
       543
       +
       -unset(CURL_DISABLE_RTSP)

     

       544
       544
       +
       -unset(CURL_DISABLE_SMTP)

     

       545
       545
       +
       -unset(CURL_DISABLE_TELNET)

     

       546
       546
       +
       -unset(CURL_DISABLE_TFTP)

     

       547
       547
       +
       -unset(CURL_ZSTD)

     

       548
       548
       +
       -unset(CURL_ENABLE_EXPORT_TARGET)

     

       549
       549
       +
       -unset(CURL_DISABLE_INSTALL)

     

       550
       550
       +
       -unset(CURL_USE_SECTRANSP)

     

       551
       551
       +
       -unset(CURL_DEFAULT_SSL_BACKEND)

     

       552
       552
       +
       -unset(USE_APPLE_IDN)

     

       553
       553
       +
       -unset(CURL_USE_SCHANNEL)

     

       554
       554
       +
       -unset(CURL_USE_GNUTLS)

     

       555
       555
       +
       -

     

       556
       556
       +
       -set(CURL_FOUND true CACHE BOOL "" FORCE)

     

       557
       557
       +
       -set(CURL_LIBRARIES libcurl_static CACHE FILEPATH "" FORCE)

     

       558
       558
       +
       -set(CURL_INCLUDE_DIR ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)

     

       559
       559
       +
       -set(CURL_INCLUDE_DIRS ${curl_SOURCE_DIR}/include CACHE PATH "" FORCE)

     

       560
       560
       +
       -

     

       561
       561
       +
        # Adding headers explicity so they are displayed in Qt Creator

     

       562
       562
       +
        set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h

     

       563
       563
       +
            devicewrapper.h devicewrapperblockcacheentry.h devicewrapperpartition.h devicewrapperstructs.h devicewrapperfatpartition.h wlancredentials.h

     

       564
       564
       +
       @@ -928,11 +675,6 @@ else()

     

       565
       565
       +
                if (NOT LSBLK)

     

       566
       566
       +
                    message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)")

     

       567
       567
       +
                endif()

     

       568
       568
       +
       -

     

       569
       569
       +
       -        execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret)

     

       570
       570
       +
       -        if (ret EQUAL "1")

     

       571
       571
       +
       -            message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)")

     

       572
       572
       +
       -        endif()

     

       573
       573
       +
            endif()

     

       574
       574
       +
        

     

       575
       575
       +
            install(TARGETS ${PROJECT_NAME} DESTINATION bin)