wok-next rev 20394

e4rat: update patch
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Dec 02 10:57:18 2017 +0100 (2017-12-02)
parents 7e6db3d3e591
children 58ddadc6f657
files e4rat/receipt e4rat/stuff/e4rat-boost.u
line diff
     1.1 --- a/e4rat/receipt	Sat Dec 02 05:17:25 2017 +0200
     1.2 +++ b/e4rat/receipt	Sat Dec 02 10:57:18 2017 +0100
     1.3 @@ -9,8 +9,9 @@
     1.4  TARBALL="${PACKAGE}_${VERSION}_src.tar.gz"
     1.5  WEB_SITE="http://e4rat.sourceforge.net/"
     1.6  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     1.7 +CONFIG_FILES="/etc/e4rat.conf"
     1.8  
     1.9 -DEPENDS="e2fsprogs"
    1.10 +DEPENDS="e2fsprogs libboost-system libboost-filesystem libboost-regex"
    1.11  BUILD_DEPENDS="cmake e2fsprogs-dev libboost-dev libboost-system \
    1.12  libboost-filesystem libboost-regex libboost-signals libboost-serialization \
    1.13  audit-dev perl"
    1.14 @@ -18,7 +19,6 @@
    1.15  # Rules to configure and make the package.
    1.16  compile_rules()
    1.17  {
    1.18 -	patch -p0 < $stuff/e4rat-boost.u
    1.19  	cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr . &&
    1.20  	make && make install
    1.21  }
    1.22 @@ -29,6 +29,6 @@
    1.23  	mkdir -p $fs/usr
    1.24  	cp -a $install/etc $fs
    1.25  	cp -a $install/var $fs
    1.26 -	cp -a $install/usr/sbin $fs/usr
    1.27 +	cp -a $install/usr/bin $fs/usr
    1.28  	cp -a $install/usr/lib $fs/usr
    1.29  }
     2.1 --- a/e4rat/stuff/e4rat-boost.u	Sat Dec 02 05:17:25 2017 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,82 +0,0 @@
     2.4 ---- CMakeLists.txt.orig	2012-09-07 03:17:55.515017487 +0200
     2.5 -+++ CMakeLists.txt	2012-09-13 19:54:18.160054076 +0200
     2.6 -@@ -15,7 +15,6 @@
     2.7 - ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     2.8 - 
     2.9 - set(Boost_USE_MULTITHREADED OFF)
    2.10 --add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
    2.11 - find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
    2.12 - set(${PROJECT_NAME}_LIBRARIES   ${${PROJECT_NAME}_LIBRARIES}
    2.13 -     ${Boost_LIBRARIES})
    2.14 ---- src/config.cc.orig	2012-09-13 19:50:32.829871091 +0200
    2.15 -+++ src/config.cc	2012-09-13 19:55:37.023068153 +0200
    2.16 -@@ -71,7 +71,7 @@
    2.17 -         return;
    2.18 -     }
    2.19 -     
    2.20 --    tool_name = fs::path(argv[0]).filename();
    2.21 -+    tool_name = fs::path(argv[0]).filename().string();
    2.22 -     found = tool_name.find_last_of("-");
    2.23 -     if(found)
    2.24 -         defaultSection = tool_name.substr(found+1);
    2.25 ---- src/common.cc.orig	2012-09-13 19:58:06.187203344 +0200
    2.26 -+++ src/common.cc	2012-09-13 19:59:34.752096130 +0200
    2.27 -@@ -157,7 +157,7 @@
    2.28 -         p /= filesearch;
    2.29 -     }
    2.30 -     // Initialize regex filter - use * as default if nothing is given in filesearch
    2.31 --    std::string f( p.has_filename() ? p.filename() : "*");
    2.32 -+    std::string f( p.has_filename() ? p.filename().string() : "*");
    2.33 - 
    2.34 -     fs::path dir(system_complete(p).parent_path());
    2.35 -     if( is_directory(dir) )
    2.36 -@@ -166,8 +166,8 @@
    2.37 -              it!=boost::filesystem::directory_iterator();
    2.38 -              ++it )
    2.39 -         {
    2.40 --            if( boost::regex_match( it->leaf(), path2regex(f) ) )
    2.41 --                fileset.push_back(it->string());
    2.42 -+            if( boost::regex_match( it->path().filename().string(), path2regex(f) ) )
    2.43 -+                fileset.push_back(it->path().filename().string());
    2.44 -         }
    2.45 -     return fileset;
    2.46 - }
    2.47 ---- src/e4rat-collect.cc.orig	2012-09-13 20:03:40.185027797 +0200
    2.48 -+++ src/e4rat-collect.cc	2012-09-13 20:03:54.404850024 +0200
    2.49 -@@ -396,7 +396,7 @@
    2.50 -          * Parse application list given as arguments
    2.51 -          */
    2.52 -         for ( ; optind < argc; optind++)
    2.53 --            project.observeApp(fs::path(argv[optind]).filename());
    2.54 -+            project.observeApp(fs::path(argv[optind]).filename().string());
    2.55 - 
    2.56 -         /*
    2.57 -          * Parse application list on stdin
    2.58 ---- src/device.cc.orig	2012-09-13 20:00:40.232277516 +0200
    2.59 -+++ src/device.cc	2012-09-13 20:03:11.026392331 +0200
    2.60 -@@ -196,13 +196,13 @@
    2.61 -         it != end_itr;
    2.62 -         ++it )
    2.63 -     {
    2.64 --        if(it->filename() == "root")
    2.65 -+        if(it->path().filename().string() == "root")
    2.66 -             continue;
    2.67 --        if(lstat(it->string().c_str(), &st))
    2.68 -+        if(lstat(it->path().filename().c_str(), &st))
    2.69 -             continue;
    2.70 -         if(st.st_rdev == get()->devno)
    2.71 -         {
    2.72 --            get()->deviceName = it->filename();
    2.73 -+            get()->deviceName = it->path().filename().string();
    2.74 -             get()->devicePath = "/dev/" + get()->deviceName;
    2.75 -             return 0;
    2.76 -         }
    2.77 -@@ -225,7 +225,7 @@
    2.78 -             // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c
    2.79 -             // for convenience set deviceName and devicePath to a common name
    2.80 -             get()->deviceName = "virtual file system";
    2.81 --            get()->devicePath = get()->mount_point.filename();
    2.82 -+            get()->devicePath = get()->mount_point.filename().string();
    2.83 -             return 0;
    2.84 -         case 2:
    2.85 -             ss << "fd";