diff options
author | Matteo Bernardini | 2020-06-20 11:01:26 +0200 |
---|---|---|
committer | Matteo Bernardini | 2020-06-20 11:01:26 +0200 |
commit | 4763c5f8092b9a9edb2471bd83ae5d6935056245 (patch) | |
tree | 704bea10c1fd69bf1b603c44f81d0d1b4df89019 /misc/krename | |
parent | 98dec0c0253801e4775e1c705f391e477db1a7e5 (diff) | |
download | slackbuilds-4763c5f8092b9a9edb2471bd83ae5d6935056245.tar.gz |
20200620.1 global branch merge.current-20200620.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'misc/krename')
-rw-r--r-- | misc/krename/krename.SlackBuild | 3 | ||||
-rw-r--r-- | misc/krename/null.patch | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/misc/krename/krename.SlackBuild b/misc/krename/krename.SlackBuild index f084711cd4..4e67905635 100644 --- a/misc/krename/krename.SlackBuild +++ b/misc/krename/krename.SlackBuild @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix for gcc >= 6.x +patch -p1 < $CWD/null.patch + KDEPREF=$(kde4-config --prefix) cmake \ diff --git a/misc/krename/null.patch b/misc/krename/null.patch new file mode 100644 index 0000000000..991ebbea1c --- /dev/null +++ b/misc/krename/null.patch @@ -0,0 +1,12 @@ +diff -Naur krename-r247.orig/src/batchrenamer.cpp krename-r247/src/batchrenamer.cpp +--- krename-r247.orig/src/batchrenamer.cpp 2013-11-24 22:46:05.000000000 +0100 ++++ krename-r247/src/batchrenamer.cpp 2017-06-20 14:42:57.330437870 +0200 +@@ -402,7 +402,7 @@ + break; + case eRenameMode_Link: + // In case of link delete created file +- job = KIO::file_delete( dstUrl, false ); ++ job = KIO::file_delete( dstUrl, NULL ); + break; + case eRenameMode_Copy: // no undo possible + // TODO: Maybe we should delete the created files |