[arch-commits] Commit in krusader/repos (8 files)

Lukas Jirkovsky stativ at archlinux.org
Sun Oct 23 18:05:29 UTC 2016


    Date: Sunday, October 23, 2016 @ 18:05:28
  Author: stativ
Revision: 193111

archrelease: copy trunk to community-i686, community-x86_64

Added:
  krusader/repos/community-i686/PKGBUILD
    (from rev 193110, krusader/trunk/PKGBUILD)
  krusader/repos/community-x86_64/PKGBUILD
    (from rev 193110, krusader/trunk/PKGBUILD)
Deleted:
  krusader/repos/community-i686/PKGBUILD
  krusader/repos/community-i686/kde_bug309119.diff
  krusader/repos/community-i686/kde_bug325801.diff
  krusader/repos/community-x86_64/PKGBUILD
  krusader/repos/community-x86_64/kde_bug309119.diff
  krusader/repos/community-x86_64/kde_bug325801.diff

-------------------------------------+
 /PKGBUILD                           |   60 ++++++++++++
 community-i686/PKGBUILD             |   46 ---------
 community-i686/kde_bug309119.diff   |   21 ----
 community-i686/kde_bug325801.diff   |  157 ----------------------------------
 community-x86_64/PKGBUILD           |   46 ---------
 community-x86_64/kde_bug309119.diff |   21 ----
 community-x86_64/kde_bug325801.diff |  157 ----------------------------------
 7 files changed, 60 insertions(+), 448 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-10-23 18:05:11 UTC (rev 193110)
+++ community-i686/PKGBUILD	2016-10-23 18:05:28 UTC (rev 193111)
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 149613 2012-02-08 20:20:01Z pierre $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-
-pkgname=krusader
-pkgver=2.4.0beta3
-_pkgver=2.4.0-beta3
-pkgrel=9
-pkgdesc="An alternative file manager for KDE resembling Midnight Commander"
-arch=('i686' 'x86_64')
-url="http://krusader.sourceforge.net/"
-license=('GPL')
-depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-katepart' 'kuiserver')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdebase-keditbookmarks: to edit bookmarks'
-            'kdebase-konsole: open an embedded terminal')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2"
-        "kde_bug309119.diff" "kde_bug325801.diff")
-md5sums=('62a02db3f213bb76805ca6c958e9e263'
-         '5e9952f6ac38e5ce323eb95ca6f20db6'
-         '55fd27e4888e15e8b3bd8ab08b85aa9e')
-
-prepare() {
-  cd "$srcdir/$pkgname-$_pkgver"
-
-  # fix KDE bug 309119 - "New directory" dialog: can't clear all typed text
-  patch -Np1 < "$srcdir/kde_bug309119.diff" || true
-  # fix KDE bug 32580 -  Showing contents of rar archives is broken with unrar 5.00
-  patch -Np1 < "$srcdir/kde_bug325801.diff" || true
-}
-
-build() {
-  cd "$srcdir/$pkgname-$_pkgver"
-
-  cmake . \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_pkgver"
-  make DESTDIR="$pkgdir" install
-}

