rpms/kdelibs3/F-11 kdelibs-3.5.10-kio.patch, NONE, 1.1 kdelibs3.spec, 1.66, 1.67 kdelibs-3.5.0-kio.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs3/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29695

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.10-kio.patch 
Removed Files:
	kdelibs-3.5.0-kio.patch 
Log Message:
backport upstream patches


kdelibs-3.5.10-kio.patch:
 kzip.cpp |   16 +++++++++++++++-
 kzip.h   |    5 +----
 2 files changed, 16 insertions(+), 5 deletions(-)

--- NEW FILE kdelibs-3.5.10-kio.patch ---
--- kdelibs-3.5.10/kio/kio/kzip.cpp.orig	2009-12-09 18:42:47.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.cpp	2009-12-09 18:45:43.000000000 +0100
@@ -1051,6 +1051,20 @@
     return true;
 }
 
+bool KZip::writeDir(const QString& name, const QString& user, const QString& group)
+{
+    // Zip files have no explicit directories, they are implicitly created during extraction time
+    // when file entries have paths in them.
+    // However, to support empty directories, we must create a dummy file entry which ends with '/'.
+    QString dirName = name;
+    if (!name.endsWith("/"))
+        dirName = dirName.append('/');
+
+    mode_t perm = 040755;
+    time_t the_time = time(0);
+    return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
+}
+
 // Doesn't need to be reimplemented anymore. Remove for KDE-4.0
 bool KZip::writeFile( const QString& name, const QString& user, const QString& group, uint size, const char* data )
 {
@@ -1114,7 +1128,7 @@
     }
 
     // delete entries in the filelist with the same filename as the one we want
-    // to save, so that we don´t have duplicate file entries when viewing the zip
+    // to save, so that we don�t have duplicate file entries when viewing the zip
     // with konqi...
     // CAUTION: the old file itself is still in the zip and won't be removed !!!
     QPtrListIterator<KZipFileEntry> it( d->m_fileList );
diff -up kdelibs-3.5.10/kio/kio/kzip.h.orig kdelibs-3.5.10/kio/kio/kzip.h
--- kdelibs-3.5.10/kio/kio/kzip.h.orig	2009-12-09 19:35:42.000000000 +0100
+++ kdelibs-3.5.10/kio/kio/kzip.h	2009-12-09 19:35:48.000000000 +0100
@@ -191,10 +191,7 @@ protected:
     /// Closes the archive
     virtual bool closeArchive();
 
-    /**
-     * @internal Not needed for zip
-     */
-    virtual bool writeDir( const QString& name, const QString& user, const QString& group) { Q_UNUSED(name); Q_UNUSED(user); Q_UNUSED(group); return true; }
+    virtual bool writeDir(const QString& name, const QString& user, const QString& group);
     // TODO(BIC) uncomment and make virtual for KDE 4.
 //    bool writeDir( const QString& name, const QString& user, const QString& group,
 //                        mode_t perm, time_t atime, time_t mtime, time_t ctime );


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/F-11/kdelibs3.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- kdelibs3.spec	9 Dec 2009 18:05:01 -0000	1.66
+++ kdelibs3.spec	9 Dec 2009 18:31:39 -0000	1.67
@@ -81,7 +81,7 @@ Patch101: kde-3.5-libtool-shlibext.patch
 Patch103: kdelibs-3.5.0-101956.patch
 Patch104: kdelibs-3.5.10-gcc44.patch
 Patch105: kdelibs-3.5.10-ossl-1.x.patch
-Patch106: kdelibs-3.5.0-kio.patch
+Patch106: kdelibs-3.5.10-kio.patch
 Patch107: kdelibs-3.5.10-assert.patch
 Patch108: kdelibs-3.5.10-dtoa.patch
 Patch109: kdelibs-3.5.10-kabc.patch


--- kdelibs-3.5.0-kio.patch DELETED ---