Fix crash in Konqueror Ark plugin, KDE bug #113585.

Package-Manager: portage-2.0.54

5 files changed, 287 insertions, 30 deletions

diff --git a/kde-base/konq-plugins/ChangeLog b/kde-base/konq-plugins/ChangeLog
index fe3952926764..0e55d62c6258 100644
--- a/kde-base/konq-plugins/ChangeLog
+++ b/kde-base/konq-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/konq-plugins
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.39 2006/03/28 00:25:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.40 2006/04/03 13:47:44 carlo Exp $
+
+*konq-plugins-3.5.2-r1 (03 Apr 2006)
+
+  03 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/konq-plugins-3.5.2-arkplugin-crash-fix.diff,
+  +konq-plugins-3.5.2-r1.ebuild:
+  Fix crash in Konqueror Ark plugin, KDE bug #113585.
 
   28 Mar 2006; Aron Griffis <agriffis@gentoo.org> konq-plugins-3.5.0.ebuild,
   konq-plugins-3.5.1.ebuild, konq-plugins-3.5.2.ebuild:
diff --git a/kde-base/konq-plugins/Manifest b/kde-base/konq-plugins/Manifest
index 36bd4ee621f7..18f1d16471e5 100644
--- a/kde-base/konq-plugins/Manifest
+++ b/kde-base/konq-plugins/Manifest
@@ -1,42 +1,17 @@
-MD5 04710882ca1040a2adda51af59429923 ChangeLog 5628
-RMD160 83c1cfca9c4eae9ce2822336641a0cfd4f493f28 ChangeLog 5628
-SHA256 3296cf08d44c51f7b998570eead34ff8a32b2906ac2357f487590958766272fe ChangeLog 5628
+MD5 397c89d8a87eb1041df7798e5635de67 ChangeLog 5857
 MD5 60c005ebe876a0e127dcf1083620803e files/digest-konq-plugins-3.4.1 215
-RMD160 d7f34f43e468cb2e4d7935d3c0cb7b9b9ada730b files/digest-konq-plugins-3.4.1 215
-SHA256 b84fe2088931cc38a26102f7f2482756d5286bd5ee2c8c28754b0b0c321112cd files/digest-konq-plugins-3.4.1 215
 MD5 aef1ad04d3f153a78e0b5aa9742d6f9e files/digest-konq-plugins-3.4.2 291
-RMD160 82a7f55a1506e3dc4110b3f257b0de264bbe92e0 files/digest-konq-plugins-3.4.2 291
-SHA256 e1b286fd0afe6a640380070ffecffba03ddabf4abf2b2d59cb3c786922a54a6c files/digest-konq-plugins-3.4.2 291
 MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-konq-plugins-3.4.3 69
-RMD160 d32846177c0fadbb5676684fa4305a4d5633b08c files/digest-konq-plugins-3.4.3 69
-SHA256 5702f1f85638e9ae3dc7bdb8ff199d24c1ec45e26c0bf11173f5ffcb511d87b6 files/digest-konq-plugins-3.4.3 69
 MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-konq-plugins-3.5.0 69
-RMD160 0164d196326aefb745349bcb00fbd76f7ebec91e files/digest-konq-plugins-3.5.0 69
-SHA256 8e45028302905bbaac9162413455f1c7ccd116a0e1739b405a3943760dbf44b3 files/digest-konq-plugins-3.5.0 69
 MD5 2d970f21c7a6a6abbc56363e2e55d22e files/digest-konq-plugins-3.5.1 69
-RMD160 50e81904eea9dcd267fa9c58b374f47400b9d77f files/digest-konq-plugins-3.5.1 69
-SHA256 052ea58f6743374ee15c6843ac3882611b26a1f8aa710c93c258fab87473dd44 files/digest-konq-plugins-3.5.1 69
 MD5 191f6bee80885d21495b154d0b9b84fa files/digest-konq-plugins-3.5.2 253
-RMD160 7ceef00c96f7c9306805433a9ea566dafc129421 files/digest-konq-plugins-3.5.2 253
-SHA256 f5eb118862fc6790d69ceb8771ddb6feb108003b6c8147c31412bea7a36b4d8b files/digest-konq-plugins-3.5.2 253
+MD5 f7027a49231b57508788c4b6843e4091 files/digest-konq-plugins-3.5.2-r1 69
+MD5 b11067e88ee43ae4d8e2c5c71ef0b76f files/konq-plugins-3.5.2-arkplugin-crash-fix.diff 8388
 MD5 c92307aa366e79b8743fd96262ae8f01 konq-plugins-3.4.1.ebuild 657
