Added patch to allow browsing archive files (see #170335)

Package-Manager: portage-2.1.2.1-r1

diff --git a/kde-misc/dolphin/ChangeLog b/kde-misc/dolphin/ChangeLog
index 2775d649843d06ae8f6537e8a0094d58d163a524..715a71e9b68fbc1d08c01a6646922c5d909b7734 100644 (file)
--- a/kde-misc/dolphin/ChangeLog
+++ b/kde-misc/dolphin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/dolphin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/dolphin/ChangeLog,v 1.9 2007/03/01 01:42:07 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/dolphin/ChangeLog,v 1.10 2007/03/10 23:22:09 troll Exp $
+
+*dolphin-0.8.2-r1 (10 Mar 2007)
+
+  10 Mar 2007; Przemysław Maciąg <troll@gentoo.org>
+  +files/dolphin-0.8.2-tarZip-handlers.patch, +dolphin-0.8.2-r1.ebuild:
+  Added patch to allow browsing archive files (zip and various tar). Patch
+  provided by Filip Brcic (#170335).
 
 *dolphin-0.8.2 (01 Mar 2007)
 

diff --git a/kde-misc/dolphin/Manifest b/kde-misc/dolphin/Manifest
index ed7c518bd087b574c8c6b524135cdc25ca3e1c1d..3e5dc622b6c97ac4a8e08b813c6f34fa533ba813 100644 (file)
--- a/kde-misc/dolphin/Manifest
+++ b/kde-misc/dolphin/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX dolphin-0.8.2-tarZip-handlers.patch 2890 RMD160 a24f63a56301d77296e86fd169ae54de636d8cda SHA1 d5ef2b0593d154b2b63078d09c4b1ac9bd558fc8 SHA256 372045757842bd9f0dc4e708810176016fcae11c03c4ed12385670c0727945cc
+MD5 26a3b74f107d5a614cc7a2b1384a6012 files/dolphin-0.8.2-tarZip-handlers.patch 2890
+RMD160 a24f63a56301d77296e86fd169ae54de636d8cda files/dolphin-0.8.2-tarZip-handlers.patch 2890
+SHA256 372045757842bd9f0dc4e708810176016fcae11c03c4ed12385670c0727945cc files/dolphin-0.8.2-tarZip-handlers.patch 2890
 DIST dolphin-0.8.1.tar.gz 1848620 RMD160 2c3adbfe291f2456b160b0e93040b86571055365 SHA1 4f015290bd3592fcdb5f62aa6162ed0cdddbb105 SHA256 a7b60fe7dbab9c0fb1cc974ec2297942d05227883e43339191e67b7c444faa69
 DIST dolphin-0.8.2.tar.gz 1842748 RMD160 9af44361215caa48940395e0e720cd96be71fec6 SHA1 d477b3e67eda7d692427c5de0d440216aa5a007d SHA256 fcda66ed150c9a67be36501937249f2ab02d7633549d95b15b19432642795062
 EBUILD dolphin-0.8.1.ebuild 498 RMD160 151cbb78a84bfaf933c8686ae38d4d9ba284bd17 SHA1 d0cfba03e03ba62a831a97af20ff46f31bd11571 SHA256 4706cf79b825017f8d922dfb9f29ed852562cb0d49f50f5b273d327f57256a50
 MD5 d39a168b9f4d597641087c7d490e14d8 dolphin-0.8.1.ebuild 498
 RMD160 151cbb78a84bfaf933c8686ae38d4d9ba284bd17 dolphin-0.8.1.ebuild 498
 SHA256 4706cf79b825017f8d922dfb9f29ed852562cb0d49f50f5b273d327f57256a50 dolphin-0.8.1.ebuild 498
+EBUILD dolphin-0.8.2-r1.ebuild 547 RMD160 fca9f50bc9737cc58fa0b5a733c98bdbfd55c7f0 SHA1 6efa6ba852ab6f0b55d24ca69c994b314ee6c6c0 SHA256 59587db828c8720fde3abf451e926489d91b490d0950014b910e2dcfb2f64bc9
+MD5 1cca44bdbf3a94c2775d6431c1711d74 dolphin-0.8.2-r1.ebuild 547
+RMD160 fca9f50bc9737cc58fa0b5a733c98bdbfd55c7f0 dolphin-0.8.2-r1.ebuild 547
+SHA256 59587db828c8720fde3abf451e926489d91b490d0950014b910e2dcfb2f64bc9 dolphin-0.8.2-r1.ebuild 547
 EBUILD dolphin-0.8.2.ebuild 494 RMD160 1804a257c49a913af04f849a948d7d913ee1e132 SHA1 65f0c6b50f9bbc55f7108b672f9a71786f151102 SHA256 93672ba691284e75f09d03fb363958d2862226bd62293b0f0187a5a96a9a265d
 MD5 daeb5b50f8f78ab7d72923ead71d09e4 dolphin-0.8.2.ebuild 494
 RMD160 1804a257c49a913af04f849a948d7d913ee1e132 dolphin-0.8.2.ebuild 494
 SHA256 93672ba691284e75f09d03fb363958d2862226bd62293b0f0187a5a96a9a265d dolphin-0.8.2.ebuild 494
-MISC ChangeLog 1433 RMD160 c1e98ad51247db4992a1dc492c489eabd4ecf23c SHA1 c65b34a72707036c01832ec12ff89220e3f5bd96 SHA256 b8414f55e8d45f2d53e369142b18284c99a909cdda18b2c6218800d16ebeb5f3
-MD5 4f88fbcd89294aad61be40b37f7a2c31 ChangeLog 1433
-RMD160 c1e98ad51247db4992a1dc492c489eabd4ecf23c ChangeLog 1433
-SHA256 b8414f55e8d45f2d53e369142b18284c99a909cdda18b2c6218800d16ebeb5f3 ChangeLog 1433
+MISC ChangeLog 1706 RMD160 dcf8c5d3c4c25347cc2a10c4d99054bb04598bc2 SHA1 be76bade6cbaab6e28675796f651989b80d73f1e SHA256 ae93e1ef4458b37e9caebc0b9468ffc6af4f2b2a9fa22dbaf9c3ce677c63ce66
+MD5 020b8d6755b23c7d87f26def817d5ac1 ChangeLog 1706
+RMD160 dcf8c5d3c4c25347cc2a10c4d99054bb04598bc2 ChangeLog 1706
+SHA256 ae93e1ef4458b37e9caebc0b9468ffc6af4f2b2a9fa22dbaf9c3ce677c63ce66 ChangeLog 1706
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -25,10 +33,13 @@ SHA256 a6bad1de48f944dadf241af42bd309b9be3cb9b860425151ec0426acbde251f8 files/di
 MD5 e66fa2ae35f5c72b35fcef7b0f9998bf files/digest-dolphin-0.8.2 244
 RMD160 1027a638f60bf81199ac802940fe863389c86b75 files/digest-dolphin-0.8.2 244
 SHA256 461bcd5478322d5ade713df51d0bdd0635ce1d7293d2ccc7bfe156cc2acd74ec files/digest-dolphin-0.8.2 244
+MD5 e66fa2ae35f5c72b35fcef7b0f9998bf files/digest-dolphin-0.8.2-r1 244
+RMD160 1027a638f60bf81199ac802940fe863389c86b75 files/digest-dolphin-0.8.2-r1 244
+SHA256 461bcd5478322d5ade713df51d0bdd0635ce1d7293d2ccc7bfe156cc2acd74ec files/digest-dolphin-0.8.2-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF5jIaexDpKttj3ykRAqpCAJwMTOJAOmJvKyx/5GgsJIUwvmjj6QCfc3kw
-nDdX7WmLL8fQ3jDnF0EpQDo=
-=cuHs
+iD8DBQFF80DpexDpKttj3ykRAj3gAJ9l3zdhJYeMK2r8w3dG/321JfKnNgCfT5oz
+ubF818L7AdPRk2DDdmh3O98=
+=Xgcq
 -----END PGP SIGNATURE-----

diff --git a/kde-misc/dolphin/dolphin-0.8.2-r1.ebuild b/kde-misc/dolphin/dolphin-0.8.2-r1.ebuild
new file mode 100644 (file)
index 0000000..7efda59
--- /dev/null
+++ b/kde-misc/dolphin/dolphin-0.8.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/dolphin/dolphin-0.8.2-r1.ebuild,v 1.1 2007/03/10 23:22:09 troll Exp $
+
+inherit kde
+
+DESCRIPTION="A file manager for KDE focusing on usability."
+HOMEPAGE="http://enzosworld.gmxhome.de/"
+SRC_URI="http://enzosworld.gmxhome.de/download/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="kdeenablefinal"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-tarZip-handlers.patch"

diff --git a/kde-misc/dolphin/files/digest-dolphin-0.8.2-r1 b/kde-misc/dolphin/files/digest-dolphin-0.8.2-r1
new file mode 100644 (file)
index 0000000..3a147cc
--- /dev/null
+++ b/kde-misc/dolphin/files/digest-dolphin-0.8.2-r1
@@ -0,0 +1,3 @@
+MD5 376f7a1deca0f4d69fa96a393cea464b dolphin-0.8.2.tar.gz 1842748
+RMD160 9af44361215caa48940395e0e720cd96be71fec6 dolphin-0.8.2.tar.gz 1842748
+SHA256 fcda66ed150c9a67be36501937249f2ab02d7633549d95b15b19432642795062 dolphin-0.8.2.tar.gz 1842748

diff --git a/kde-misc/dolphin/files/dolphin-0.8.2-tarZip-handlers.patch b/kde-misc/dolphin/files/dolphin-0.8.2-tarZip-handlers.patch
new file mode 100644 (file)
index 0000000..c4861aa
--- /dev/null
+++ b/kde-misc/dolphin/files/dolphin-0.8.2-tarZip-handlers.patch
@@ -0,0 +1,103 @@
+diff -Naur dolphin-0.8.2-orig/src/dolphinview.cpp dolphin-0.8.2-new/src/dolphinview.cpp
+--- dolphin-0.8.2-orig/src/dolphinview.cpp     2006-12-09 00:00:24.000000000 +0100
++++ dolphin-0.8.2-new/src/dolphinview.cpp      2007-03-10 23:25:15.000000000 +0100
+@@ -705,6 +705,27 @@
+             setURL(KURL(localPath));
+         }
+     }
++    else if (fileItem->isFile()) {
++      // allow to browse through ZIP and tar files
++      KMimeType::Ptr mime = fileItem->mimeTypePtr();
++      if (mime->is("application/x-zip")) {
++          KURL url = fileItem->url();
++          url.setProtocol("zip");
++          setURL(url);
++      }
++      else if (mime->is("application/x-tar") ||
++               mime->is("application/x-tarz") ||
++               mime->is("application/x-tbz") ||
++               mime->is("application/x-tgz") ||
++               mime->is("application/x-tzo")) {
++          KURL url = fileItem->url();
++          url.setProtocol("tar");
++          setURL(url);
++      }
++      else {
++          fileItem->run();
++      }
++    }
+     else {
+         fileItem->run();
+     }
+diff -Naur dolphin-0.8.2-orig/src/urlnavigator.cpp dolphin-0.8.2-new/src/urlnavigator.cpp
+--- dolphin-0.8.2-orig/src/urlnavigator.cpp    2006-11-01 00:07:08.000000000 +0100
++++ dolphin-0.8.2-new/src/urlnavigator.cpp     2007-03-10 23:25:03.000000000 +0100
+@@ -116,6 +116,68 @@
+ void URLNavigator::setURL(const KURL& url)
+ {
+     QString urlStr(url.prettyURL());
++
++    if (url.protocol() == "zip") {
++      bool stillInside = false;
++      if (KMimeType::findByPath(url.url(-1))
++          ->is("application/x-zip")) {
++          stillInside = true;
++      }
++      else {
++          KURL url1 = url.upURL();
++          while (url1 != url1.upURL()) {
++              if (KMimeType::findByPath(url1.url(-1))
++                  ->is("application/x-zip")) {
++                  stillInside = true;
++                  break;
++              }
++              url1 = url1.upURL();
++          }
++      }
++      if (!stillInside)
++      {
++          // Drop the zip:/ protocol since we are not in the zip anymore
++          urlStr = url.path();
++      }
++    }
++    else if (url.protocol() == "tar")
++    {
++      bool stillInside = false;
++      KMimeType::Ptr kmp = 
++          KMimeType::findByPath(url.url(-1));
++      if (kmp->is("application/x-tar") ||
++          kmp->is("application/x-tarz") ||
++          kmp->is("application/x-tbz") || 
++          kmp->is("application/x-tgz") || 
++          kmp->is("application/x-tzo")
++          ) {
++          stillInside = true;
++      }
++      else {
++          KURL url1 = url.upURL();
++          while (url1 != url1.upURL()) {
++              KMimeType::Ptr kmp =
++                  KMimeType::findByPath(url1.url(-1));
++              if (kmp->is("application/x-tar") ||
++                  kmp->is("application/x-tarz") ||
++                  kmp->is("application/x-tbz") || 
++                  kmp->is("application/x-tgz") || 
++                  kmp->is("application/x-tzo")
++                  ) {
++                  stillInside = true;
++                  break;
++              }
++              url1 = url1.upURL();
++          }
++      }
++      if (!stillInside)
++      {
++          // Drop the tar:/ protocol since we are not in the tar anymore
++          urlStr = url.path();
++      }
++    }
++
++
+     if (urlStr.at(0) == '~') {
+         // replace '~' by the home directory
+         urlStr.remove(0, 1);