wok diff e4rat/stuff/e4rat-boost.u @ rev 19052
Add: waterline, libsde*, waterline-plugin-multiload, lxpanel-plugin-multiload
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Tue Apr 19 01:44:57 2016 +0300 (2016-04-19) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/e4rat/stuff/e4rat-boost.u Tue Apr 19 01:44:57 2016 +0300 1.3 @@ -0,0 +1,82 @@ 1.4 +--- CMakeLists.txt.orig 2012-09-07 03:17:55.515017487 +0200 1.5 ++++ CMakeLists.txt 2012-09-13 19:54:18.160054076 +0200 1.6 +@@ -15,7 +15,6 @@ 1.7 + ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 1.8 + 1.9 + set(Boost_USE_MULTITHREADED OFF) 1.10 +-add_definitions(-DBOOST_FILESYSTEM_VERSION=2) 1.11 + find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED) 1.12 + set(${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES} 1.13 + ${Boost_LIBRARIES}) 1.14 +--- src/config.cc.orig 2012-09-13 19:50:32.829871091 +0200 1.15 ++++ src/config.cc 2012-09-13 19:55:37.023068153 +0200 1.16 +@@ -71,7 +71,7 @@ 1.17 + return; 1.18 + } 1.19 + 1.20 +- tool_name = fs::path(argv[0]).filename(); 1.21 ++ tool_name = fs::path(argv[0]).filename().string(); 1.22 + found = tool_name.find_last_of("-"); 1.23 + if(found) 1.24 + defaultSection = tool_name.substr(found+1); 1.25 +--- src/common.cc.orig 2012-09-13 19:58:06.187203344 +0200 1.26 ++++ src/common.cc 2012-09-13 19:59:34.752096130 +0200 1.27 +@@ -157,7 +157,7 @@ 1.28 + p /= filesearch; 1.29 + } 1.30 + // Initialize regex filter - use * as default if nothing is given in filesearch 1.31 +- std::string f( p.has_filename() ? p.filename() : "*"); 1.32 ++ std::string f( p.has_filename() ? p.filename().string() : "*"); 1.33 + 1.34 + fs::path dir(system_complete(p).parent_path()); 1.35 + if( is_directory(dir) ) 1.36 +@@ -166,8 +166,8 @@ 1.37 + it!=boost::filesystem::directory_iterator(); 1.38 + ++it ) 1.39 + { 1.40 +- if( boost::regex_match( it->leaf(), path2regex(f) ) ) 1.41 +- fileset.push_back(it->string()); 1.42 ++ if( boost::regex_match( it->path().filename().string(), path2regex(f) ) ) 1.43 ++ fileset.push_back(it->path().filename().string()); 1.44 + } 1.45 + return fileset; 1.46 + } 1.47 +--- src/e4rat-collect.cc.orig 2012-09-13 20:03:40.185027797 +0200 1.48 ++++ src/e4rat-collect.cc 2012-09-13 20:03:54.404850024 +0200 1.49 +@@ -396,7 +396,7 @@ 1.50 + * Parse application list given as arguments 1.51 + */ 1.52 + for ( ; optind < argc; optind++) 1.53 +- project.observeApp(fs::path(argv[optind]).filename()); 1.54 ++ project.observeApp(fs::path(argv[optind]).filename().string()); 1.55 + 1.56 + /* 1.57 + * Parse application list on stdin 1.58 +--- src/device.cc.orig 2012-09-13 20:00:40.232277516 +0200 1.59 ++++ src/device.cc 2012-09-13 20:03:11.026392331 +0200 1.60 +@@ -196,13 +196,13 @@ 1.61 + it != end_itr; 1.62 + ++it ) 1.63 + { 1.64 +- if(it->filename() == "root") 1.65 ++ if(it->path().filename().string() == "root") 1.66 + continue; 1.67 +- if(lstat(it->string().c_str(), &st)) 1.68 ++ if(lstat(it->path().filename().c_str(), &st)) 1.69 + continue; 1.70 + if(st.st_rdev == get()->devno) 1.71 + { 1.72 +- get()->deviceName = it->filename(); 1.73 ++ get()->deviceName = it->path().filename().string(); 1.74 + get()->devicePath = "/dev/" + get()->deviceName; 1.75 + return 0; 1.76 + } 1.77 +@@ -225,7 +225,7 @@ 1.78 + // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c 1.79 + // for convenience set deviceName and devicePath to a common name 1.80 + get()->deviceName = "virtual file system"; 1.81 +- get()->devicePath = get()->mount_point.filename(); 1.82 ++ get()->devicePath = get()->mount_point.filename().string(); 1.83 + return 0; 1.84 + case 2: 1.85 + ss << "fd";