Copied: krusader/repos/community-i686/PKGBUILD (from rev 193110, krusader/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-10-23 18:05:28 UTC (rev 193111)
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 149613 2012-02-08 20:20:01Z pierre $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+pkgname=krusader
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="Advanced twin panel (commander style) file manager for KDE"
+arch=('i686' 'x86_64')
+url="https://krusader.org/"
+license=('GPL')
+depends=('karchive' 'kbookmarks' 'kcodecs' 'kcompletion' 'kcoreaddons' 'kconfig'
+         'kdoctools' 'ki18n' 'kiconthemes' 'kitemviews' 'kio' 'knotifications'
+         'kparts' 'solid' 'ktextwidgets' 'kwallet' 'kwidgetsaddons' 'kwindowsystem'
+         'kxmlgui' 'kguiaddons' 'hicolor-icon-theme')
+makedepends=('cmake' 'extra-cmake-modules' 'python')
+source=("http://download.kde.org/stable/krusader/$pkgver/$pkgname-$pkgver.tar.xz")
+md5sums=('5074c7c8dcd7fa8c8509f472bc2e0815')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  cmake . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-i686/kde_bug309119.diff
===================================================================
--- community-i686/kde_bug309119.diff	2016-10-23 18:05:11 UTC (rev 193110)
+++ community-i686/kde_bug309119.diff	2016-10-23 18:05:28 UTC (rev 193111)
@@ -1,21 +0,0 @@
-commit 5cb23ac98046a07d5db3a52b41e3a42544eb13f9
-Author: Jan Lepper <jan_lepper at gmx.de>
-Date:   Wed Jan 2 21:38:52 2013 +0100
-
-    FIXED: [ 309119 ] Wrong "New directory" dialog behavior: can't clear all typed text
-    return QValidator::Intermediate instead of Invalid when input is empty
-    BUG: 309119
-
-diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp
-index 2f696da..8935ddf 100644
---- a/krusader/Panel/panelfunc.cpp
-+++ b/krusader/Panel/panelfunc.cpp
-@@ -100,7 +100,7 @@ class FilePathValidator : public QValidator
- {
- public:
-     virtual State validate(QString &input, int &pos) const {
--        return input.isEmpty() ? Invalid : Acceptable;
-+            return input.isEmpty() ? Intermediate : Acceptable;
-     }
- };
- 

Deleted: community-i686/kde_bug325801.diff
===================================================================
--- community-i686/kde_bug325801.diff	2016-10-23 18:05:11 UTC (rev 193110)
+++ community-i686/kde_bug325801.diff	2016-10-23 18:05:28 UTC (rev 193111)
@@ -1,157 +0,0 @@
-commit aca6a97fc31a80b5a35ec1afbee8f45a728b8a19
-Author: Alexander Balakhnin <Croman13n3c at gmail.com>
-Date:   Sun Oct 27 19:48:38 2013 +0300
-
-    Fixing krarc support for new unrar 5
-
-diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp
-index fc52ad5..c60a1f5 100644
---- a/krArc/krarc.cpp
-+++ b/krArc/krarc.cpp
-@@ -918,7 +918,7 @@ bool kio_krarcProtocol::initDirDict(const KUrl&url, bool forced)
-     }
- 
-     extArcReady = false;
--
-+    isUnrarVersion5 = false;
-     if (!setArcFile(url))
-         return false;   /* if the archive was changed refresh the file information */
- 
-@@ -979,6 +979,14 @@ bool kio_krarcProtocol::initDirDict(const KUrl&url, bool forced)
-     if (arcType == "rar" || arcType == "arj" || arcType == "lha" || arcType == "7z") {
-         while (temp.readLine(buf, 1000) != -1) {
-             line = decodeString(buf);
-+            //detect unrar version
-+            if (line.startsWith(QLatin1String("UNRAR"))) {
-+                //skip line with "UNRAR"
-+                nextWord(line);
-+                if (nextWord(line).left(1).toInt()==5){
-+                    isUnrarVersion5 = true;
-+                }
-+            }
-             if (line.startsWith(QLatin1String("----------"))) break;
-         }
-     }
-@@ -988,13 +996,20 @@ bool kio_krarcProtocol::initDirDict(const KUrl&url, bool forced)
-             // the rar list is ended with a ------ line.
-             if (line.startsWith(QLatin1String("----------"))) {
-                 invalidLine = !invalidLine;
-+                if (isUnrarVersion5){
-+                break;
-+                }
-+                else{
-                 continue;
-+                }
-             }
-             if (invalidLine)
-                 continue;
-             else {
-+                if (!isUnrarVersion5){
-                 temp.readLine(buf, 1000);
-                 line = line + decodeString(buf);
-+                }
-                 if (line[0] == '*') // encrypted archives starts with '*'
-                     line[0] = ' ';
-             }
-@@ -1190,23 +1205,10 @@ void kio_krarcProtocol::parseLine(int lineNo, QString line)
-         mode = parsePermString(perm);
-     }
-     if (arcType == "rar") {
--        // full name
--        fullName = nextWord(line, '\n');
--        // size
--        size = nextWord(line).toLong();
--        // ignore the next 2 fields
--        nextWord(line); nextWord(line);
--        // date & time
--        QString d = nextWord(line);
--        int year = 1900 + d.mid(6, 2).toInt();
--        if (year < 1930) year += 100;
--        QDate qdate(year, d.mid(3, 2).toInt(), d.mid(0, 2).toInt());
--        QString t = nextWord(line);
--        QTime qtime(t.mid(0, 2).toInt(), t.mid(3, 2).toInt(), 0);
--        time = QDateTime(qdate, qtime).toTime_t();
-+        if (isUnrarVersion5){
-+
-         // permissions
-         perm = nextWord(line);
--
-         if (perm.length() == 7) { // windows rar permission format
-             bool isDir  = (perm.at(1).toLower() == 'd');
-             bool isReadOnly = (perm.at(2).toLower() == 'r');
-@@ -1219,6 +1221,54 @@ void kio_krarcProtocol::parseLine(int lineNo, QString line)
- 
-         if (perm.length() != 10) perm = (perm.at(0) == 'd') ? "drwxr-xr-x" : "-rw-r--r--" ;
-         mode = parsePermString(perm);
-+        // size
-+        size = nextWord(line).toLong();
-+        // ignore the next 2 fields
-+        nextWord(line); nextWord(line);
-+        // date & time
-+        QString d = nextWord(line);
-+        int year = 1900 + d.mid(6, 2).toInt();
-+        if (year < 1930) year += 100;
-+        QDate qdate(year, d.mid(3, 2).toInt(), d.mid(0, 2).toInt());
-+        QString t = nextWord(line);
-+        QTime qtime(t.mid(0, 2).toInt(), t.mid(3, 2).toInt(), 0);
-+        time = QDateTime(qdate, qtime).toTime_t();
-+        // ignore the next 1 fields
-+        nextWord(line);
-+        fullName = nextWord(line, '\n');
-+        }
-+        else{
-+
-+            // full name
-+            fullName = nextWord(line, '\n');
-+            // size
-+            size = nextWord(line).toLong();
-+            // ignore the next 2 fields
-+            nextWord(line); nextWord(line);
-+            // date & time
-+            QString d = nextWord(line);
-+            int year = 1900 + d.mid(6, 2).toInt();
-+            if (year < 1930) year += 100;
-+            QDate qdate(year, d.mid(3, 2).toInt(), d.mid(0, 2).toInt());
-+            QString t = nextWord(line);
-+            QTime qtime(t.mid(0, 2).toInt(), t.mid(3, 2).toInt(), 0);
-+            time = QDateTime(qdate, qtime).toTime_t();
-+            // permissions
-+            perm = nextWord(line);
-+
-+            if (perm.length() == 7) { // windows rar permission format
-+                bool isDir  = (perm.at(1).toLower() == 'd');
-+                bool isReadOnly = (perm.at(2).toLower() == 'r');
-+
-+                perm = isDir ? "drwxr-xr-x" : "-rw-r--r--";
-+
-+                if (isReadOnly)
-+                    perm[ 2 ] = '-';
-+            }
-+
-+            if (perm.length() != 10) perm = (perm.at(0) == 'd') ? "drwxr-xr-x" : "-rw-r--r--" ;
-+            mode = parsePermString(perm);
-+        }
-     }
-     if (arcType == "arj") {
-         nextWord(line);
-@@ -1496,6 +1546,8 @@ bool kio_krarcProtocol::initArcParameters()
-         }
-     } else if (arcType == "rar") {
-         if (KStandardDirs::findExe("rar").isEmpty()) {
-+            //unrar output now ANSI
-+            noencoding = true;
-             cmd     = fullPathName("unrar");
-             listCmd << fullPathName("unrar") << "-c-" << "-v" << "v";
-             getCmd  << fullPathName("unrar") << "p" << "-ierr" << "-idp" << "-c-" << "-y";
-diff --git a/krArc/krarc.h b/krArc/krarc.h
-index f6119d0..b6b7505 100644
---- a/krArc/krarc.h
-+++ b/krArc/krarc.h
-@@ -96,6 +96,7 @@ private:
-     bool archiveChanging;             //< true if the archive is currently changing.
-     bool newArchiveURL;               //< true if new archive was entered for the protocol
-     bool noencoding;                   //< 7z files use UTF-16, so encoding is unnecessary
-+    bool isUnrarVersion5;             //< thue if unrar have 5th version
-     KIO::filesize_t decompressedLen;  //< the number of the decompressed bytes
-     KFileItem* arcFile;               //< the archive file item.
-     QString arcPath;                  //< the archive location

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-10-23 18:05:11 UTC (rev 193110)
+++ community-x86_64/PKGBUILD	2016-10-23 18:05:28 UTC (rev 193111)
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 149613 2012-02-08 20:20:01Z pierre $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-
-pkgname=krusader
-pkgver=2.4.0beta3
-_pkgver=2.4.0-beta3
-pkgrel=9
-pkgdesc="An alternative file manager for KDE resembling Midnight Commander"
-arch=('i686' 'x86_64')
-url="http://krusader.sourceforge.net/"
-license=('GPL')
-depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-katepart' 'kuiserver')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdebase-keditbookmarks: to edit bookmarks'
-            'kdebase-konsole: open an embedded terminal')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2"
-        "kde_bug309119.diff" "kde_bug325801.diff")
-md5sums=('62a02db3f213bb76805ca6c958e9e263'
-         '5e9952f6ac38e5ce323eb95ca6f20db6'
-         '55fd27e4888e15e8b3bd8ab08b85aa9e')
-
-prepare() {
-  cd "$srcdir/$pkgname-$_pkgver"
-
-  # fix KDE bug 309119 - "New directory" dialog: can't clear all typed text
-  patch -Np1 < "$srcdir/kde_bug309119.diff" || true
-  # fix KDE bug 32580 -  Showing contents of rar archives is broken with unrar 5.00
-  patch -Np1 < "$srcdir/kde_bug325801.diff" || true
-}
-
-build() {
-  cd "$srcdir/$pkgname-$_pkgver"
-
-  cmake . \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_pkgver"
-  make DESTDIR="$pkgdir" install
-}

