diff options
author | Caleb Tennis <caleb@gentoo.org> | 2003-06-22 18:24:00 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2003-06-22 18:24:00 +0000 |
commit | cdbfb75a19b594400279df95586e40f498ad0333 (patch) | |
tree | d6e42bccf28549dcdf4887caa0e504377406bdda /kde-base/kdelibs/files | |
parent | update to icewm (diff) | |
download | gentoo-2-cdbfb75a19b594400279df95586e40f498ad0333.tar.gz gentoo-2-cdbfb75a19b594400279df95586e40f498ad0333.tar.bz2 gentoo-2-cdbfb75a19b594400279df95586e40f498ad0333.zip |
Removing stale ebuilds
Diffstat (limited to 'kde-base/kdelibs/files')
16 files changed, 0 insertions, 416 deletions
diff --git a/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r1 b/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r1 deleted file mode 100644 index 46a8292384fa..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 51ec17dce9c62b50a3c2e97e4511cdcf kdelibs-2.2.2.tar.bz2 5955592 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.0.5a-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.0.5a-r1 deleted file mode 100644 index d05d48bfa85c..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.0.5a-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 a3c714c7727ddc70e7c9ea6acf5e42dc kdelibs-3.0.5a.tar.bz2 7647507 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1 b/kde-base/kdelibs/files/digest-kdelibs-3.1 deleted file mode 100644 index 5e6b6600e866..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b5cb94d5889134ba4e86749e6b5476c kdelibs-3.1.tar.bz2 10377330 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.1-r2 deleted file mode 100644 index 5e6b6600e866..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b5cb94d5889134ba4e86749e6b5476c kdelibs-3.1.tar.bz2 10377330 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1-r3 b/kde-base/kdelibs/files/digest-kdelibs-3.1-r3 deleted file mode 100644 index 5e6b6600e866..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b5cb94d5889134ba4e86749e6b5476c kdelibs-3.1.tar.bz2 10377330 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.1 b/kde-base/kdelibs/files/digest-kdelibs-3.1.1 deleted file mode 100644 index bc63cdc312e6..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 15eb9412c589126844b277b9e80cfffc kdelibs-3.1.1.tar.bz2 10313173 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.1-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.1.1-r1 deleted file mode 100644 index a8ef657d80ea..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1.1-r1 +++ /dev/null @@ -1,14 +0,0 @@ -MD5 3c178889822836378fcf526195b86814 /files/kdelibs-3.1.1-kio_http.diff 5257 -MD5 24190dc0508cd29ea5adecc4cefc0db2 /files/kdelibs-2.2.2a-crosside.diff 1267 -MD5 b9e995da45022f78aed48a79f02201e7 /files/kdelibs-3.1-bookmark.diff 1320 -MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e /files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 7353213c0eaadb42e684fb98fe8f4ff0 /files/kdelibs-3.1.1-zip.diff 2906 -MD5 7353213c0eaadb42e684fb98fe8f4ff0 /files/kdelibs-3.1-zip.diff 2906 -MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e /files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e /files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch 477 -MD5 bcd0e223c0be9cc4d1af5f2b5578a096 /files/kdelibs-3.0.5a-dontcrash.diff 500 -MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 /files/kdelibs-2.2.2a-gentoo.diff 75788 -MD5 6e7c2097ad93ecd9a011d1685cb8971f /files/kdelibs-3.1-libxml2-2.5.2.diff 1404 -MD5 acd90863c0847e230aa37f3943d58176 /files/kdelibs-3.0.5a-libxml2-2.5.2.diff 703 -MD5 6d7ef21b5c69861561d1d3a418a4f931 /kdelibs-3.1.1-r1.ebuild 2583 -MD5 15eb9412c589126844b277b9e80cfffc kdelibs-3.1.1.tar.bz2 10313173 diff --git a/kde-base/kdelibs/files/kdelibs-3.0.5a-dontcrash.diff b/kde-base/kdelibs/files/kdelibs-3.0.5a-dontcrash.diff deleted file mode 100644 index 5fb8463d545e..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.0.5a-dontcrash.diff +++ /dev/null @@ -1,14 +0,0 @@ -RCS file: /home/kde/kdelibs/khtml/rendering/render_replaced.cpp,v -retrieving revision 1.92.2.5 -retrieving revision 1.92.2.6 -diff -b -p -u -r1.92.2.5 -r1.92.2.6 ---- khtml/rendering/render_replaced.cpp 1 Oct 2002 19:22:51 -0000 1.92.2.5 -+++ khtml/rendering/render_replaced.cpp 4 Jan 2003 23:42:31 -0000 1.92.2.6 -@@ -153,7 +153,6 @@ void RenderWidget::detach() - RenderWidget::~RenderWidget() - { - KHTMLAssert( refCount() <= 0 ); -- assert(!m_view); - - if(m_widget) { - m_widget->hide(); diff --git a/kde-base/kdelibs/files/kdelibs-3.0.5a-libxml2-2.5.2.diff b/kde-base/kdelibs/files/kdelibs-3.0.5a-libxml2-2.5.2.diff deleted file mode 100644 index 19c0ef9c9aab..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.0.5a-libxml2-2.5.2.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- kdoctools/customization/entities/general.entities~ 2003-03-14 23:11:41.000000000 +0100 -+++ kdoctools/customization/entities/general.entities 2003-03-14 23:12:24.000000000 +0100 -@@ -353,7 +353,7 @@ - <!ENTITY SMTP "<acronym>SMTP</acronym>"> - <!ENTITY SGI "<trademark>SGI</trademark>"> - <!ENTITY Solaris "<trademark>Solaris</trademark>"> --<!ENTITY SuSE '<trademark class="registered"><acronym>SuSE</acronym></trademark>'> -+<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> - <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'> - <!ENTITY tkmidi "<application>tkmidi</application>"> - <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'> diff --git a/kde-base/kdelibs/files/kdelibs-3.1-bookmark.diff b/kde-base/kdelibs/files/kdelibs-3.1-bookmark.diff deleted file mode 100644 index 84a730bef1c1..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1-bookmark.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- kio/bookmarks/kbookmarkmenu.cc~ 2003-02-03 16:41:06.000000000 +0100 -+++ kio/bookmarks/kbookmarkmenu.cc 2003-02-03 16:44:46.000000000 +0100 -@@ -269,10 +269,10 @@ - else - { - // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; -- // create a normal URL item, with ID as a name -+ // create a normal URL item, with address as a name - KAction * action = new KAction( text, bm.icon(), 0, - this, SLOT( slotBookmarkSelected() ), -- m_actionCollection, bm.url().url().utf8() ); -+ m_actionCollection, bm.address().utf8() ); - - action->setStatusText( bm.url().prettyURL() ); - -@@ -369,8 +369,11 @@ - if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - //kdDebug(1203) << sender()->name() << endl; - -- // The name of the action is the URL to open -- m_pOwner->openBookmarkURL( QString::fromUtf8(sender()->name()) ); -+ KBookmark bookmark = m_pManager->findByAddress( QString::fromUtf8(sender()->name()) ); -+ Q_ASSERT(!bookmark.isNull()); -+ Q_ASSERT(!bookmark.isGroup()); -+ -+ m_pOwner->openBookmarkURL( bookmark.url().url() ); - } - - // ----------------------------------------------------------------------------- diff --git a/kde-base/kdelibs/files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch deleted file mode 100644 index 930776d23a51..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kjs/ustring.cpp.orig 2003-01-23 15:49:49.000000000 -0500 -+++ kjs/ustring.cpp 2003-01-27 19:49:00.000000000 -0500 -@@ -421,8 +421,15 @@ - { - double d = toDouble(); - bool b = true; -+ /* useless temporary variable to work around gcc optimization bug */ -+ bool nan = false; - -- if (isNaN(d) || d != static_cast<unsigned long>(d)) { -+ if (isNaN(d)) { -+ d = 0; -+ nan = true; -+ } -+ -+ if (nan || d != static_cast<unsigned long>(d)) { - b = false; - d = 0; - } diff --git a/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff b/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff deleted file mode 100644 index a859d81227ae..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- kdoctools/customization/entities/general.entities 2002-10-28 14:38:14.000000000 -0500 -+++ kdoctools/customization/entities/general.entities 2003-02-12 14:05:19.000000000 -0500 -@@ -351,7 +351,7 @@ - <!ENTITY SMTP "<acronym>SMTP</acronym>"> - <!ENTITY SGI "<trademark>SGI</trademark>"> - <!ENTITY Solaris "<trademark>Solaris</trademark>"> --<!ENTITY SuSE '<trademark class="registered"><acronym>SuSE</acronym></trademark>'> -+<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> - <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'> - <!ENTITY tkmidi "<application>tkmidi</application>"> - <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'> ---- kdoctools/customization/obsolete/general.entities 2002-04-16 11:57:18.000000000 -0400 -+++ kdoctools/customization/obsolete/general.entities 2003-02-12 14:04:53.000000000 -0500 -@@ -354,7 +354,7 @@ - <!ENTITY SMTP "<acronym>SMTP</acronym>"> - <!ENTITY SGI "<trademark>SGI</trademark>"> - <!ENTITY Solaris "<trademark>Solaris</trademark>"> --<!ENTITY SuSE '<trademark class="registered"><acronym>SuSE</acronym></trademark>'> -+<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> - <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'> - <!ENTITY tkmidi "<application>tkmidi</application>"> - <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'> diff --git a/kde-base/kdelibs/files/kdelibs-3.1-zip.diff b/kde-base/kdelibs/files/kdelibs-3.1-zip.diff deleted file mode 100644 index e63c14fd79ae..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1-zip.diff +++ /dev/null @@ -1,61 +0,0 @@ -diff -u -r kio/kio/kzip.cpp kio/kio/kzip.cpp ---- kio/kio/kzip.cpp 2003-01-03 02:58:47.000000000 -0200 -+++ kio/kio/kzip.cpp 2003-01-29 22:16:15.000000000 -0200 -@@ -332,27 +332,43 @@ - - KArchiveEntry* entry; - if ( isdir ) -- entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ { -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ KArchiveEntry* ent = rootDir()->entry( path ); -+ if ( ent && ent->isDirectory() ) -+ { -+ //kdDebug(7040) << "Directory already exists, NOT going to add it again" << endl; -+ entry = 0L; -+ } -+ else -+ { -+ entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ //kdDebug(7040) << "KArchiveDirectory created, entryName= " << entryName << ", name=" << name << endl; -+ } -+ } - else - { - entry = new KZipFileEntry( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null, -- name, dataoffset, ucsize, cmethod, csize ); -+ name, dataoffset, ucsize, cmethod, csize ); - static_cast<KZipFileEntry *>(entry)->setHeaderStart( localheaderoffset ); -- //kdDebug(7040) << "KZipFileEntry created" << endl; -+ //kdDebug(7040) << "KZipFileEntry created, entryName= " << entryName << ", name=" << name << endl; - d->m_fileList.append( static_cast<KZipFileEntry *>( entry ) ); - } - -- if ( pos == -1 ) -- { -- rootDir()->addEntry(entry); -- } -- else -- { -- // In some tar files we can find dir/./file => call cleanDirPath -- QString path = QDir::cleanDirPath( name.left( pos ) ); -- // Ensure container directory exists, create otherwise -- KArchiveDirectory * tdir = findOrCreate( path ); -- tdir->addEntry(entry); -+ if ( entry ) -+ { -+ if ( pos == -1 ) -+ { -+ rootDir()->addEntry(entry); -+ } -+ else -+ { -+ // In some tar files we can find dir/./file => call cleanDirPath -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ // Ensure container directory exists, create otherwise -+ KArchiveDirectory * tdir = findOrCreate( path ); -+ tdir->addEntry(entry); -+ } - } - - //calculate offset to next entry diff --git a/kde-base/kdelibs/files/kdelibs-3.1.1-kio_http.diff b/kde-base/kdelibs/files/kdelibs-3.1.1-kio_http.diff deleted file mode 100644 index dc8beb0ddca9..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1.1-kio_http.diff +++ /dev/null @@ -1,160 +0,0 @@ -cvs -f log -N -r1.551.2.9 http.cc - -RCS file: /home/kde/kdelibs/kioslave/http/http.cc,v -Working file: http.cc -head: 1.565 -branch: -locks: strict -access list: -keyword substitution: kv -total revisions: 632; selected revisions: 1 -description: ----------------------------- -revision 1.551.2.9 -date: 2003/03/17 14:20:31; author: waba; state: Exp; lines: +112 -112 -CCMAIL: 55571-done@bugs.kde.org -Fix Bug 55571: https authentication through proxy fails - -(This patch basically reverts r1.546 and r1.544) -m_bNeedTunnel was incorrectly used to check whether we were busy connecting -to a proxy or sending the actual request. Moved some code around so that it -only gets executed when sending the actual request so that it isn't necassery -any more to abuse m_bNeedTunnel for this. - -The resetting of m_bNeedTunnel caused bug 55571, it isn't necassery to reset -it, the resetting was a poor attempt to let m_bNeedTunnel serve as a status -indicator for something it wasn't intended to indicate. -============================================================================= -cvs -f diff -kk -bp -u -r1.551.2.8 -r1.551.2.9 http.cc -Index: http.cc -=================================================================== -RCS file: /home/kde/kdelibs/kioslave/http/http.cc,v -retrieving revision 1.551.2.8 -retrieving revision 1.551.2.9 -diff -b -p -u -r1.551.2.8 -r1.551.2.9 ---- kioslave/http/http.cc 14 Feb 2003 19:50:53 -0000 1.551.2.8 -+++ kioslave/http/http.cc 17 Mar 2003 14:20:31 -0000 1.551.2.9 -@@ -438,7 +438,6 @@ bool HTTPProtocol::retrieveHeader( bool - kdDebug(7113) << "(" << m_pid << ") Unset tunneling flag!" << endl; - setEnableSSLTunnel( false ); - m_bIsTunneled = true; -- m_bNeedTunnel = false; - // Reset the CONNECT response code... - m_responseCode = m_prevResponseCode; - continue; -@@ -1936,7 +1935,42 @@ bool HTTPProtocol::httpOpen() - // Check the validity of the current connection, if one exists. - httpCheckConnection(); - -- // Determine if this is a POST or GET method -+ -+ if ( !m_bIsTunneled && m_bNeedTunnel ) -+ { -+ setEnableSSLTunnel( true ); -+ // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't -+ // need any HTTP 1.1 capabilities for CONNECT - Waba -+ header = QString("CONNECT %1:%2 HTTP/1.0" -+ "\r\n").arg( m_request.hostname).arg(m_request.port); -+ -+ // Identify who you are to the proxy server! -+ if (!m_request.userAgent.isEmpty()) -+ header += "User-Agent: " + m_request.userAgent + "\r\n"; -+ -+ /* Add hostname information */ -+ header += "Host: "; -+ if (m_state.hostname.find(':') != -1) -+ { -+ // This is an IPv6 (not hostname) -+ header += '['; -+ header += m_state.hostname; -+ header += ']'; -+ } -+ else -+ { -+ header += m_state.hostname; -+ } -+ -+ if (m_state.port != m_iDefaultPort) -+ header += QString(":%1").arg(m_state.port); -+ header += "\r\n"; -+ -+ header += proxyAuthenticationHeader(); -+ } -+ else -+ { -+ // Determine the kind of method we are handling... - switch (m_request.method) - { - case HTTP_GET: -@@ -1944,12 +1978,12 @@ bool HTTPProtocol::httpOpen() - break; - case HTTP_PUT: - header = "PUT "; -- moreData = !m_bNeedTunnel; -+ moreData = true; - m_request.bCachedWrite = false; // Do not put any result in the cache - break; - case HTTP_POST: - header = "POST "; -- moreData = !m_bNeedTunnel; -+ moreData = true; - m_request.bCachedWrite = false; // Do not put any result in the cache - break; - case HTTP_HEAD: -@@ -2033,40 +2067,6 @@ bool HTTPProtocol::httpOpen() - return false; - } - -- if ( !m_bIsTunneled && m_bNeedTunnel ) -- { -- setEnableSSLTunnel( true ); -- // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't -- // need any HTTP 1.1 capabilities for CONNECT - Waba -- header = QString("CONNECT %1:%2 HTTP/1.0" -- "\r\n").arg( m_request.hostname).arg(m_request.port); -- -- // Identify who you are to the proxy server! -- if (!m_request.userAgent.isEmpty()) -- header += "User-Agent: " + m_request.userAgent + "\r\n"; -- -- /* Add hostname information */ -- header += "Host: "; -- if (m_state.hostname.find(':') != -1) -- { -- // This is an IPv6 (not hostname) -- header += '['; -- header += m_state.hostname; -- header += ']'; -- } -- else -- { -- header += m_state.hostname; -- } -- -- if (m_state.port != m_iDefaultPort) -- header += QString(":%1").arg(m_state.port); -- header += "\r\n"; -- -- header += proxyAuthenticationHeader(); -- } -- else -- { - // format the URI - if (m_state.doProxy && !m_bIsTunneled) - { -@@ -2271,7 +2271,6 @@ bool HTTPProtocol::httpOpen() - // Do we need to authorize to the proxy server ? - if ( m_state.doProxy && !m_bIsTunneled ) - header += proxyAuthenticationHeader(); -- } - - if ( m_protocol == "webdav" || m_protocol == "webdavs" ) - { -@@ -2289,6 +2288,7 @@ bool HTTPProtocol::httpOpen() - // add extra header elements for WebDAV - if ( !davHeader.isNull() ) - header += davHeader; -+ } - } - - kdDebug(7103) << "(" << m_pid << ") ============ Sending Header:" << endl; diff --git a/kde-base/kdelibs/files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch deleted file mode 100644 index 930776d23a51..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kjs/ustring.cpp.orig 2003-01-23 15:49:49.000000000 -0500 -+++ kjs/ustring.cpp 2003-01-27 19:49:00.000000000 -0500 -@@ -421,8 +421,15 @@ - { - double d = toDouble(); - bool b = true; -+ /* useless temporary variable to work around gcc optimization bug */ -+ bool nan = false; - -- if (isNaN(d) || d != static_cast<unsigned long>(d)) { -+ if (isNaN(d)) { -+ d = 0; -+ nan = true; -+ } -+ -+ if (nan || d != static_cast<unsigned long>(d)) { - b = false; - d = 0; - } diff --git a/kde-base/kdelibs/files/kdelibs-3.1.1-zip.diff b/kde-base/kdelibs/files/kdelibs-3.1.1-zip.diff deleted file mode 100644 index e63c14fd79ae..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1.1-zip.diff +++ /dev/null @@ -1,61 +0,0 @@ -diff -u -r kio/kio/kzip.cpp kio/kio/kzip.cpp ---- kio/kio/kzip.cpp 2003-01-03 02:58:47.000000000 -0200 -+++ kio/kio/kzip.cpp 2003-01-29 22:16:15.000000000 -0200 -@@ -332,27 +332,43 @@ - - KArchiveEntry* entry; - if ( isdir ) -- entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ { -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ KArchiveEntry* ent = rootDir()->entry( path ); -+ if ( ent && ent->isDirectory() ) -+ { -+ //kdDebug(7040) << "Directory already exists, NOT going to add it again" << endl; -+ entry = 0L; -+ } -+ else -+ { -+ entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ //kdDebug(7040) << "KArchiveDirectory created, entryName= " << entryName << ", name=" << name << endl; -+ } -+ } - else - { - entry = new KZipFileEntry( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null, -- name, dataoffset, ucsize, cmethod, csize ); -+ name, dataoffset, ucsize, cmethod, csize ); - static_cast<KZipFileEntry *>(entry)->setHeaderStart( localheaderoffset ); -- //kdDebug(7040) << "KZipFileEntry created" << endl; -+ //kdDebug(7040) << "KZipFileEntry created, entryName= " << entryName << ", name=" << name << endl; - d->m_fileList.append( static_cast<KZipFileEntry *>( entry ) ); - } - -- if ( pos == -1 ) -- { -- rootDir()->addEntry(entry); -- } -- else -- { -- // In some tar files we can find dir/./file => call cleanDirPath -- QString path = QDir::cleanDirPath( name.left( pos ) ); -- // Ensure container directory exists, create otherwise -- KArchiveDirectory * tdir = findOrCreate( path ); -- tdir->addEntry(entry); -+ if ( entry ) -+ { -+ if ( pos == -1 ) -+ { -+ rootDir()->addEntry(entry); -+ } -+ else -+ { -+ // In some tar files we can find dir/./file => call cleanDirPath -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ // Ensure container directory exists, create otherwise -+ KArchiveDirectory * tdir = findOrCreate( path ); -+ tdir->addEntry(entry); -+ } - } - - //calculate offset to next entry |