backport upstream patches
This commit is contained in:
parent
90baaae9c4
commit
b39ee9ba0c
@ -30,3 +30,18 @@
|
||||
// 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 );
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user