Copied: krusader/repos/community-x86_64/PKGBUILD (from rev 193110, krusader/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-10-23 18:05:28 UTC (rev 193111)
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 149613 2012-02-08 20:20:01Z pierre $
+# Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+pkgname=krusader
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="Advanced twin panel (commander style) file manager for KDE"
+arch=('i686' 'x86_64')
+url="https://krusader.org/"
+license=('GPL')
+depends=('karchive' 'kbookmarks' 'kcodecs' 'kcompletion' 'kcoreaddons' 'kconfig'
+         'kdoctools' 'ki18n' 'kiconthemes' 'kitemviews' 'kio' 'knotifications'
+         'kparts' 'solid' 'ktextwidgets' 'kwallet' 'kwidgetsaddons' 'kwindowsystem'
+         'kxmlgui' 'kguiaddons' 'hicolor-icon-theme')
+makedepends=('cmake' 'extra-cmake-modules' 'python')
+source=("http://download.kde.org/stable/krusader/$pkgver/$pkgname-$pkgver.tar.xz")
+md5sums=('5074c7c8dcd7fa8c8509f472bc2e0815')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  cmake . \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-x86_64/kde_bug309119.diff
===================================================================
--- community-x86_64/kde_bug309119.diff	2016-10-23 18:05:11 UTC (rev 193110)
+++ community-x86_64/kde_bug309119.diff	2016-10-23 18:05:28 UTC (rev 193111)
@@ -1,21 +0,0 @@
-commit 5cb23ac98046a07d5db3a52b41e3a42544eb13f9
-Author: Jan Lepper <jan_lepper at gmx.de>
-Date:   Wed Jan 2 21:38:52 2013 +0100
-
-    FIXED: [ 309119 ] Wrong "New directory" dialog behavior: can't clear all typed text
-    return QValidator::Intermediate instead of Invalid when input is empty
-    BUG: 309119
-
-diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp
-index 2f696da..8935ddf 100644
---- a/krusader/Panel/panelfunc.cpp
-+++ b/krusader/Panel/panelfunc.cpp
-@@ -100,7 +100,7 @@ class FilePathValidator : public QValidator
- {
- public:
-     virtual State validate(QString &input, int &pos) const {
--        return input.isEmpty() ? Invalid : Acceptable;
-+            return input.isEmpty() ? Intermediate : Acceptable;
-     }
- };
- 

Deleted: community-x86_64/kde_bug325801.diff
===================================================================
--- community-x86_64/kde_bug325801.diff	2016-10-23 18:05:11 UTC (rev 193110)
+++ community-x86_64/kde_bug325801.diff	2016-10-23 18:05:28 UTC (rev 193111)
@@ -1,157 +0,0 @@
-commit aca6a97fc31a80b5a35ec1afbee8f45a728b8a19
-Author: Alexander Balakhnin <Croman13n3c at gmail.com>
-Date:   Sun Oct 27 19:48:38 2013 +0300
-
-    Fixing krarc support for new unrar 5
-
-diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp
-index fc52ad5..c60a1f5 100644
---- a/krArc/krarc.cpp
-+++ b/krArc/krarc.cpp
-@@ -918,7 +918,7 @@ bool kio_krarcProtocol::initDirDict(const KUrl&url, bool forced)
-     }
- 
-     extArcReady = false;
--
-+    isUnrarVersion5 = false;
-     if (!setArcFile(url))
-         return false;   /* if the archive was changed refresh the file information */
- 
-@@ -979,6 +979,14 @@ bool kio_krarcProtocol::initDirDict(const KUrl&url, bool forced)
-     if (arcType == "rar" || arcType == "arj" || arcType == "lha" || arcType == "7z") {
-         while (temp.readLine(buf, 1000) != -1) {
-             line = decodeString(buf);
-+            //detect unrar version
-+            if (line.startsWith(QLatin1String("UNRAR"))) {
-+                //skip line with "UNRAR"
-+                nextWord(line);
-+                if (nextWord(line).left(1).toInt()==5){
-+                    isUnrarVersion5 = true;
-+                }
-+            }
-             if (line.startsWith(QLatin1String("----------"))) break;
-         }
-     }
-@@ -988,13 +996,20 @@ bool kio_krarcProtocol::initDirDict(const KUrl&url, bool forced)
-             // the rar list is ended with a ------ line.
-             if (line.startsWith(QLatin1String("----------"))) {
-                 invalidLine = !invalidLine;
-+                if (isUnrarVersion5){
-+                break;
-+                }
-+                else{
-                 continue;
-+                }
-             }
-             if (invalidLine)
-                 continue;
-             else {
-+                if (!isUnrarVersion5){
-                 temp.readLine(buf, 1000);
-                 line = line + decodeString(buf);
-+                }
-                 if (line[0] == '*') // encrypted archives starts with '*'
-                     line[0] = ' ';
-             }
-@@ -1190,23 +1205,10 @@ void kio_krarcProtocol::parseLine(int lineNo, QString line)
-         mode = parsePermString(perm);
-     }
-     if (arcType == "rar") {
--        // full name
--        fullName = nextWord(line, '\n');
--        // size
--        size = nextWord(line).toLong();
--        // ignore the next 2 fields
--        nextWord(line); nextWord(line);
--        // date & time
--        QString d = nextWord(line);
--        int year = 1900 + d.mid(6, 2).toInt();
--        if (year < 1930) year += 100;
--        QDate qdate(year, d.mid(3, 2).toInt(), d.mid(0, 2).toInt());
--        QString t = nextWord(line);
--        QTime qtime(t.mid(0, 2).toInt(), t.mid(3, 2).toInt(), 0);
--        time = QDateTime(qdate, qtime).toTime_t();
-+        if (isUnrarVersion5){
-+
-         // permissions
-         perm = nextWord(line);
--
-         if (perm.length() == 7) { // windows rar permission format
-             bool isDir  = (perm.at(1).toLower() == 'd');
-             bool isReadOnly = (perm.at(2).toLower() == 'r');
-@@ -1219,6 +1221,54 @@ void kio_krarcProtocol::parseLine(int lineNo, QString line)
- 
-         if (perm.length() != 10) perm = (perm.at(0) == 'd') ? "drwxr-xr-x" : "-rw-r--r--" ;
-         mode = parsePermString(perm);
-+        // size
-+        size = nextWord(line).toLong();
-+        // ignore the next 2 fields
-+        nextWord(line); nextWord(line);
-+        // date & time
-+        QString d = nextWord(line);
-+        int year = 1900 + d.mid(6, 2).toInt();
-+        if (year < 1930) year += 100;
-+        QDate qdate(year, d.mid(3, 2).toInt(), d.mid(0, 2).toInt());
-+        QString t = nextWord(line);
-+        QTime qtime(t.mid(0, 2).toInt(), t.mid(3, 2).toInt(), 0);
-+        time = QDateTime(qdate, qtime).toTime_t();
-+        // ignore the next 1 fields
-+        nextWord(line);
-+        fullName = nextWord(line, '\n');
-+        }
-+        else{
-+
-+            // full name
-+            fullName = nextWord(line, '\n');
-+            // size
-+            size = nextWord(line).toLong();
-+            // ignore the next 2 fields
-+            nextWord(line); nextWord(line);
-+            // date & time
-+            QString d = nextWord(line);
-+            int year = 1900 + d.mid(6, 2).toInt();
-+            if (year < 1930) year += 100;
-+            QDate qdate(year, d.mid(3, 2).toInt(), d.mid(0, 2).toInt());
-+            QString t = nextWord(line);
-+            QTime qtime(t.mid(0, 2).toInt(), t.mid(3, 2).toInt(), 0);
-+            time = QDateTime(qdate, qtime).toTime_t();
-+            // permissions
-+            perm = nextWord(line);
-+
-+            if (perm.length() == 7) { // windows rar permission format
-+                bool isDir  = (perm.at(1).toLower() == 'd');
-+                bool isReadOnly = (perm.at(2).toLower() == 'r');
-+
-+                perm = isDir ? "drwxr-xr-x" : "-rw-r--r--";
-+
-+                if (isReadOnly)
-+                    perm[ 2 ] = '-';
-+            }
-+
-+            if (perm.length() != 10) perm = (perm.at(0) == 'd') ? "drwxr-xr-x" : "-rw-r--r--" ;
-+            mode = parsePermString(perm);
-+        }
-     }
-     if (arcType == "arj") {
-         nextWord(line);
-@@ -1496,6 +1546,8 @@ bool kio_krarcProtocol::initArcParameters()
-         }
-     } else if (arcType == "rar") {
-         if (KStandardDirs::findExe("rar").isEmpty()) {
-+            //unrar output now ANSI
-+            noencoding = true;
-             cmd     = fullPathName("unrar");
-             listCmd << fullPathName("unrar") << "-c-" << "-v" << "v";
-             getCmd  << fullPathName("unrar") << "p" << "-ierr" << "-idp" << "-c-" << "-y";
-diff --git a/krArc/krarc.h b/krArc/krarc.h
-index f6119d0..b6b7505 100644
---- a/krArc/krarc.h
-+++ b/krArc/krarc.h
-@@ -96,6 +96,7 @@ private:
-     bool archiveChanging;             //< true if the archive is currently changing.
-     bool newArchiveURL;               //< true if new archive was entered for the protocol
-     bool noencoding;                   //< 7z files use UTF-16, so encoding is unnecessary
-+    bool isUnrarVersion5;             //< thue if unrar have 5th version
-     KIO::filesize_t decompressedLen;  //< the number of the decompressed bytes
-     KFileItem* arcFile;               //< the archive file item.
-     QString arcPath;                  //< the archive location



More information about the arch-commits mailing list