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

(Portage version: 2.0.54)

5 files changed, 306 insertions, 40 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 31edd65e8d84..e2c3034491a7 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.159 2006/03/25 19:32:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.160 2006/04/03 13:45:00 carlo Exp $
+
+*kdeaddons-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,
+  +kdeaddons-3.5.2-r1.ebuild:
+  Fix crash in Konqueror Ark plugin, KDE bug #113585.
 
 *kdeaddons-3.5.2 (25 Mar 2006)
 
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index de066c33de16..cd16e3e823b1 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,57 +1,22 @@
-MD5 8a078c642fc2c50314dfb137690d2ddc ChangeLog 20414
-RMD160 474b37ca3ad488631d58b04d74349ce306d94780 ChangeLog 20414
-SHA256 f1b38d08f1ad6c6d6fa5479d7a75783240cabe59e882f7405f49a9fb982f4ecc ChangeLog 20414
+MD5 9a0ced0cdf683bff1dbddac8a95e5b99 ChangeLog 20637
 MD5 f510fb4a423935c458f3e01d994b5bd2 files/digest-kdeaddons-3.3.2 69
-RMD160 c518f1930778e8a6154e133a32c9bd7b944738fb files/digest-kdeaddons-3.3.2 69
-SHA256 2730b6b69c8750679d8c29fc0cef3c4d40dacbba02bcabec55ab6a2e6eeddd95 files/digest-kdeaddons-3.3.2 69
 MD5 b222a3f919d71f11915038fe18b0a7d7 files/digest-kdeaddons-3.4.1 69
-RMD160 e8820cff024988e22be25ec73ac7c71b961017d1 files/digest-kdeaddons-3.4.1 69
-SHA256 088ba032db131b0f7a6a5d79497635fa65e625851f2f50ed3b4f19d2b9403c66 files/digest-kdeaddons-3.4.1 69
 MD5 bed9e2e46d8e7de37c5996e1ad3025bd files/digest-kdeaddons-3.4.2 69
-RMD160 ba9629b5ba9f7af05db58b160d9f936b3ddf6e54 files/digest-kdeaddons-3.4.2 69
-SHA256 287b6775d8c4e2b99633df34d9831c3f76486ead756f5cdb303ed77f7f9b2d32 files/digest-kdeaddons-3.4.2 69
 MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-kdeaddons-3.4.3 69
-RMD160 d32846177c0fadbb5676684fa4305a4d5633b08c files/digest-kdeaddons-3.4.3 69
-SHA256 5702f1f85638e9ae3dc7bdb8ff199d24c1ec45e26c0bf11173f5ffcb511d87b6 files/digest-kdeaddons-3.4.3 69
 MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-kdeaddons-3.5.0 69
-RMD160 0164d196326aefb745349bcb00fbd76f7ebec91e files/digest-kdeaddons-3.5.0 69
-SHA256 8e45028302905bbaac9162413455f1c7ccd116a0e1739b405a3943760dbf44b3 files/digest-kdeaddons-3.5.0 69
 MD5 2d970f21c7a6a6abbc56363e2e55d22e files/digest-kdeaddons-3.5.1 69
-RMD160 50e81904eea9dcd267fa9c58b374f47400b9d77f files/digest-kdeaddons-3.5.1 69
-SHA256 052ea58f6743374ee15c6843ac3882611b26a1f8aa710c93c258fab87473dd44 files/digest-kdeaddons-3.5.1 69
 MD5 191f6bee80885d21495b154d0b9b84fa files/digest-kdeaddons-3.5.2 253
-RMD160 7ceef00c96f7c9306805433a9ea566dafc129421 files/digest-kdeaddons-3.5.2 253
-SHA256 f5eb118862fc6790d69ceb8771ddb6feb108003b6c8147c31412bea7a36b4d8b files/digest-kdeaddons-3.5.2 253
+MD5 f7027a49231b57508788c4b6843e4091 files/digest-kdeaddons-3.5.2-r1 69
 MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
-RMD160 ec733ed4c266f4909ce584d49ea120def0adc191 files/kdeaddons-3.2.0-kvim.diff 363
-SHA256 d009e26c93b517470d1e2ccdcc04972cf3deb3aa3ac0fcdb4379d48e4d2aa885 files/kdeaddons-3.2.0-kvim.diff 363
 MD5 76a1c9bb2b631b0233e79ed5ab7eb20e files/kdeaddons-3.4-configure.patch 3422
-RMD160 5e67950bf392fcf3870d211abb6cb0177a94ed7a files/kdeaddons-3.4-configure.patch 3422
-SHA256 8fbed7fb602a3d27185d03b480d13397469c07fce3374fbec0a19474266578bc files/kdeaddons-3.4-configure.patch 3422
+MD5 b11067e88ee43ae4d8e2c5c71ef0b76f files/konq-plugins-3.5.2-arkplugin-crash-fix.diff 8388
 MD5 6ec5a8a3f0f5ae85d431525c926c27fe files/noatun-oblique-db-location-3.4.0.diff 625
-RMD160 4f448fd3e34a0f4c4feb2f4d41a9396fe61019fe files/noatun-oblique-db-location-3.4.0.diff 625
-SHA256 58e7b324264a0253599d1ef917026d86e3b4bef70d087c8d2becddfeb587c00f files/noatun-oblique-db-location-3.4.0.diff 625
 MD5 3a692b7c76a442ddec552bbb5786d366 kdeaddons-3.3.2.ebuild 994