-RMD160 e282b2c31457d72e73818bd590b8e25ea13654c9 konq-plugins-3.4.1.ebuild 657
-SHA256 103af725ccd7e14dba5b0688a6a80ea15b39fe8e019afe0af772dab45fdc9e3c konq-plugins-3.4.1.ebuild 657
 MD5 0216edfe2fd1617b1dac5b8bd42668ff konq-plugins-3.4.2.ebuild 672
-RMD160 366c4333e41def8011c58a1e1343b3c628e75591 konq-plugins-3.4.2.ebuild 672
-SHA256 5880af94362220244f6c5cdf6aa768bad38d2e1669916f55a6b1381415422704 konq-plugins-3.4.2.ebuild 672
 MD5 8aa6853ba0dd1c1a6784610a2f70f9f2 konq-plugins-3.4.3.ebuild 673
-RMD160 4ab2d409c9e969a5c40cb108ae199469df6e8f63 konq-plugins-3.4.3.ebuild 673
-SHA256 71fa5d7b304625ea2390a2dba69f86b4b59a7270de8190a74d5642be7c6abc7f konq-plugins-3.4.3.ebuild 673
 MD5 8c9ed68bd7581e8bdb7f26fecd9cf7be konq-plugins-3.5.0.ebuild 697
-RMD160 aa3f4d97f91cb97ffee1abde5106a2e446cccab3 konq-plugins-3.5.0.ebuild 697
-SHA256 7620f6d4155b9833509c5c49c972cd2acbbc9a930d35f36be00228b26683c44e konq-plugins-3.5.0.ebuild 697
 MD5 be853b47a55037f7b14074fc42760d74 konq-plugins-3.5.1.ebuild 699
-RMD160 ae82320db793bb42e99642a5929dafb1d186f254 konq-plugins-3.5.1.ebuild 699
-SHA256 d0ae109c53e13226a698f26874271f24c10b8f0ca5440f54961ad8999fe903a9 konq-plugins-3.5.1.ebuild 699
+MD5 ff548f1a33a150cfe8c3b537c7edff27 konq-plugins-3.5.2-r1.ebuild 764
 MD5 ab7072dd66b3aac1123df57b5cb8e4ec konq-plugins-3.5.2.ebuild 697
