From b91c5ca89a4237de6afa285d91b363a921755dc3 Mon Sep 17 00:00:00 2001 From: Grigorios Bouzakis Date: Thu, 6 Jan 2011 09:29:23 -0200 Subject: system/krusader: Updated for version 2.3.0_beta1. Signed-off-by: Niels Horn --- system/krusader/krusader-xz.patch | 102 +++++++++++++++++++++--------------- system/krusader/krusader.SlackBuild | 4 +- system/krusader/krusader.info | 8 +-- system/krusader/slack-desc | 2 +- 4 files changed, 66 insertions(+), 50 deletions(-) diff --git a/system/krusader/krusader-xz.patch b/system/krusader/krusader-xz.patch index 3ade296e9e..bca96e9b28 100644 --- a/system/krusader/krusader-xz.patch +++ b/system/krusader/krusader-xz.patch @@ -1,6 +1,5 @@ -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 +--- krusader-2.3.0-beta1.orig/krArc/krarc.cpp 2010-12-26 00:37:52.000000000 +0200 ++++ krusader-2.3.0-beta1/krArc/krarc.cpp 2011-01-03 00:53:16.836670713 +0200 @@ -423,7 +423,7 @@ if (mt) emit mimeType(mt->name()); @@ -105,13 +104,12 @@ diff -ur krusader/krArc/krarc.cpp krusader-xz/krArc/krarc.cpp + 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 + +--- krusader-2.3.0-beta1.orig/krusader/Dialogs/packgui.cpp 2010-12-26 00:37:50.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/Dialogs/packgui.cpp 2011-01-03 00:55:05.843337380 +0200 @@ -68,6 +68,7 @@ if (PS("tar") && PS("gzip")) typeData->addItem("tar.gz"); if (PS("tar") && PS("bzip2")) typeData->addItem("tar.bz2"); @@ -120,9 +118,9 @@ diff -ur krusader/krusader/Dialogs/packgui.cpp krusader-xz/krusader/Dialogs/pack 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 + +--- krusader-2.3.0-beta1.orig/krusader/Konfigurator/kgarchives.cpp 2010-12-26 00:37:51.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/Konfigurator/kgarchives.cpp 2011-01-03 00:57:00.326670713 +0200 @@ -62,6 +62,7 @@ {{"Archives", "Do Tar", _DoTar, i18n("Tar"), false, ""}, {"Archives", "Do GZip", _DoGZip, i18n("GZip"), false, ""}, @@ -148,9 +146,9 @@ diff -ur krusader/krusader/Konfigurator/kgarchives.cpp krusader-xz/krusader/Konf 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 + +--- krusader-2.3.0-beta1.orig/krusader/Konfigurator/kgdependencies.cpp 2010-12-26 00:37:51.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/Konfigurator/kgdependencies.cpp 2011-01-03 00:57:30.006670714 +0200 @@ -100,6 +100,7 @@ addApplication("unrar", archGrid1, 12, packers_tab, PAGE_PACKERS); addApplication("unzip", archGrid1, 13, packers_tab, PAGE_PACKERS); @@ -159,10 +157,10 @@ diff -ur krusader/krusader/Konfigurator/kgdependencies.cpp krusader-xz/krusader/ // ---------------------------- 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 @@ + +--- krusader-2.3.0-beta1.orig/krusader/Konfigurator/kggeneral.cpp 2010-12-26 00:37:51.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/Konfigurator/kggeneral.cpp 2011-01-03 00:58:39.056670713 +0200 +@@ -193,6 +193,7 @@ defaultAtomicExtensions += ".tar.gz"; defaultAtomicExtensions += ".tar.bz2"; defaultAtomicExtensions += ".tar.lzma"; @@ -170,10 +168,29 @@ diff -ur krusader/krusader/Konfigurator/kggeneral.cpp krusader-xz/krusader/Konfi 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 @@ + +--- krusader-2.3.0-beta1.orig/krusader/Konfigurator/kgprotocols.cpp 2010-12-26 00:37:51.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/Konfigurator/kgprotocols.cpp 2011-01-03 01:00:49.756670713 +0200 +@@ -51,12 +51,14 @@ + "application/x-gzip,application/x-jar," + "application/x-lha,application/x-lha-compressed," + "application/x-rar,application/x-rar-compressed," ++ "application/x-xz," + "application/x-rpm,application/zip," + "application/x-zip,application/x-zip-compressed"; + QString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz," + "application/x-bzip-compressed-tar," + "application/x-compressed-tar," +- "application/x-tbz,application/x-tgz"; ++ "application/x-tbz,application/x-tgz," ++ "application/x-xz-compressed-tar"; + + KgProtocols::KgProtocols(bool first, QWidget* parent) : + KonfiguratorPage(first, parent) + +--- krusader-2.3.0-beta1.orig/krusader/Konfigurator/krresulttable.cpp 2010-12-26 00:37:51.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/Konfigurator/krresulttable.cpp 2011-01-03 01:02:42.460004046 +0200 +@@ -102,6 +102,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); @@ -181,7 +198,7 @@ diff -ur krusader/krusader/Konfigurator/krresulttable.cpp krusader-xz/krusader/K 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 @@ +@@ -139,6 +140,7 @@ addRow(gzip, _grid); addRow(bzip2, _grid); addRow(lzma, _grid); @@ -189,7 +206,7 @@ diff -ur krusader/krusader/Konfigurator/krresulttable.cpp krusader-xz/krusader/K addRow(lha, _grid); addRow(zip, _grid); addRow(unzip, _grid); -@@ -152,6 +154,7 @@ +@@ -155,6 +157,7 @@ delete gzip; delete bzip2; delete lzma; @@ -197,10 +214,10 @@ diff -ur krusader/krusader/Konfigurator/krresulttable.cpp krusader-xz/krusader/K 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 @@ + +--- krusader-2.3.0-beta1.orig/krusader/Panel/krview.cpp 2010-12-26 00:37:51.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/Panel/krview.cpp 2011-01-03 01:03:53.033337380 +0200 +@@ -367,6 +367,7 @@ defaultAtomicExtensions += ".tar.gz"; defaultAtomicExtensions += ".tar.bz2"; defaultAtomicExtensions += ".tar.lzma"; @@ -208,18 +225,18 @@ diff -ur krusader/krusader/Panel/krview.cpp krusader-xz/krusader/Panel/krview.cp 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 @@ + +--- krusader-2.3.0-beta1.orig/krusader/VFS/krarchandler.cpp 2010-12-26 00:37:51.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/VFS/krarchandler.cpp 2011-01-03 01:14:58.190004047 +0200 +@@ -85,7 +85,7 @@ }; - + #endif -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"); @@ -313,18 +330,18 @@ diff -ur krusader/krusader/VFS/krarchandler.cpp krusader-xz/krusader/VFS/krarcha } else if (type == "rar") { packer << KrServices::fullPathName("rar") << "-r" << "a"; type = "-rar"; } else if (type == "lha") { -@@ -672,6 +685,10 @@ +@@ -673,6 +687,10 @@ result = "-7z"; } + if (result.endsWith(QLatin1String("-xz"))) { + result = "-xz"; + } -+ ++ return result.right(4); } -@@ -682,9 +699,9 @@ +@@ -683,9 +701,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" || @@ -336,7 +353,7 @@ diff -ur krusader/krusader/VFS/krarchandler.cpp krusader-xz/krusader/VFS/krarcha return exitCode == 0 || exitCode == 2; else return exitCode == 0; -@@ -706,7 +723,8 @@ +@@ -707,7 +725,8 @@ {"bzip2", 0, "\x42\x5a\x68\x39\x31" }, {"gzip", 0, "\x1f\x8b"}, {"deb", 0, "!\ndebian-binary " }, @@ -346,7 +363,7 @@ diff -ur krusader/krusader/VFS/krarchandler.cpp krusader-xz/krusader/VFS/krarcha }; static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams); -@@ -838,6 +856,14 @@ +@@ -839,6 +858,14 @@ return "lzma"; } @@ -361,9 +378,8 @@ diff -ur krusader/krusader/VFS/krarchandler.cpp krusader-xz/krusader/VFS/krarcha 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 +--- krusader-2.3.0-beta1.orig/krusader/defaults.h 2010-12-26 00:37:52.000000000 +0200 ++++ krusader-2.3.0-beta1/krusader/defaults.h 2011-01-03 01:15:46.816670713 +0200 @@ -181,6 +181,8 @@ #define _DoBZip2 true // Do LZMA /////////// @@ -372,4 +388,4 @@ diff -ur krusader/krusader/defaults.h krusader-xz/krusader/defaults.h +#define _DoXZ true // Do Rar ///////////// #define _DoRar true - // Do UnRar /////////// \ No newline at end of file + // Do UnRar /////////// diff --git a/system/krusader/krusader.SlackBuild b/system/krusader/krusader.SlackBuild index 81727a05f4..a0aa75a22d 100644 --- a/system/krusader/krusader.SlackBuild +++ b/system/krusader/krusader.SlackBuild @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=krusader -VERSION=${VERSION:-2.2.0_beta1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.3.0_beta1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRCVER="$(printf $VERSION | tr _ -)" diff --git a/system/krusader/krusader.info b/system/krusader/krusader.info index 064907d00c..0546da5e9f 100644 --- a/system/krusader/krusader.info +++ b/system/krusader/krusader.info @@ -1,10 +1,10 @@ PRGNAM="krusader" -VERSION="2.2.0_beta1" +VERSION="2.3.0_beta1" HOMEPAGE="http://krusader.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/krusader/krusader-2.2.0-beta1.tar.bz2" -MD5SUM="71120ee8a188a12f879a6f1330b6b472" +DOWNLOAD="http://downloads.sourceforge.net/krusader/krusader-2.3.0-beta1.tar.bz2" +MD5SUM="3ef55648a2589a9a919d463acec3b830" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Grigorios Bouzakis" EMAIL="grbzks@xsmail.com" -APPROVED="pprkut" +APPROVED="Niels Horn" diff --git a/system/krusader/slack-desc b/system/krusader/slack-desc index 2d8d830a80..5daa4b58f2 100644 --- a/system/krusader/slack-desc +++ b/system/krusader/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-----------------------------------------------------| + |-----handy-ruler------------------------------------------------------| krusader: krusader (Krusader File Manager) krusader: krusader: krusader is an advanced twin panel (commander style) file manager -- cgit v1.2.3