-RMD160 436a491bd3080aa7d7d30327e28d15239f54b895 kdeaddons-3.3.2.ebuild 994
-SHA256 ec32067287721d03b85ca864f510ff78ddbbc7489e8722c759a11b312a615c13 kdeaddons-3.3.2.ebuild 994
 MD5 5cb3102b5887be89c0079df0a6028d51 kdeaddons-3.4.1.ebuild 1350
-RMD160 6d0cb791b6f621974d1edc4e9567d5a5787bdbaa kdeaddons-3.4.1.ebuild 1350
-SHA256 8759ea09a7a0071271bcf5596dd91823b135c29ec98fe1ac57fe009a7de81d00 kdeaddons-3.4.1.ebuild 1350
 MD5 4b184080c3a26edabff3c4d61409516d kdeaddons-3.4.2.ebuild 1549
-RMD160 84dfde811682ad56e218b4b6eec358233914490f kdeaddons-3.4.2.ebuild 1549
-SHA256 b7a907925cc7d1d576966d15dc86d2620b70f20e5c44afbd2cc9ec2a0708cf10 kdeaddons-3.4.2.ebuild 1549
 MD5 0ac1a38431c9a7e41d57be6a33a92200 kdeaddons-3.4.3.ebuild 1549
-RMD160 c26178de7f9005778980aa948497ed9c18421d56 kdeaddons-3.4.3.ebuild 1549
-SHA256 fd3bdc5d4004d252591e3985d2d7761fb357693b110f67e105bc9b6476a628e9 kdeaddons-3.4.3.ebuild 1549
 MD5 ab1a7b48cc81319d17e2bb0e25c814cf kdeaddons-3.5.0.ebuild 1163
-RMD160 810d747217c884f4aa370b8fef4b2971345948ce kdeaddons-3.5.0.ebuild 1163
-SHA256 4d980ff98f5e3e3e5aafe92d542f9cc97fd0d06c6bf12d871722717b0b8e392e kdeaddons-3.5.0.ebuild 1163
 MD5 78869fc9c0e92877c3b7f97a848af8c8 kdeaddons-3.5.1.ebuild 1163
-RMD160 ef26503af651085d8ee72b5cf80e3bd7e12a3c90 kdeaddons-3.5.1.ebuild 1163
-SHA256 5f4a0eec34ca9aacd5adad328b445f22a71c906b2b73c6f3446b6826930b833d kdeaddons-3.5.1.ebuild 1163
+MD5 1d78b0f4a7e7be4468aea21c112b990b kdeaddons-3.5.2-r1.ebuild 1234
 MD5 cb4138a2a853c8f8541ffd6a26ce267b kdeaddons-3.5.2.ebuild 1166
-RMD160 927f9b631401f4a31c777edbc3889f4267971dc7 kdeaddons-3.5.2.ebuild 1166
-SHA256 89d78f4a6e414b3bdcc422edc6ddcd78b9527a1dc7a529d8d904f01baa8165b0 kdeaddons-3.5.2.ebuild 1166
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.5.2-r1 b/kde-base/kdeaddons/files/digest-kdeaddons-3.5.2-r1
new file mode 100644
index 000000000000..16e22f5f016a
--- /dev/null
+++ b/kde-base/kdeaddons/files/digest-kdeaddons-3.5.2-r1
@@ -0,0 +1 @@
+MD5 affb74174c6e3eda2c0748d6c052c8ff kdeaddons-3.5.2.tar.bz2 1640284
diff --git a/kde-base/kdeaddons/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff b/kde-base/kdeaddons/files/konq-plugins-3.5.2-arkplugin-crash-fix.diff
new file mode 100644
index 000000000000..ed846c8ee850
--- /dev/null
+++ b/kde-base/kdeaddons/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/kdeaddons/kdeaddons-3.5.2-r1.ebuild b/kde-base/kdeaddons/kdeaddons-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..c73e0d7de78e
--- /dev/null
+++ b/kde-base/kdeaddons/kdeaddons-3.5.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5.2-r1.ebuild,v 1.1 2006/04/03 13:45:00 carlo Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="arts berkdb sdl xmms"
+
+DEPEND="~kde-base/kdepim-${PV}
+	~kde-base/kdemultimedia-${PV}
+	~kde-base/kdegames-${PV}
+	arts? ( ~kde-base/arts-${PV} )
+	sdl? ( >=media-libs/libsdl-1.2 )
+	xmms? ( media-sound/xmms )
+	berkdb? ( || ( =sys-libs/db-4.3*
+	               =sys-libs/db-4.2* ) )
+	!kde-misc/metabar"
+
+PATCHES="${FILESDIR}/konq-plugins-3.5.2-arkplugin-crash-fix.diff"
+
+src_compile() {
+	local myconf="$(use_with sdl) $(use_with xmms)"
+
+	if use berkdb; then
+		if has_version "=sys-libs/db-4.3*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.3
+			        --with-extra-includes=/usr/include/db4.3"
+		elif has_version "=sys-libs/db-4.2*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.2
+			        --with-extra-includes=/usr/include/db4.2"
+		fi
+	else
+		myconf="${myconf} --without-berkeley-db"
+	fi
+
+	kde_src_compile
+}