system/krusader: Patched for xz-support and new maintainer.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

4 files changed, 421 insertions, 35 deletions

diff --git a/system/krusader/krusader-xz.patch b/system/krusader/krusader-xz.patch
new file mode 100644
index 0000000000..3ade296e9e
--- /dev/null
+++ b/system/krusader/krusader-xz.patch
@@ -0,0 +1,375 @@
+diff -ur krusader/krArc/krarc.cpp krusader-xz/krArc/krarc.cpp
+--- krusader/krArc/krarc.cpp   2009-06-20 23:59:56.000000000 +0300
++++ krusader-xz/krArc/krarc.cpp   2009-10-06 13:03:19.000000000 +0300
+@@ -423,7 +423,7 @@
+         if (mt)
+             emit mimeType(mt->name());
+         proc << getCmd << getPath(arcFile->url());
+-        if (arcType != "gzip" && arcType != "bzip2" && arcType != "lzma") proc << localeEncodedString(file);
++        if (arcType != "gzip" && arcType != "bzip2" && arcType != "lzma" && arcType != "xz") proc << localeEncodedString(file);
+         connect(&proc, SIGNAL(newOutputData(KProcess *, QByteArray &)),
+                 this, SLOT(receivedData(KProcess *, QByteArray &)));
+         proc.setMerge(false);
+@@ -440,7 +440,7 @@
+     proc.waitForFinished();
+ 
+     if (!extArcReady && !decompressToFile) {
+-        if (proc.exitStatus() != QProcess::NormalExit || !checkStatus(proc.exitCode()) || (arcType != "bzip2" && arcType != "lzma" && expectedSize != decompressedLen)) {
++        if (proc.exitStatus() != QProcess::NormalExit || !checkStatus(proc.exitCode()) || (arcType != "bzip2" && arcType != "lzma" && arcType != "xz" && expectedSize != decompressedLen)) {
+             if (encrypted && tries) {
+                 invalidatePassword();
+                 get(url, tries - 1);
+@@ -827,6 +827,8 @@
+         arcType = "gzip";
+     else if (arcType == "tlz")
+         arcType = "lzma";
++    else if (arcType == "txz")
++        arcType = "xz";
+ 
+     if (arcType.isEmpty()) {
+         arcType = arcFile->mimetype();
+@@ -861,7 +863,7 @@
+         return false;
+     }
+ 
+-    if (arcType != "bzip2" && arcType != "lzma") {
++    if (arcType != "bzip2" && arcType != "lzma" && arcType != "xz") {
+         if (arcType == "rpm") {
+             proc << listCmd << arcPath;
+             proc.setStandardOutputFile(temp.fileName());
+@@ -896,7 +898,7 @@
+ 
+     root->append(entry);
+ 
+-    if (arcType == "bzip2" || arcType == "lzma") {
++    if (arcType == "bzip2" || arcType == "lzma" || arcType == "xz") {
+         KRDEBUG("Got me here...");
+         parseLine(0, "");
+         return true;
+@@ -1207,6 +1209,14 @@
+         mode = arcFile->mode();
+         size = arcFile->size();
+     }
++    if (arcType == "xz") {
++        fullName = arcFile->name();
++        if (fullName.endsWith(QLatin1String("xz"))) {
++            fullName.truncate(fullName.length() - 3);
++        }
++        mode = arcFile->mode();
++        size = arcFile->size();
++    }
+     if (arcType == "bzip2") {
+         // There is no way to list bzip2 files, so we take our information from
+         // the archive itself...
+@@ -1460,6 +1470,13 @@
+         copyCmd = QStringList();
+         delCmd  = QStringList();
+         putCmd  = QStringList();
++    } else if (arcType == "xz") {
++        cmd     = fullPathName("xz");
++        listCmd << fullPathName("xz");
++        getCmd  << fullPathName("xz") << "-dc";
++        copyCmd = QStringList();
++        delCmd  = QStringList();
++        putCmd  = QStringList();
+     } else if (arcType == "arj") {
+         cmd     = fullPathName("arj");
+         listCmd << fullPathName("arj") << "v" << "-y" << "-v";
+@@ -1544,7 +1561,7 @@
+         return exitCode == 0 || exitCode == 1;
+     else if (arcType == "ace" || arcType == "bzip2" || arcType == "lha" || arcType == "rpm" || arcType == "arj")
+         return exitCode == 0;
+-    else if (arcType == "gzip" || arcType == "lzma")
++    else if (arcType == "gzip" || arcType == "lzma" || arcType == "xz")
+         return exitCode == 0 || exitCode == 2;
+     else
+         return exitCode == 0;
+@@ -1566,7 +1583,8 @@
+         {"bzip2", 0, "\x42\x5a\x68\x39\x31" },
+         {"gzip", 0, "\x1f\x8b"},
+         {"deb",  0, "!<arch>\ndebian-binary   " },
+-        {"7z",   0, "7z\xbc\xaf\x27\x1c" }
++        {"7z",   0, "7z\xbc\xaf\x27\x1c" }/*,
++        {"xz",   0, "\xfd\x37\x7a\x58\x5a\x00"}*/
+     };
+     static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams);
+ 
+@@ -1714,6 +1732,14 @@
+         return "lzma";
+     }
+ 
++    if (fileName.endsWith(QLatin1String(".tar.xz")) ||
++            fileName.endsWith(QLatin1String(".txz"))) {
++        return "txz";
++    }
++    if (fileName.endsWith(QLatin1String(".xz"))) {
++        return "xz";
++    }
++
+     return QString();
+ }
+ 
+diff -ur krusader/krusader/Dialogs/packgui.cpp krusader-xz/krusader/Dialogs/packgui.cpp
+--- krusader/krusader/Dialogs/packgui.cpp   2009-06-20 23:59:56.000000000 +0300
++++ krusader-xz/krusader/Dialogs/packgui.cpp   2009-10-06 11:16:01.000000000 +0300
+@@ -68,6 +68,7 @@
+     if (PS("tar") && PS("gzip")) typeData->addItem("tar.gz");
+     if (PS("tar") && PS("bzip2")) typeData->addItem("tar.bz2");
+     if (PS("tar") && PS("lzma")) typeData->addItem("tar.lzma");
++    if (PS("tar") && PS("xz")) typeData->addItem("tar.xz");
+     if (PS("zip")) typeData->addItem("zip");
+     if (PS("rar")) typeData->addItem("rar");
+     if (PS("lha")) typeData->addItem("lha");
+diff -ur krusader/krusader/Konfigurator/kgarchives.cpp krusader-xz/krusader/Konfigurator/kgarchives.cpp
+--- krusader/krusader/Konfigurator/kgarchives.cpp   2009-06-20 21:58:50.000000000 +0300
++++ krusader-xz/krusader/Konfigurator/kgarchives.cpp   2009-10-06 12:26:37.000000000 +0300
+@@ -62,6 +62,7 @@
+     {{"Archives", "Do Tar",   _DoTar,   i18n("Tar"),   false,  ""},
+         {"Archives", "Do GZip",  _DoGZip,  i18n("GZip"),  false,  ""},
+         {"Archives", "Do LZMA",  _DoLZMA,  i18n("LZMA"),  false,  ""},
++        {"Archives", "Do XZ",    _DoXZ,    i18n("XZ"),    false,  ""},
+         {"Archives", "Do BZip2", _DoBZip2, i18n("BZip2"), false,  ""},
+         {"Archives", "Do UnZip", _DoUnZip, i18n("Zip"),   false,  ""},
+         {"Archives", "Do UnRar", _DoUnRar, i18n("Rar"),   false,  ""},
+@@ -73,7 +74,7 @@
+         {"Archives", "Do 7z",    _Do7z,    i18n("7zip"),  false,  ""}
+     };
+ 
+-    cbs = createCheckBoxGroup(3, 0, packers, 12, generalGrp);
++    cbs = createCheckBoxGroup(3, 0, packers, 13, generalGrp);
+     generalGrid->addWidget(cbs, 1, 0);
+ 
+     addLabel(generalGrid, 2, 0, i18n("The archives that are \"grayed out\" were unavailable on your\n"
+@@ -148,6 +149,7 @@
+     cbs->find("Do GZip")->setEnabled(PS("gzip"));
+     cbs->find("Do BZip2")->setEnabled(PS("bzip2"));
+     cbs->find("Do LZMA")->setEnabled(PS("lzma"));
++    cbs->find("Do XZ")->setEnabled(PS("xz"));
+     cbs->find("Do UnZip")->setEnabled(PS("unzip"));
+     cbs->find("Do Lha")->setEnabled(PS("lha"));
+     cbs->find("Do RPM")->setEnabled(PS("rpm") || PS("cpio"));
+diff -ur krusader/krusader/Konfigurator/kgdependencies.cpp krusader-xz/krusader/Konfigurator/kgdependencies.cpp
+--- krusader/krusader/Konfigurator/kgdependencies.cpp   2009-06-15 15:19:23.000000000 +0300
++++ krusader-xz/krusader/Konfigurator/kgdependencies.cpp   2009-10-06 11:14:09.000000000 +0300
+@@ -100,6 +100,7 @@
+     addApplication("unrar", archGrid1, 12, packers_tab, PAGE_PACKERS);
+     addApplication("unzip", archGrid1, 13, packers_tab, PAGE_PACKERS);
+     addApplication("zip",   archGrid1, 14, packers_tab, PAGE_PACKERS);
++    addApplication("xz",    archGrid1, 15, packers_tab, PAGE_PACKERS);
+ 
+     //  ---------------------------- CHECKSUM TAB -------------------------------------
+     QWidget *checksum_tab = new QWidget(tabWidget);
+diff -ur krusader/krusader/Konfigurator/kggeneral.cpp krusader-xz/krusader/Konfigurator/kggeneral.cpp
+--- krusader/krusader/Konfigurator/kggeneral.cpp   2009-06-21 13:38:33.000000000 +0300
++++ krusader-xz/krusader/Konfigurator/kggeneral.cpp   2009-10-06 11:13:17.000000000 +0300
+@@ -174,6 +174,7 @@
+     defaultAtomicExtensions += ".tar.gz";
+     defaultAtomicExtensions += ".tar.bz2";
+     defaultAtomicExtensions += ".tar.lzma";
++    defaultAtomicExtensions += ".tar.xz";
+     defaultAtomicExtensions += ".moc.cpp";
+ 
+     listBox = createListBox("Look&Feel", "Atomic Extensions",
+diff -ur krusader/krusader/Konfigurator/krresulttable.cpp krusader-xz/krusader/Konfigurator/krresulttable.cpp
+--- krusader/krusader/Konfigurator/krresulttable.cpp   2009-06-23 12:25:19.000000000 +0300
++++ krusader-xz/krusader/Konfigurator/krresulttable.cpp   2009-10-06 12:39:50.000000000 +0300
+@@ -99,6 +99,7 @@
+     Archiver* gzip  = new Archiver("gzip",  "http://www.gnu.org",      PS("gzip"),  true,  true);
+     Archiver* bzip2 = new Archiver("bzip2", "http://www.gnu.org",      PS("bzip2"), true,  true);
+     Archiver* lzma  = new Archiver("lzma",  "http://tukaani.org/lzma", PS("lzma"),  true,  true);
++    Archiver* xz    = new Archiver("xz",    "http://tukaani.org/xz",   PS("xz"),    true,  true);
+     Archiver* lha   = new Archiver("lha",   "http://www.gnu.org",      PS("lha"),   true,  true);
+     Archiver* zip   = new Archiver("zip",   "http://www.info-zip.org", PS("zip"),   true,  false);
+     Archiver* unzip = new Archiver("unzip", "http://www.info-zip.org", PS("unzip"), false, true);
+@@ -136,6 +137,7 @@
+     addRow(gzip, _grid);
+     addRow(bzip2, _grid);
+     addRow(lzma, _grid);
++    addRow(xz, _grid);
+     addRow(lha, _grid);
+     addRow(zip, _grid);
+     addRow(unzip, _grid);
+@@ -152,6 +154,7 @@
+     delete gzip;
+     delete bzip2;
+     delete lzma;
++    delete xz;
+     delete lha;
+     delete zip;
+     delete unzip;
+diff -ur krusader/krusader/Panel/krview.cpp krusader-xz/krusader/Panel/krview.cpp
+--- krusader/krusader/Panel/krview.cpp   2009-07-11 13:51:26.000000000 +0300
++++ krusader-xz/krusader/Panel/krview.cpp   2009-10-06 11:10:23.000000000 +0300
+@@ -233,6 +233,7 @@
+     defaultAtomicExtensions += ".tar.gz";
+     defaultAtomicExtensions += ".tar.bz2";
+     defaultAtomicExtensions += ".tar.lzma";
++    defaultAtomicExtensions += ".tar.xz";
+     defaultAtomicExtensions += ".moc.cpp";
+     QStringList atomicExtensions = grpSvr.readEntry("Atomic Extensions", defaultAtomicExtensions);
+     for (QStringList::iterator i = atomicExtensions.begin(); i != atomicExtensions.end();) {
+diff -ur krusader/krusader/VFS/krarchandler.cpp krusader-xz/krusader/VFS/krarchandler.cpp
+--- krusader/krusader/VFS/krarchandler.cpp   2009-06-20 23:59:56.000000000 +0300
++++ krusader-xz/krusader/VFS/krarchandler.cpp   2009-10-06 16:15:52.000000000 +0300
+@@ -84,7 +84,7 @@
+ };
+ 
+ 
+-static QStringList arcProtocols = QString("tar;bzip;bzip2;lzma;gzip;krarc;zip").split(';');
++static QStringList arcProtocols = QString("tar;bzip;bzip2;lzma;xz;gzip;krarc;zip").split(';');
+ 
+ KWallet::Wallet * KRarcHandler::wallet = 0;
+ KRarcObserver   * KRarcHandler::defaultObserver = new DefaultKRarcObserver();
+@@ -98,6 +98,7 @@
+     if (KrServices::cmdExist("gzip")) packers.append("gzip");
+     if (KrServices::cmdExist("bzip2")) packers.append("bzip2");
+     if (KrServices::cmdExist("lzma")) packers.append("lzma");
++    if (KrServices::cmdExist("xz")) packers.append("xz");
+     if (KrServices::cmdExist("unzip")) packers.append("unzip");
+     if (KrServices::cmdExist("zip")) packers.append("zip");
+     if (KrServices::cmdExist("lha")) packers.append("lha");
+@@ -134,6 +135,8 @@
+         return true;
+     else if (type == "-tlz" && lst.contains("tar"))
+         return true;
++    else if (type == "-txz" && lst.contains("tar"))
++        return true;
+     else if (type == "tarz" && lst.contains("tar"))
+         return true;
+     else if (type == "gzip" && lst.contains("gzip"))
+@@ -142,6 +145,8 @@
+         return true;
+     else if (type == "lzma" && lst.contains("lzma"))
+         return true;
++    else if (type == "-xz" && lst.contains("xz"))
++        return true;
+     else if (type == "-lha" && lst.contains("lha"))
+         return true;
+     else if (type == "-ace" && lst.contains("unace"))
+@@ -173,6 +178,7 @@
+             (type == "-tar" && group.readEntry("Do Tar" , _DoTar)) ||
+             (type == "-tbz" && group.readEntry("Do BZip2", _DoBZip2)) ||
+             (type == "-tlz" && group.readEntry("Do LZMA", _DoLZMA)) ||
++            (type == "-txz" && group.readEntry("Do XZ", _DoXZ)) ||
+             (type == "gzip" && group.readEntry("Do GZip" , _DoGZip)) ||
+             (type == "zip2" && group.readEntry("Do BZip2", _DoBZip2)) ||
+             (type == "-zip" && group.readEntry("Do UnZip", _DoUnZip)) ||
+@@ -198,7 +204,7 @@
+     if (!arcSupported(type)) return 0;
+ 
+     // bzip an gzip archive contains only one file
+-    if (type == "zip2" || type == "gzip" || type == "lzma") return 1L;
++    if (type == "zip2" || type == "gzip" || type == "lzma" || type == "-xz") return 1L;
+ 
+     // set the right lister to do the job
+     QStringList lister;
+@@ -209,6 +215,7 @@
+     else if (type == "tarz") lister << KrServices::fullPathName("tar") << "-tvzf";
+     else if (type == "-tbz") lister << KrServices::fullPathName("tar") << "-tjvf";
+     else if (type == "-tlz") lister << KrServices::fullPathName("tar") << "--lzma" << "-tvf";
++    else if (type == "-txz") lister << KrServices::fullPathName("tar") << "--xz" << "-tvf";
+     else if (type == "-lha") lister << KrServices::fullPathName("lha") << "l";
+     else if (type == "-rar") lister << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "l" << "-v";
+     else if (type == "-ace") lister << KrServices::fullPathName("unace") << "l";
+@@ -293,9 +300,11 @@
+     else if (type == "tarz") packer << KrServices::fullPathName("tar") << "-xvzf";
+     else if (type == "-tbz") packer << KrServices::fullPathName("tar") << "-xjvf";
+     else if (type == "-tlz") packer << KrServices::fullPathName("tar") << "--lzma" << "-xvf";
++    else if (type == "-txz") packer << KrServices::fullPathName("tar") << "--xz" << "-xvf";
+     else if (type == "gzip") packer << KrServices::fullPathName("gzip") << "-cd";
+     else if (type == "zip2") packer << KrServices::fullPathName("bzip2") << "-cdk";
+     else if (type == "lzma") packer << KrServices::fullPathName("lzma") << "-cdk";
++    else if (type == "-xz")  packer << KrServices::fullPathName("xz") << "-cdk";
+     else if (type == "-lha") packer << KrServices::fullPathName("lha") << "xf";
+     else if (type == "-rar") packer << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "-y" << "x";
+     else if (type == "-ace") packer << KrServices::fullPathName("unace") << "x";
+@@ -351,7 +360,7 @@
+     // unpack the files
+     KrLinecountingProcess proc;
+     proc << packer << archive;
+-    if (type == "zip2" || type == "gzip" || type == "lzma") {
++    if (type == "zip2" || type == "gzip" || type == "lzma" || type == "-xz") {
+         QString arcname = archive.mid(archive.lastIndexOf("/") + 1);
+         if (arcname.contains(".")) arcname = arcname.left(arcname.lastIndexOf("."));
+         proc.setStandardOutputFile(dest + '/' + arcname);
+@@ -407,9 +416,11 @@
+     else if (type == "tarz") packer << KrServices::fullPathName("tar") << "-tvzf";
+     else if (type == "-tbz") packer << KrServices::fullPathName("tar") << "-tjvf";
+     else if (type == "-tlz") packer << KrServices::fullPathName("tar") << "--lzma" << "-tvf";
++    else if (type == "-txz") packer << KrServices::fullPathName("tar") << "--xz" << "-tvf";
+     else if (type == "gzip") packer << KrServices::fullPathName("gzip") << "-tv";
+     else if (type == "zip2") packer << KrServices::fullPathName("bzip2") << "-tv";
+     else if (type == "lzma") packer << KrServices::fullPathName("lzma") << "-tv";
++    else if (type == "-xz")  packer << KrServices::fullPathName("xz") << "-tv";
+     else if (type == "-rar") packer << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "t";
+     else if (type == "-ace") packer << KrServices::fullPathName("unace") << "t";
+     else if (type == "-lha") packer << KrServices::fullPathName("lha") << "t";
+@@ -474,6 +485,8 @@
+         packer << KrServices::fullPathName("tar") << "-cvjf"; type = "-tbz";
+     } else if (type == "tar.lzma") {
+         packer << KrServices::fullPathName("tar") << "--lzma" << "-cvf"; type = "-tlz";
++    } else if (type == "tar.xz") {
++        packer << KrServices::fullPathName("tar") << "--xz" << "-cvf"; type = "-txz";
+     } else if (type == "rar") {
+         packer << KrServices::fullPathName("rar") << "-r" << "a"; type = "-rar";
+     } else if (type == "lha") {
+@@ -672,6 +685,10 @@
+         result = "-7z";
+     }
+ 
++    if (result.endsWith(QLatin1String("-xz"))) {
++        result = "-xz";
++    }
++   
+     return result.right(4);
+ }
+ 
+@@ -682,9 +699,9 @@
+         return exitCode == 0 || exitCode == 1;
+     else if (type == "-ace" || type == "zip2" || type == "-lha" || type == "-rpm" || type == "cpio" ||
+              type == "-tar" || type == "tarz" || type == "-tbz" || type == "-tgz" || type == "-arj" ||
+-             type == "-deb" || type == "-tlz")
++             type == "-deb" || type == "-tlz" || type == "-txz")
+         return exitCode == 0;
+-    else if (type == "gzip" || type == "lzma")
++    else if (type == "gzip" || type == "lzma" || type == "-xz")
+         return exitCode == 0 || exitCode == 2;
+     else
+         return exitCode == 0;
+@@ -706,7 +723,8 @@
+         {"bzip2", 0, "\x42\x5a\x68\x39\x31" },
+         {"gzip", 0, "\x1f\x8b"},
+         {"deb",  0, "!<arch>\ndebian-binary   " },
+-        {"7z",   0, "7z\xbc\xaf\x27\x1c" }
++        {"7z",   0, "7z\xbc\xaf\x27\x1c" }/*,
++        {"xz",   0, "\xfd\x37\x7a\x58\x5a\x00"}*/
+     };
+     static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams);
+ 
+@@ -838,6 +856,14 @@
+         return "lzma";
+     }
+ 
++    if (fileName.endsWith(QLatin1String(".tar.xz")) ||
++            fileName.endsWith(QLatin1String(".txz"))) {
++        return "txz";
++    }
++    if (fileName.endsWith(QLatin1String(".xz"))) {
++        return "xz";
++    }
++
+     return QString();
+ }
+ 
+diff -ur krusader/krusader/defaults.h krusader-xz/krusader/defaults.h
+--- krusader/krusader/defaults.h   2009-06-21 13:38:33.000000000 +0300
++++ krusader-xz/krusader/defaults.h   2009-10-06 11:16:32.000000000 +0300
+@@ -181,6 +181,8 @@
+ #define _DoBZip2       true
+ // Do LZMA ///////////
+ #define _DoLZMA       true
++// Do XZ ///////////
++#define _DoXZ         true
+ // Do Rar /////////////
+ #define _DoRar         true
+ // Do UnRar /////////// 
\ No newline at end of file
diff --git a/system/krusader/krusader.SlackBuild b/system/krusader/krusader.SlackBuild
index 55f328f9a0..81727a05f4 100644
--- a/system/krusader/krusader.SlackBuild
+++ b/system/krusader/krusader.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for krusader
 
 # Copyright 2006,2007,2008,2009,2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,18 +24,16 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=krusader
-VERSION=2.2.0_beta1
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.2.0_beta1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-SRC_VERSION="$(printf $VERSION | tr _ -)"
+SRCVER="$(printf $VERSION | tr _ -)"
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -47,10 +46,10 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
- elif [ "$ARCH" = "i686" ]; then
+elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
- elif [ "$ARCH" = "x86_64" ]; then
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
@@ -58,37 +57,49 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="AUTHORS COPYING CREDITS ChangeLog FAQ INSTALL README TODO"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.bz2
-cd $PRGNAM-$SRC_VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2
+cd $PRGNAM-$SRCVER
 chown -R root:root .
-chmod -R a-s,u+w,go+r-w .
-
-cmake \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DMAN_INSTALL_DIR=/usr/man \
-  -DSYSCONF_INSTALL_DIR=/etc/kde \
-  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-  .
-make
-make install DESTDIR=$PKG
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING FAQ README TODO krusader.lsm \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# add xz archive support
+# https://bugs.kde.org/show_bug.cgi?id=254615
+patch -p1 -i $CWD/krusader-xz.patch
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
+  make
+  make install DESTDIR=$PKG
+cd -
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/krusader/krusader.info b/system/krusader/krusader.info
index 9ae9a00c77..064907d00c 100644
--- a/system/krusader/krusader.info
+++ b/system/krusader/krusader.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/krusader/krusader-2.2.0-beta1.tar.bz2
 MD5SUM="71120ee8a188a12f879a6f1330b6b472"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Robby Workman"
-EMAIL="rw@rlworkman.net"
-APPROVED="Erik Hanson"
+MAINTAINER="Grigorios Bouzakis"
+EMAIL="grbzks@xsmail.com"
+APPROVED="pprkut"
diff --git a/system/krusader/slack-desc b/system/krusader/slack-desc
index c94ec58e99..2d8d830a80 100644
--- a/system/krusader/slack-desc
+++ b/system/krusader/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler----------------------------------------------------|
-krusader: krusader (Krusader File Manager) 
+        |-----handy-ruler-----------------------------------------------------|
+krusader: krusader (Krusader File Manager)
 krusader:
-krusader: krusader is an advanced twin panel (commander style) file manager 
+krusader: krusader is an advanced twin panel (commander style) file manager
 krusader: for KDE and other desktops in the *nix world, similar to Midnight
 krusader: or Total Commander. It provides all the file management features
 krusader: you could possibly want.
 krusader:
-krusader: Homepage: http://krusader.sourceforge.net/ 
+krusader: Homepage: http://krusader.sourceforge.net
 krusader:
 krusader:
 krusader: