wok-next rev 20395
e4rat: update patch (again)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Dec 02 12:33:04 2017 +0100 (2017-12-02) |
| parents | 747445a60dca |
| children | 6196c5e2b89d |
| files | e4rat/stuff/patches/boost-fs3-v2.patch e4rat/stuff/patches/series |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/e4rat/stuff/patches/boost-fs3-v2.patch Sat Dec 02 12:33:04 2017 +0100 1.3 @@ -0,0 +1,159 @@ 1.4 +diff -rupN e4rat-0.2.3-fresh/CMakeLists.txt e4rat-0.2.3-fixed/CMakeLists.txt 1.5 +--- e4rat-0.2.3-fresh/CMakeLists.txt 2012-05-03 08:43:12.000000000 +0200 1.6 ++++ e4rat-0.2.3-fixed/CMakeLists.txt 2013-06-03 16:36:45.582255709 +0200 1.7 +@@ -14,9 +14,8 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_D 1.8 + set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "e4rat install prefix" FORCE) 1.9 + ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 1.10 + 1.11 +-set(Boost_USE_STATIC_LIBS ON) 1.12 ++set(Boost_USE_STATIC_LIBS OFF) 1.13 + set(Boost_USE_MULTITHREADED OFF) 1.14 +-add_definitions(-DBOOST_FILESYSTEM_VERSION=2) 1.15 + find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED) 1.16 + set(${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES} 1.17 + ${Boost_LIBRARIES}) 1.18 +@@ -27,56 +26,6 @@ add_subdirectory( ${CMAKE_CURRENT_SOUR 1.19 + 1.20 + 1.21 + # to generate debian package run: make package 1.22 +-FIND_PROGRAM(DPKG_CMD dpkg) 1.23 +-if(DPKG_CMD) 1.24 +- EXECUTE_PROCESS(COMMAND "${DPKG_CMD}" --print-architecture 1.25 +- OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE 1.26 +- OUTPUT_STRIP_TRAILING_WHITESPACE 1.27 +- ) 1.28 +-else(DPKG_CMD) 1.29 +- MESSAGE(STATUS "CPACK: Can not find dpkg in your path, default to i386.") 1.30 +- SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) 1.31 +-endif(DPKG_CMD) 1.32 +- 1.33 +-SET (CPACK_GENERATOR DEB) 1.34 +-SET(CPACK_PACKAGE_VERSION ${E4RAT_VERSION}) 1.35 +-SET(CPACK_PACKAGE_FILE_NAME 1.36 +- "${PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") 1.37 +- 1.38 +-IF(NOT CMAKE_BUILD_TYPE STREQUAL "release") 1.39 +- SET(CPACK_PACKAGE_FILE_NAME 1.40 +- ${CPACK_PACKAGE_FILE_NAME}_debug) 1.41 +-endif(NOT CMAKE_BUILD_TYPE STREQUAL "release") 1.42 +- 1.43 +-SET (CPACK_INSTALL_PREFIX "/") 1.44 +- 1.45 +-if(NOT CPACK_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) 1.46 +-SET(CPACK_PACKAGE_FILE_NAME 1.47 +- ${CPACK_PACKAGE_FILE_NAME}_invalid-prefix) 1.48 +-endif(NOT CPACK_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) 1.49 +- 1.50 +-SET (CPACK_PACKAGE_DESCRIPTION_SUMMARY 1.51 +- "Reduce disk access time on ext4 filesystems through relevant file defragmentation.") 1.52 +-SET (CPACK_PACKAGE_CONTACT "Andreas Rid <conso@users.sf.net>") 1.53 +-SET (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") 1.54 +-SET (CPACK_DEBIAN_PACKAGE_SECTION "extra") 1.55 +-SET (CPACK_DEBIAN_PACKAGE_MAINTAINER "Andreas Rid") 1.56 +-set (CPACK_SET_DESTDIR "ON") # Necessary because of the absolute install paths 1.57 +- 1.58 +-# extra install and uninstall create subfolders 1.59 +-# I don't know why cpack deb does not create or remove directories. 1.60 +-set( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA 1.61 +- "${CMAKE_CURRENT_SOURCE_DIR}/debian/preinst" 1.62 +- "${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm") 1.63 +- 1.64 +-SET (CPACK_DEBIAN_PACKAGE_DEPENDS 1.65 +- "e2fslibs (>=1.41)") 1.66 +- 1.67 +-SET (CPACK_DEBIAN_PACKAGE_CONFLICTS 1.68 +- "auditd, ureadahead") 1.69 +- 1.70 +-INCLUDE(CPack) 1.71 +- 1.72 + add_custom_target(src 1.73 + COMMAND test -e ${PROJECT_NAME}-${E4RAT_VERSION} || mkdir ${PROJECT_NAME}-${E4RAT_VERSION} 1.74 + COMMAND rsync -p --relative `git ls-files` ${PROJECT_NAME}-${E4RAT_VERSION} 1.75 +diff -rupN e4rat-0.2.3-fresh/src/CMakeLists.txt e4rat-0.2.3-fixed/src/CMakeLists.txt 1.76 +--- e4rat-0.2.3-fresh/src/CMakeLists.txt 2012-05-03 08:43:12.000000000 +0200 1.77 ++++ e4rat-0.2.3-fixed/src/CMakeLists.txt 2013-06-03 16:42:44.028413549 +0200 1.78 +@@ -180,7 +180,7 @@ if(NOT BUILD_CORE_LIBRARY_STATIC) 1.79 + endif(NOT BUILD_CORE_LIBRARY_STATIC) 1.80 + 1.81 + INSTALL(TARGETS ${${PROJECT_NAME}_TARGETS} 1.82 +- RUNTIME DESTINATION "sbin" 1.83 ++ RUNTIME DESTINATION "/usr/bin" 1.84 + LIBRARY DESTINATION "lib" 1.85 + ARCHIVE DESTINATION "lib" 1.86 + ) 1.87 +diff -rupN e4rat-0.2.3-fresh/src/common.cc e4rat-0.2.3-fixed/src/common.cc 1.88 +--- e4rat-0.2.3-fresh/src/common.cc 2012-05-03 08:43:12.000000000 +0200 1.89 ++++ e4rat-0.2.3-fixed/src/common.cc 2013-06-03 16:36:45.582255709 +0200 1.90 +@@ -157,7 +157,7 @@ std::vector<std::string> matchPath( cons 1.91 + p /= filesearch; 1.92 + } 1.93 + // Initialize regex filter - use * as default if nothing is given in filesearch 1.94 +- std::string f( p.has_filename() ? p.filename() : "*"); 1.95 ++ std::string f( p.has_filename() ? p.filename().string() : "*"); 1.96 + 1.97 + fs::path dir(system_complete(p).parent_path()); 1.98 + if( is_directory(dir) ) 1.99 +@@ -166,8 +166,8 @@ std::vector<std::string> matchPath( cons 1.100 + it!=boost::filesystem::directory_iterator(); 1.101 + ++it ) 1.102 + { 1.103 +- if( boost::regex_match( it->leaf(), path2regex(f) ) ) 1.104 +- fileset.push_back(it->string()); 1.105 ++ if( boost::regex_match( it->path().filename().string(), path2regex(f) ) ) 1.106 ++ fileset.push_back(it->path().filename().string()); 1.107 + } 1.108 + return fileset; 1.109 + } 1.110 +diff -rupN e4rat-0.2.3-fresh/src/config.cc e4rat-0.2.3-fixed/src/config.cc 1.111 +--- e4rat-0.2.3-fresh/src/config.cc 2012-05-03 08:43:12.000000000 +0200 1.112 ++++ e4rat-0.2.3-fixed/src/config.cc 2013-06-03 16:36:45.582255709 +0200 1.113 +@@ -71,7 +71,7 @@ Config::Config() 1.114 + return; 1.115 + } 1.116 + 1.117 +- tool_name = fs::path(argv[0]).filename(); 1.118 ++ tool_name = fs::path(argv[0]).filename().string(); 1.119 + found = tool_name.find_last_of("-"); 1.120 + if(found) 1.121 + defaultSection = tool_name.substr(found+1); 1.122 +diff -rupN e4rat-0.2.3-fresh/src/device.cc e4rat-0.2.3-fixed/src/device.cc 1.123 +--- e4rat-0.2.3-fresh/src/device.cc 2012-05-03 08:43:12.000000000 +0200 1.124 ++++ e4rat-0.2.3-fixed/src/device.cc 2013-06-03 16:36:45.582255709 +0200 1.125 +@@ -196,13 +196,13 @@ int Device::getDevNameFromDevfs() 1.126 + it != end_itr; 1.127 + ++it ) 1.128 + { 1.129 +- if(it->filename() == "root") 1.130 ++ if(it->path().filename().string() == "root") 1.131 + continue; 1.132 +- if(lstat(it->string().c_str(), &st)) 1.133 ++ if(lstat(it->path().filename().c_str(), &st)) 1.134 + continue; 1.135 + if(st.st_rdev == get()->devno) 1.136 + { 1.137 +- get()->deviceName = it->filename(); 1.138 ++ get()->deviceName = it->path().filename().string(); 1.139 + get()->devicePath = "/dev/" + get()->deviceName; 1.140 + return 0; 1.141 + } 1.142 +@@ -225,7 +225,7 @@ int Device::getDevNameFromMajorMinor() 1.143 + // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c 1.144 + // for convenience set deviceName and devicePath to a common name 1.145 + get()->deviceName = "virtual file system"; 1.146 +- get()->devicePath = get()->mount_point.filename(); 1.147 ++ get()->devicePath = get()->mount_point.filename().string(); 1.148 + return 0; 1.149 + case 2: 1.150 + ss << "fd"; 1.151 +diff -rupN e4rat-0.2.3-fresh/src/e4rat-collect.cc e4rat-0.2.3-fixed/src/e4rat-collect.cc 1.152 +--- e4rat-0.2.3-fresh/src/e4rat-collect.cc 2012-05-03 08:43:12.000000000 +0200 1.153 ++++ e4rat-0.2.3-fixed/src/e4rat-collect.cc 2013-06-03 16:36:45.582255709 +0200 1.154 +@@ -396,7 +396,7 @@ int main(int argc, char* argv[]) 1.155 + * Parse application list given as arguments 1.156 + */ 1.157 + for ( ; optind < argc; optind++) 1.158 +- project.observeApp(fs::path(argv[optind]).filename()); 1.159 ++ project.observeApp(fs::path(argv[optind]).filename().string()); 1.160 + 1.161 + /* 1.162 + * Parse application list on stdin