-RMD160 b935c6548f74b6fb01a2669f1871011a4943a806 konq-plugins-3.5.2.ebuild 697
-SHA256 f32a25b555a866024793c2c95608e5e7dea3c3b1553f77c7cbc3ed1a2c8cc72f konq-plugins-3.5.2.ebuild 697
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/konq-plugins/files/digest-konq-plugins-3.5.2-r1 b/kde-base/konq-plugins/files/digest-konq-plugins-3.5.2-r1
new file mode 100644
index 000000000000..16e22f5f016a
--- /dev/null
+++ b/kde-base/konq-plugins/files/digest-konq-plugins-3.5.2-r1
@@ -0,0 +1 @@
+MD5 affb74174c6e3eda2c0748d6c052c8ff kdeaddons-3.5.2.tar.bz2 1640284
diff --git a/kde-base/konq-plugins/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff b/kde-base/konq-plugins/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
new file mode 100644
index 000000000000..ed846c8ee850
--- /dev/null
+++ b/kde-base/konq-plugins/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
@@ -0,0 +1,253 @@
+--- kdeaddons/konq-plugins/arkplugin/arkplugin.cpp	2006/03/12 01:18:18	517743
++++ kdeaddons/konq-plugins/arkplugin/arkplugin.cpp	2006/04/01 23:42:40	525413
+@@ -58,10 +58,15 @@
+     KGlobal::locale()->insertCatalogue("ark_plugin");
+ 
+     extMimeTypes();
+-    m_list = popupmenu->fileItemList();
++    KFileItemList itemList = popupmenu->fileItemList();
++    for ( KFileItem *item = itemList.first(); item; item = itemList.next() )
++    {
++        m_urlList.append( item->url() );
++        m_urlStringList.append( item->url().url() );
++    }
+     m_dir = popupmenu->url().url() + "/";
+-    unsigned int itemCount = m_list.count();
+-    KFileItemListIterator it( m_list );
++    unsigned int itemCount = m_urlList.count();
++    KFileItemListIterator it( itemList );
+     KFileItem * item;
+     bool hasArchives = false;
+     bool hasOther = false;
+@@ -84,15 +89,15 @@
+     QString ext;
+     KActionMenu * actionMenu;
+     KAction * action;
+-    if ( hasOther &&  m_list.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
++    if ( hasOther &&  itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
+     {
+         compMimeTypes();
+         actionMenu = new KActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu"  );
+         m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" );
+         if ( itemCount == 1 )
+         {
+-            item = m_list.first();
+-            m_name = m_list.first()->name();
++            item = itemList.first();
++            m_name = itemList.first()->name();
+             action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
+                                     SLOT( slotCompressAsDefault() ), actionCollection() );
+         }
+@@ -109,7 +114,7 @@
+ 
+ 
+         m_addToMenu = new KActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
+-        if ( m_list.first()->url().isLocalFile() )
++        if ( itemList.first()->url().isLocalFile() )
+             actionMenu->insert( m_addToMenu );
+ 
+         connect( m_compAsMenu->popupMenu(), SIGNAL( aboutToShow() ),
+@@ -136,7 +141,7 @@
+             // stolen from arkwidget.cpp
+             if ( itemCount == 1 )
+             {
+-                QString targetName = m_list.first()->name();
++                QString targetName = itemList.first()->name();
+                 stripExtension( targetName );
+                 action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
+                                         SLOT( slotExtractToSubfolders() ), actionCollection() );
+@@ -187,7 +192,7 @@
+         (*eit).remove( '*' );
+         if ( *eit == ".tar.bz" )                   // tbz mimetype, has tar.bz as first entry :}
+             *eit = ".tar.bz2";
+-        if ( m_list.count() == 1 )
++        if ( m_urlList.count() == 1 )
+         {
+             action = new KAction( m_name + (*eit), 0, m_compAsMapper,
+                     SLOT( map() ), actionCollection() );
+@@ -231,7 +236,7 @@
+     QCString actionName;
+     QStringList::Iterator mit;
+     KURL archive;
+-    QDir dir( m_list.first()->url().directory() );
++    QDir dir( m_urlList.first().directory() );
+     QStringList entries = dir.entryList();
+     QStringList::Iterator uit = entries.begin();
+     for ( ; uit != entries.end(); ++uit )
+@@ -254,7 +259,7 @@
+ 
+ void ArkMenu::compMimeTypes()
+ {
+-    unsigned int itemCount = m_list.count();
++    unsigned int itemCount = m_urlList.count();
+ 
+     bool havegz = false;
+     if ( !KStandardDirs::findExe( "gzip" ).isNull() && m_conf->readBoolEntry( "UseGz", true ) )
+@@ -401,14 +406,8 @@
+     QCString name;
+     QString extension, mimeType;
+     KURL target;
+-    KFileItemListIterator it( m_list );
+-    KFileItem * item;
+-    QStringList filelist;
+-    while (  ( item = it.current() ) != 0 )
+-    {
+-         ++it;
+-         filelist.append( item->url().url() );
+-    }
++    QStringList filelist( m_urlStringList );
++
+     //if KMimeType returns .ZIP or .RAR. convert them to lowercase
+     if ( m_extensionList[ pos ].contains ( ".ZIP" ) )
+          m_extensionList[ pos ] = ".zip";
+@@ -458,17 +457,10 @@
+ 
+ void ArkMenu::slotCompressAsDefault()
+ {
+-    KFileItemListIterator it( m_list );
+-    KFileItem * item;
+     KURL name;
+-    QStringList filelist;
+-    while (  ( item = it.current() ) != 0 )
+-    {
+-         ++it;
+-         filelist.append( item->url().url() );
+-    }
+-    if ( filelist.count() == 1)
+-         name = filelist.first() + m_ext;
++
++    if ( m_urlStringList.count() == 1)
++         name = m_urlStringList.first() + m_ext;
+     else
+     {
+         name = m_dir + i18n("Archive") + m_ext;
+@@ -479,7 +471,7 @@
+             i++;
+         }
+     }
+-    compressAs( filelist, name );
++    compressAs( m_urlStringList, name );
+ }
+ 
+ // make work for URLs
+@@ -494,16 +486,10 @@
+ 
+ void ArkMenu::slotAddTo( int pos )
+ {
+-    QStringList args;
+-    args << "--add-to";
+-    KFileItemListIterator it( m_list );
+-    KFileItem * item;
+-    while (  ( item = it.current() ) != 0 )
+-    {
+-        ++it;
+-        args << item->url().url();
+-    }
+-    KURL archive( m_list.first()->url() );
++    QStringList args( m_urlStringList );
++    args.prepend( "--add-to" );
++
++    KURL archive( m_urlStringList.first() );
+     archive.setPath( archive.directory( false ) );
+     archive.setFileName( m_archiveList[ pos ].fileName() );
+ 
+@@ -513,63 +499,53 @@
+ 
+ void ArkMenu::slotAdd()
+ {
+-    QStringList args;
+-    args << "--add";
+-    KFileItemListIterator it( m_list );
+-    KFileItem * item;
+-    while (  ( item = it.current() ) != 0 )
+-    {
+-        ++it;
+-        args << item->url().url();
+-    }
++    QStringList args( m_urlStringList );
++    args.prepend( "--add" );
++
+     kapp->kdeinitExec( "ark", args );
+ }
+ 
+ void ArkMenu::slotExtractHere()
+ {
+-    QStringList args;
+-    KFileItemListIterator it( m_list );
+-    KFileItem * item;
+-    while (  ( item = it.current() ) != 0 )
++    for ( QValueList<KURL>::ConstIterator it = m_urlList.constBegin();
++          it != m_urlList.constEnd();
++          ++it )
+     {
+-        args.clear();
+-        ++it;
+-        KURL targetDirectory = item->url();
++        QStringList args;
++        KURL targetDirectory = ( *it ).url();
+         targetDirectory.setPath( targetDirectory.directory() );
+-        args << "--extract-to"  << targetDirectory.url() << item->url().url();
++        args << "--extract-to"  << targetDirectory.url() << ( *it ).url();
+         kapp->kdeinitExec( "ark", args );
+     }
+ }
+ 
+ void ArkMenu::slotExtractToSubfolders()
+ {
+-    QStringList args;
+-    QString dirName;
+-    KURL targetDir;
+-    KFileItemListIterator it( m_list );
+-    KFileItem * item;
+-    while (  ( item = it.current() ) != 0 )
+-    {
+-        args.clear();
+-        ++it;
+-        targetDir = item->url();
++    for ( QStringList::ConstIterator it = m_urlStringList.constBegin();
++          it != m_urlStringList.constEnd();
++          ++it )
++    {
++        KURL targetDir;
++        QString dirName;
++        QStringList args;
++
++        targetDir = *it;
+         dirName = targetDir.path();
+         stripExtension( dirName );
+         targetDir.setPath( dirName );
+-        args << "--extract-to"  << targetDir.url() << item->url().url();
++        args << "--extract-to"  << targetDir.url() << *it;
+         kapp->kdeinitExec( "ark", args );
+     }
+ }
+ 
+ void ArkMenu::slotExtractTo()
+ {
+-    QStringList args;
+-    KFileItemListIterator it( m_list );
+-    KFileItem * item;
+-    while (  ( item = it.current() ) != 0 )
++    for ( QStringList::ConstIterator it = m_urlStringList.constBegin();
++          it != m_urlStringList.constEnd();
++          ++it )
+     {
+-        ++it;
+-        args << "--extract"  << item->url().url();
++        QStringList args;
++        args << "--extract" << *it;
+         kapp->kdeinitExec( "ark", args );
+     }
+ }
+--- kdeaddons/konq-plugins/arkplugin/arkplugin.h	2005/09/29 14:33:08	465369
++++ kdeaddons/konq-plugins/arkplugin/arkplugin.h	2006/04/01 23:42:40	525413
+@@ -54,7 +54,8 @@
+ 
+ private:
+     QString m_name, m_ext;
+-    KFileItemList m_list;
++    QValueList<KURL> m_urlList;
++    QStringList m_urlStringList;
+     KURL::List m_archiveList;
+     QStringList m_archiveMimeTypes;
+     QStringList m_extractMimeTypes;
diff --git a/kde-base/konq-plugins/konq-plugins-3.5.2-r1.ebuild b/kde-base/konq-plugins/konq-plugins-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..ecbe33e40931
--- /dev/null
+++ b/kde-base/konq-plugins/konq-plugins-3.5.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5.2-r1.ebuild,v 1.1 2006/04/03 13:47:45 carlo Exp $
+KMNAME=kdeaddons
+KMNODOCS=true
+MAXKDEVER=$PV
+inherit kde-meta
+
+DESCRIPTION="Various plugins for Konqueror."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)
+	!kde-misc/metabar"
+RDEPEND="${DEPEND}
+$(deprange $PV $MAXKDEVER kde-base/kdeaddons-docs-konq-plugins)"
+
+# Don't install the akregator plugin, since it depends on akregator, which is
+# a heavy dep.
+KMEXTRACTONLY="konq-plugins/akregator"
+
+PATCHES="${FILESDIR}/konq-plugins-3.5.2-arkplugin-crash-fix.diff"
\ No newline at end of file