diff options
| author | renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> | 2025-03-04 12:27:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-04 12:27:45 +0100 |
| commit | fdb16635cbfe1d45a3d5869c0a55ec871d912ea0 (patch) | |
| tree | ec6703c28b4f09c6d10f56339db78a3cdb2c8b82 /patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch | |
| parent | 991a0d0c97bce6ae8671dc763dd03876dfa9ea8a (diff) | |
chore(deps): update zano digest to fe85ce2 (#116)
* chore(deps): update zano digest to fe85ce2
* rebase needed patches
* fix integration tests, generate checksum
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
Diffstat (limited to 'patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch')
| -rw-r--r-- | patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch b/patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch deleted file mode 100644 index 64b7f4c..0000000 --- a/patches/zano/0006-use-boost-filesystem-instead-of-stdfs.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 033d71f4a8623dee3508c493431402bbbe5a8b2d Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto <cyjan@mrcyjanek.net> -Date: Wed, 4 Dec 2024 17:21:44 -0600 -Subject: [PATCH] use boost::filesystem instead of stdfs - ---- - CMakeLists.txt | 23 ++++------------------- - contrib/epee/include/file_io_utils.h | 6 +++--- - 2 files changed, 7 insertions(+), 22 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7087d796..6ded9711 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -232,24 +232,9 @@ if(STATIC) - endif() - - message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}") --if(CMAKE_SYSTEM_NAME STREQUAL "iOS") -- set(CMAKE_OSX_DEPLOYMENT_TARGET 12.00) -- if(NOT DEFINED SKIP_BOOST_FATLIB_LIB OR NOT SKIP_BOOST_FATLIB_LIB) -- message("Ios: libboost.a included as library") -- set(Boost_LIBRARIES "libboost.a") -- else() -- message("Ios: libboost.a not included as library") -- endif() -- #workaround for new XCode 12 policy for builds(now it includes a slice for the "arm64" when builds for simulator) -- set(__iphoneos_archs "arm64") -- #set(__iphonesimulator_archs "arm64,x86_64") -- set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "${__iphoneos_archs}") -- set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "${__iphoneos_archs}") -- #set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}") -- #set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}") --elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") -+if(CMAKE_SYSTEM_NAME STREQUAL "Android") - if(CAKEWALLET) -- find_package(Boost 1.71 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) -+ find_package(Boost 1.71 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options) - else() - set(Boost_LIBRARY_DIRS "${Boost_LIBRARY_DIRS}/${CMAKE_ANDROID_ARCH_ABI}/") - set(Boost_LIBRARIES "${Boost_LIBRARY_DIRS}libboost_system.a;${Boost_LIBRARY_DIRS}libboost_filesystem.a;${Boost_LIBRARY_DIRS}libboost_thread.a;${Boost_LIBRARY_DIRS}libboost_timer.a;${Boost_LIBRARY_DIRS}libboost_date_time.a;${Boost_LIBRARY_DIRS}libboost_chrono.a;${Boost_LIBRARY_DIRS}libboost_regex.a;${Boost_LIBRARY_DIRS}libboost_serialization.a;${Boost_LIBRARY_DIRS}libboost_atomic.a;${Boost_LIBRARY_DIRS}libboost_program_options.a") -@@ -257,7 +242,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC") - elseif(APPLE) -- find_package(Boost 1.71 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) -+ find_package(Boost 1.71 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options) - else() - find_package(Boost 1.70 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale log) - endif() -@@ -302,7 +287,7 @@ else() - find_package(Git QUIET) - if(Git_FOUND OR GIT_FOUND) - message(STATUS "Found Git: ${GIT_EXECUTABLE}") -- add_custom_target(version ALL "${CMAKE_COMMAND}" "-D" "VERSION=${VERSION}" "-D" "GIT=${GIT_EXECUTABLE}" "-D" "TO=${CMAKE_BINARY_DIR}/version/version.h" "-P" "src/version.cmake" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") -+ add_custom_target(version ALL "${CMAKE_COMMAND}" "-D" "VERSION=${VERSION}" "-D" "GIT=${GIT_EXECUTABLE}" "-D" "TO=${CMAKE_BINARY_DIR}/version/version.h" "-P" "src/version.cmake" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") - else() - message(STATUS "WARNING: Git was not found!") - set(VERSION "${VERSION}-unknown") -diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h -index bb21ae99..ced01092 100644 ---- a/contrib/epee/include/file_io_utils.h -+++ b/contrib/epee/include/file_io_utils.h -@@ -574,10 +574,10 @@ namespace file_io_utils - try - { - -- stdfs::directory_iterator end_itr; // default construction yields past-the-end -- for (stdfs::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr ) -+ boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end -+ for ( boost::filesystem::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr ) - { -- if ( only_files && stdfs::is_directory(itr->status()) ) -+ if ( only_files && boost::filesystem::is_directory(itr->status()) ) - { - continue; - } --- -2.39.5 (Apple Git-154) - |
