[krusader] * Sun Jan 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.0-0.1.beta1 - Update to 2.3.0-beta1, dro
Kevin Kofler
kkofler at fedoraproject.org
Sun Jan 30 19:22:06 UTC 2011
commit 23c2de54aad3b6d6d4f01474494745e052bb0909
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Jan 30 20:20:33 2011 +0100
* Sun Jan 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.0-0.1.beta1
- Update to 2.3.0-beta1, drop upstreamed patches
- Update upstream URL to http://www.krusader.org/
- Use upstream xz patch (from git master, will be in the next release)
- Split out default-mimetypes patch for legacy lzma/tar.lzma, fix .bz2 (non-tar)
.gitignore | 1 +
krusader-2.2.0-beta1-default-mimetypes-xz.patch | 22 ---
krusader-2.2.0-beta1-fix-hang-on-close.patch | 17 --
krusader-2.2.0-beta1-force-reload.patch | 24 ---
krusader-2.2.0-beta1-readonly.patch | 12 --
...2.2.0-beta1-rename-selects-ext-regression.patch | 30 ----
krusader-2.2.0-beta1-singleclick-regression.patch | 12 --
krusader-2.2.0-beta1-viewer-menu.patch | 20 ---
krusader-2.3.0-beta1-default-mimetypes.patch | 25 +++
...beta1-xz.patch => krusader-2.3.0-beta1-xz.patch | 174 +++++++++++--------
krusader.spec | 49 ++----
sources | 2 +-
12 files changed, 147 insertions(+), 241 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d2999c..dc18e51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
krusader-2.2.0-beta1.tar.bz2
+/krusader-2.3.0-beta1.tar.bz2
diff --git a/krusader-2.3.0-beta1-default-mimetypes.patch b/krusader-2.3.0-beta1-default-mimetypes.patch
new file mode 100644
index 0000000..7429728
--- /dev/null
+++ b/krusader-2.3.0-beta1-default-mimetypes.patch
@@ -0,0 +1,25 @@
+diff -ur krusader-2.3.0-beta1-xz/krusader/Konfigurator/kgprotocols.cpp krusader-2.3.0-beta1-default-mimetypes/krusader/Konfigurator/kgprotocols.cpp
+--- krusader-2.3.0-beta1-xz/krusader/Konfigurator/kgprotocols.cpp 2011-01-30 20:11:26.000000000 +0100
++++ krusader-2.3.0-beta1-default-mimetypes/krusader/Konfigurator/kgprotocols.cpp 2011-01-30 20:14:15.000000000 +0100
+@@ -45,11 +45,12 @@
+ QString KgProtocols::defaultKrarcMimes = "application/x-7z,application/x-7z-compressed,"
+ "application/x-ace,application/x-ace-compressed,"
+ "application/x-arj,application/x-arj-compressed,"
+- "application/x-bzip2,"
++ "application/x-bzip,"
+ "application/x-cpio,application/x-deb,"
+ "application/x-debian-package,"
+ "application/x-gzip,application/x-jar,"
+ "application/x-lha,application/x-lha-compressed,"
++ "application/x-lzma,"
+ "application/x-rar,application/x-rar-compressed,"
+ "application/x-xz,"
+ "application/x-rpm,application/zip,"
+@@ -57,6 +58,7 @@
+ QString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz,"
+ "application/x-bzip-compressed-tar,"
+ "application/x-compressed-tar,"
++ "application/x-lzma-compressed-tar,"
+ "application/x-tbz,application/x-tgz,"
+ "application/x-xz-compressed-tar";
+
diff --git a/krusader-2.2.0-beta1-xz.patch b/krusader-2.3.0-beta1-xz.patch
similarity index 78%
rename from krusader-2.2.0-beta1-xz.patch
rename to krusader-2.3.0-beta1-xz.patch
index 8c21adc..9ce4408 100644
--- a/krusader-2.2.0-beta1-xz.patch
+++ b/krusader-2.3.0-beta1-xz.patch
@@ -1,7 +1,15 @@
-diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krarc.cpp
---- krusader-2.2.0-beta1/krArc/krarc.cpp 2010-04-30 18:41:04.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krArc/krarc.cpp 2010-06-03 17:02:30.000000000 +0200
-@@ -423,7 +423,7 @@
+From: Jan Lepper <dehtris at yahoo.de>
+Date: Thu, 27 Jan 2011 08:54:29 +0000
+Subject: add support for .xz archives - thanks to Val Gor, Grigorios Bouzakis
+X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=a2db0b0fb5f58d0d648a362f75e3948f49cc87fc
+---
+add support for .xz archives - thanks to Val Gor, Grigorios Bouzakis
+---
+
+
+--- a/krArc/krarc.cpp
++++ b/krArc/krarc.cpp
+@@ -423,7 +423,7 @@ void kio_krarcProtocol::get(const KUrl&
if (mt)
emit mimeType(mt->name());
proc << getCmd << getPath(arcFile->url());
@@ -10,7 +18,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
connect(&proc, SIGNAL(newOutputData(KProcess *, QByteArray &)),
this, SLOT(receivedData(KProcess *, QByteArray &)));
proc.setMerge(false);
-@@ -440,7 +440,7 @@
+@@ -440,7 +440,7 @@ void kio_krarcProtocol::get(const KUrl&
proc.waitForFinished();
if (!extArcReady && !decompressToFile) {
@@ -19,7 +27,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
if (encrypted && tries) {
invalidatePassword();
get(url, tries - 1);
-@@ -827,6 +827,8 @@
+@@ -827,6 +827,8 @@ bool kio_krarcProtocol::setArcFile(const
arcType = "gzip";
else if (arcType == "tlz")
arcType = "lzma";
@@ -28,7 +36,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
if (arcType.isEmpty()) {
arcType = arcFile->mimetype();
-@@ -861,7 +863,7 @@
+@@ -861,7 +863,7 @@ bool kio_krarcProtocol::initDirDict(cons
return false;
}
@@ -37,7 +45,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
if (arcType == "rpm") {
proc << listCmd << arcPath;
proc.setStandardOutputFile(temp.fileName());
-@@ -896,7 +898,7 @@
+@@ -896,7 +898,7 @@ bool kio_krarcProtocol::initDirDict(cons
root->append(entry);
@@ -46,7 +54,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
KRDEBUG("Got me here...");
parseLine(0, "");
return true;
-@@ -1207,6 +1209,14 @@
+@@ -1207,6 +1209,14 @@ void kio_krarcProtocol::parseLine(int li
mode = arcFile->mode();
size = arcFile->size();
}
@@ -61,7 +69,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
if (arcType == "bzip2") {
// There is no way to list bzip2 files, so we take our information from
// the archive itself...
-@@ -1460,6 +1470,13 @@
+@@ -1460,6 +1470,13 @@ bool kio_krarcProtocol::initArcParameter
copyCmd = QStringList();
delCmd = QStringList();
putCmd = QStringList();
@@ -75,7 +83,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
} else if (arcType == "arj") {
cmd = fullPathName("arj");
listCmd << fullPathName("arj") << "v" << "-y" << "-v";
-@@ -1544,7 +1561,7 @@
+@@ -1544,7 +1561,7 @@ bool kio_krarcProtocol::checkStatus(int
return exitCode == 0 || exitCode == 1;
else if (arcType == "ace" || arcType == "bzip2" || arcType == "lha" || arcType == "rpm" || arcType == "arj")
return exitCode == 0;
@@ -84,7 +92,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
return exitCode == 0 || exitCode == 2;
else
return exitCode == 0;
-@@ -1566,7 +1583,8 @@
+@@ -1566,7 +1583,8 @@ QString kio_krarcProtocol::detectArchive
{"bzip2", 0, "\x42\x5a\x68\x39\x31" },
{"gzip", 0, "\x1f\x8b"},
{"deb", 0, "!<arch>\ndebian-binary " },
@@ -94,7 +102,7 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
};
static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams);
-@@ -1714,6 +1732,14 @@
+@@ -1714,6 +1732,14 @@ QString kio_krarcProtocol::detectArchive
return "lzma";
}
@@ -105,26 +113,14 @@ diff -ur krusader-2.2.0-beta1/krArc/krarc.cpp krusader-2.2.0-beta1-xz/krArc/krar
+ if (fileName.endsWith(QLatin1String(".xz"))) {
+ return "xz";
+ }
-+
++
return QString();
}
-diff -ur krusader-2.2.0-beta1/krusader/defaults.h krusader-2.2.0-beta1-xz/krusader/defaults.h
---- krusader-2.2.0-beta1/krusader/defaults.h 2010-04-30 18:41:03.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krusader/defaults.h 2010-06-03 17:02:30.000000000 +0200
-@@ -181,6 +181,8 @@
- #define _DoBZip2 true
- // Do LZMA ///////////
- #define _DoLZMA true
-+// Do XZ ///////////
-+#define _DoXZ true
- // Do Rar /////////////
- #define _DoRar true
- // Do UnRar ///////////
-diff -ur krusader-2.2.0-beta1/krusader/Dialogs/packgui.cpp krusader-2.2.0-beta1-xz/krusader/Dialogs/packgui.cpp
---- krusader-2.2.0-beta1/krusader/Dialogs/packgui.cpp 2010-04-30 18:40:50.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krusader/Dialogs/packgui.cpp 2010-06-03 17:02:30.000000000 +0200
-@@ -68,6 +68,7 @@
+
+--- a/krusader/Dialogs/packgui.cpp
++++ b/krusader/Dialogs/packgui.cpp
+@@ -68,6 +68,7 @@ PackGUI::PackGUI(QString defaultName, QS
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");
@@ -132,10 +128,10 @@ diff -ur krusader-2.2.0-beta1/krusader/Dialogs/packgui.cpp krusader-2.2.0-beta1-
if (PS("zip")) typeData->addItem("zip");
if (PS("rar")) typeData->addItem("rar");
if (PS("lha")) typeData->addItem("lha");
-diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/kgarchives.cpp krusader-2.2.0-beta1-xz/krusader/Konfigurator/kgarchives.cpp
---- krusader-2.2.0-beta1/krusader/Konfigurator/kgarchives.cpp 2010-04-30 18:40:51.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krusader/Konfigurator/kgarchives.cpp 2010-06-03 17:02:30.000000000 +0200
-@@ -62,6 +62,7 @@
+
+--- a/krusader/Konfigurator/kgarchives.cpp
++++ b/krusader/Konfigurator/kgarchives.cpp
+@@ -62,6 +62,7 @@ KgArchives::KgArchives(bool first, QWidg
{{"Archives", "Do Tar", _DoTar, i18n("Tar"), false, ""},
{"Archives", "Do GZip", _DoGZip, i18n("GZip"), false, ""},
{"Archives", "Do LZMA", _DoLZMA, i18n("LZMA"), false, ""},
@@ -143,7 +139,7 @@ diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/kgarchives.cpp krusader-2.2.
{"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 @@
+@@ -73,7 +74,7 @@ KgArchives::KgArchives(bool first, QWidg
{"Archives", "Do 7z", _Do7z, i18n("7zip"), false, ""}
};
@@ -152,7 +148,7 @@ diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/kgarchives.cpp krusader-2.2.
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 @@
+@@ -148,6 +149,7 @@ void KgArchives::disableNonExistingPacke
cbs->find("Do GZip")->setEnabled(PS("gzip"));
cbs->find("Do BZip2")->setEnabled(PS("bzip2"));
cbs->find("Do LZMA")->setEnabled(PS("lzma"));
@@ -160,10 +156,10 @@ diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/kgarchives.cpp krusader-2.2.
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-2.2.0-beta1/krusader/Konfigurator/kgdependencies.cpp krusader-2.2.0-beta1-xz/krusader/Konfigurator/kgdependencies.cpp
---- krusader-2.2.0-beta1/krusader/Konfigurator/kgdependencies.cpp 2010-04-30 18:40:51.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krusader/Konfigurator/kgdependencies.cpp 2010-06-03 17:02:30.000000000 +0200
-@@ -100,6 +100,7 @@
+
+--- a/krusader/Konfigurator/kgdependencies.cpp
++++ b/krusader/Konfigurator/kgdependencies.cpp
+@@ -100,6 +100,7 @@ KgDependencies::KgDependencies(bool firs
addApplication("unrar", archGrid1, 12, packers_tab, PAGE_PACKERS);
addApplication("unzip", archGrid1, 13, packers_tab, PAGE_PACKERS);
addApplication("zip", archGrid1, 14, packers_tab, PAGE_PACKERS);
@@ -171,10 +167,10 @@ diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/kgdependencies.cpp krusader-
// ---------------------------- CHECKSUM TAB -------------------------------------
QWidget *checksum_tab = new QWidget(tabWidget);
-diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/kggeneral.cpp krusader-2.2.0-beta1-xz/krusader/Konfigurator/kggeneral.cpp
---- krusader-2.2.0-beta1/krusader/Konfigurator/kggeneral.cpp 2010-04-30 18:40:51.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krusader/Konfigurator/kggeneral.cpp 2010-06-03 17:02:30.000000000 +0200
-@@ -193,6 +193,7 @@
+
+--- a/krusader/Konfigurator/kggeneral.cpp
++++ b/krusader/Konfigurator/kggeneral.cpp
+@@ -193,6 +193,7 @@ void KgGeneral::createExtensionsTab()
defaultAtomicExtensions += ".tar.gz";
defaultAtomicExtensions += ".tar.bz2";
defaultAtomicExtensions += ".tar.lzma";
@@ -182,10 +178,29 @@ diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/kggeneral.cpp krusader-2.2.0
defaultAtomicExtensions += ".moc.cpp";
listBox = createListBox("Look&Feel", "Atomic Extensions",
-diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/krresulttable.cpp krusader-2.2.0-beta1-xz/krusader/Konfigurator/krresulttable.cpp
---- krusader-2.2.0-beta1/krusader/Konfigurator/krresulttable.cpp 2010-04-30 18:40:51.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krusader/Konfigurator/krresulttable.cpp 2010-06-03 17:02:30.000000000 +0200
-@@ -102,6 +102,7 @@
+
+--- a/krusader/Konfigurator/kgprotocols.cpp
++++ b/krusader/Konfigurator/kgprotocols.cpp
+@@ -51,12 +51,14 @@ QString KgProtocols::defaultKrarcMimes =
+ "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)
+
+--- a/krusader/Konfigurator/krresulttable.cpp
++++ b/krusader/Konfigurator/krresulttable.cpp
+@@ -102,6 +102,7 @@ KrArchiverResultTable::KrArchiverResultT
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);
@@ -193,7 +208,7 @@ diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/krresulttable.cpp krusader-2
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);
-@@ -139,6 +140,7 @@
+@@ -139,6 +140,7 @@ KrArchiverResultTable::KrArchiverResultT
addRow(gzip, _grid);
addRow(bzip2, _grid);
addRow(lzma, _grid);
@@ -201,7 +216,7 @@ diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/krresulttable.cpp krusader-2
addRow(lha, _grid);
addRow(zip, _grid);
addRow(unzip, _grid);
-@@ -155,6 +157,7 @@
+@@ -155,6 +157,7 @@ KrArchiverResultTable::KrArchiverResultT
delete gzip;
delete bzip2;
delete lzma;
@@ -209,10 +224,10 @@ diff -ur krusader-2.2.0-beta1/krusader/Konfigurator/krresulttable.cpp krusader-2
delete lha;
delete zip;
delete unzip;
-diff -ur krusader-2.2.0-beta1/krusader/Panel/krview.cpp krusader-2.2.0-beta1-xz/krusader/Panel/krview.cpp
---- krusader-2.2.0-beta1/krusader/Panel/krview.cpp 2010-04-30 18:41:02.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krusader/Panel/krview.cpp 2010-06-03 17:02:30.000000000 +0200
-@@ -253,6 +253,7 @@
+
+--- a/krusader/Panel/krview.cpp
++++ b/krusader/Panel/krview.cpp
+@@ -367,6 +367,7 @@ void KrView::initProperties()
defaultAtomicExtensions += ".tar.gz";
defaultAtomicExtensions += ".tar.bz2";
defaultAtomicExtensions += ".tar.lzma";
@@ -220,10 +235,10 @@ diff -ur krusader-2.2.0-beta1/krusader/Panel/krview.cpp krusader-2.2.0-beta1-xz/
defaultAtomicExtensions += ".moc.cpp";
QStringList atomicExtensions = grpSvr.readEntry("Atomic Extensions", defaultAtomicExtensions);
for (QStringList::iterator i = atomicExtensions.begin(); i != atomicExtensions.end();) {
-diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1-xz/krusader/VFS/krarchandler.cpp
---- krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp 2010-04-30 18:40:53.000000000 +0200
-+++ krusader-2.2.0-beta1-xz/krusader/VFS/krarchandler.cpp 2010-06-03 17:02:30.000000000 +0200
-@@ -85,7 +85,7 @@
+
+--- a/krusader/VFS/krarchandler.cpp
++++ b/krusader/VFS/krarchandler.cpp
+@@ -85,7 +85,7 @@ public:
};
#endif
@@ -232,7 +247,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
KWallet::Wallet * KRarcHandler::wallet = 0;
-@@ -98,6 +98,7 @@
+@@ -98,6 +98,7 @@ QStringList KRarcHandler::supportedPacke
if (KrServices::cmdExist("gzip")) packers.append("gzip");
if (KrServices::cmdExist("bzip2")) packers.append("bzip2");
if (KrServices::cmdExist("lzma")) packers.append("lzma");
@@ -240,7 +255,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
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 @@
+@@ -134,6 +135,8 @@ bool KRarcHandler::arcSupported(QString
return true;
else if (type == "-tlz" && lst.contains("tar"))
return true;
@@ -249,7 +264,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
else if (type == "tarz" && lst.contains("tar"))
return true;
else if (type == "gzip" && lst.contains("gzip"))
-@@ -142,6 +145,8 @@
+@@ -142,6 +145,8 @@ bool KRarcHandler::arcSupported(QString
return true;
else if (type == "lzma" && lst.contains("lzma"))
return true;
@@ -258,7 +273,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
else if (type == "-lha" && lst.contains("lha"))
return true;
else if (type == "-ace" && lst.contains("unace"))
-@@ -173,6 +178,7 @@
+@@ -173,6 +178,7 @@ bool KRarcHandler::arcHandled(QString ty
(type == "-tar" && group.readEntry("Do Tar" , _DoTar)) ||
(type == "-tbz" && group.readEntry("Do BZip2", _DoBZip2)) ||
(type == "-tlz" && group.readEntry("Do LZMA", _DoLZMA)) ||
@@ -266,7 +281,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
(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 @@
+@@ -198,7 +204,7 @@ long KRarcHandler::arcFileCount(QString
if (!arcSupported(type)) return 0;
// bzip an gzip archive contains only one file
@@ -275,7 +290,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
// set the right lister to do the job
QStringList lister;
-@@ -209,6 +215,7 @@
+@@ -209,6 +215,7 @@ long KRarcHandler::arcFileCount(QString
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";
@@ -283,7 +298,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
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 @@
+@@ -293,9 +300,11 @@ bool KRarcHandler::unpack(QString archiv
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";
@@ -295,7 +310,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
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 @@
+@@ -351,7 +360,7 @@ bool KRarcHandler::unpack(QString archiv
// unpack the files
KrLinecountingProcess proc;
proc << packer << archive;
@@ -304,7 +319,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
QString arcname = archive.mid(archive.lastIndexOf("/") + 1);
if (arcname.contains(".")) arcname = arcname.left(arcname.lastIndexOf("."));
proc.setStandardOutputFile(dest + '/' + arcname);
-@@ -407,9 +416,11 @@
+@@ -407,9 +416,11 @@ bool KRarcHandler::test(QString archive,
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";
@@ -316,7 +331,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
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 @@
+@@ -474,6 +485,8 @@ bool KRarcHandler::pack(QStringList file
packer << KrServices::fullPathName("tar") << "-cvjf"; type = "-tbz";
} else if (type == "tar.lzma") {
packer << KrServices::fullPathName("tar") << "--lzma" << "-cvf"; type = "-tlz";
@@ -325,18 +340,18 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
} else if (type == "rar") {
packer << KrServices::fullPathName("rar") << "-r" << "a"; type = "-rar";
} else if (type == "lha") {
-@@ -673,6 +686,10 @@
+@@ -673,6 +686,10 @@ QString KRarcHandler::getType(bool &encr
result = "-7z";
}
+ if (result.endsWith(QLatin1String("-xz"))) {
+ result = "-xz";
+ }
-+
++
return result.right(4);
}
-@@ -683,9 +700,9 @@
+@@ -683,9 +700,9 @@ bool KRarcHandler::checkStatus(QString t
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" ||
@@ -348,7 +363,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
return exitCode == 0 || exitCode == 2;
else
return exitCode == 0;
-@@ -707,7 +724,8 @@
+@@ -707,7 +724,8 @@ QString KRarcHandler::detectArchive(bool
{"bzip2", 0, "\x42\x5a\x68\x39\x31" },
{"gzip", 0, "\x1f\x8b"},
{"deb", 0, "!<arch>\ndebian-binary " },
@@ -358,7 +373,7 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
};
static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams);
-@@ -839,6 +857,14 @@
+@@ -839,6 +857,14 @@ QString KRarcHandler::detectArchive(bool
return "lzma";
}
@@ -373,3 +388,16 @@ diff -ur krusader-2.2.0-beta1/krusader/VFS/krarchandler.cpp krusader-2.2.0-beta1
return QString();
}
+
+--- a/krusader/defaults.h
++++ b/krusader/defaults.h
+@@ -181,6 +181,8 @@
+ #define _DoBZip2 true
+ // Do LZMA ///////////
+ #define _DoLZMA true
++// Do XZ ///////////
++#define _DoXZ true
+ // Do Rar /////////////
+ #define _DoRar true
+ // Do UnRar ///////////
+
diff --git a/krusader.spec b/krusader.spec
index 7b023fe..06ad897 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,32 +1,20 @@
Name: krusader
-Version: 2.2.0
+Version: 2.3.0
%global beta beta1
-Release: 0.5.%{beta}%{?dist}
+Release: 0.1.%{beta}%{?dist}
Summary: An advanced twin-panel (commander-style) file-manager for KDE
Group: Applications/File
License: GPLv2+
-URL: http://krusader.sourceforge.net/
+URL: http://www.krusader.org/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
-# https://sourceforge.net/tracker/?func=detail&aid=2873567&group_id=6488&atid=306488
-# adds XZ support to KrArc and the packing/unpacking functionality (#593525 part 1)
-Patch0: krusader-2.2.0-beta1-xz.patch
-# https://sourceforge.net/tracker/?func=detail&atid=306488&aid=3011061&group_id=6488
-# adds default MIME type handlers for LZMA and XZ archives (#593525 part 2)
-Patch1: krusader-2.2.0-beta1-default-mimetypes-xz.patch
-# fix regression making single-click mode unusable
-Patch2: krusader-2.2.0-beta1-singleclick-regression.patch
-# fix regression: "rename selects extension" not working (SF#3003338)
-Patch3: krusader-2.2.0-beta1-rename-selects-ext-regression.patch
-# force reloading when opening a file in the viewer (SF#2969403)
-Patch4: krusader-2.2.0-beta1-force-reload.patch
-# fix bogus toplevel entries being shown in the viewer menu (SF#2981303)
-Patch5: krusader-2.2.0-beta1-viewer-menu.patch
-# fix the text viewer not being read-only (SF#2898151)
-Patch6: krusader-2.2.0-beta1-readonly.patch
-# fix Krusader not terminating properly (#620328, kde#240319, SF#3015094)
-# (patch backported from upstream SVN trunk)
-Patch100: krusader-2.2.0-beta1-fix-hang-on-close.patch
+# adds default MIME type handlers for (tar.)lzma legacy archives
+# fixes bz2 (non-tar) MIME type
+Patch0: krusader-2.3.0-beta1-default-mimetypes.patch
+# upstream patches:
+# http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=a2db0b0fb5f58d0d648a362f75e3948f49cc87fc
+# adds XZ support to KrArc and the packing/unpacking functionality (#593525)
+Patch100: krusader-2.3.0-beta1-xz.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,14 +38,9 @@ friendly, fast and looks great on your desktop! You should give it a try.
%prep
%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
-%patch0 -p1 -b .xz
-%patch1 -p1 -b .mime-xz
-%patch2 -p1 -b .singleclick
-%patch3 -p1 -b .rename-selects-ext
-%patch4 -p1 -b .force-reload
-%patch5 -p1 -b .viewer-menu
-%patch6 -p1 -b .readonly
-%patch100 -p0 -b .hang-on-close
+%patch100 -p1 -b .xz
+# apply this one after the upstream patch since it touches the same file
+%patch0 -p1 -b .mimetypes
%build
mkdir -p %{_target_platform}
@@ -115,6 +98,12 @@ rm -rf %{buildroot}
%{_kde4_datadir}/kde4/services/*.protocol
%changelog
+* Sun Jan 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.0-0.1.beta1
+- Update to 2.3.0-beta1, drop upstreamed patches
+- Update upstream URL to http://www.krusader.org/
+- Use upstream xz patch (from git master, will be in the next release)
+- Split out default-mimetypes patch for legacy lzma/tar.lzma, fix .bz2 (non-tar)
+
* Fri Aug 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.5.beta1
- fix Krusader not terminating properly (#620328, kde#240319, SF#3015094)
(patch backported from upstream SVN trunk)
diff --git a/sources b/sources
index 39f3e5a..c5e7cb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71120ee8a188a12f879a6f1330b6b472 krusader-2.2.0-beta1.tar.bz2
+3ef55648a2589a9a919d463acec3b830 krusader-2.3.0-beta1.tar.bz2
More information about the scm-commits
mailing list