diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2010-04-09 00:38:54 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2010-04-09 00:38:54 +0000 |
| commit | 3d1c9eac50b70caf9b57ed61dd351e74d3bee5aa (patch) | |
| tree | f1b4fe23ccdbc1cbc228ffb8c4d3575df511d42b /kde-base | |
| parent | fix manifest (diff) | |
| download | gentoo-2-3d1c9eac50b70caf9b57ed61dd351e74d3bee5aa.tar.gz gentoo-2-3d1c9eac50b70caf9b57ed61dd351e74d3bee5aa.tar.bz2 gentoo-2-3d1c9eac50b70caf9b57ed61dd351e74d3bee5aa.zip | |
Apply patch to kdelibs to fix hang caused in dolphin when accessing network filesystems, full desc bug 313681 kde bug 216932
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch | 55 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.4.2.ebuild | 3 |
3 files changed, 63 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index c7f82f709538..0ef1bd294833 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.678 2010/04/08 23:19:49 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.679 2010/04/09 00:38:54 tampakrap Exp $ + + 09 Apr 2010; Theo Chatzimichos <tampakrap@gentoo.org> + kdelibs-4.4.2.ebuild, +files/kdelibs-4.4.2-hang.patch: + Apply patch to kdelibs to fix hang caused in dolphin when accessing + network filesystems, full desc bug 313681 kde bug 216932 08 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org> kdelibs-4.4.1-r1.ebuild, kdelibs-4.4.2.ebuild: diff --git a/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch b/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch new file mode 100644 index 000000000000..cfb7609a3a44 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch @@ -0,0 +1,55 @@ +Index: kio/kio/kfileitem.cpp
+===================================================================
+--- kio/kio/kfileitem.cpp (revision 1110210)
++++ kio/kio/kfileitem.cpp (revision 1110211)
+@@ -1217,13 +1217,13 @@
+ d->m_metaInfo = info;
+ }
+
+-KFileMetaInfo KFileItem::metaInfo(bool autoget, int) const
++KFileMetaInfo KFileItem::metaInfo(bool autoget, int what) const
+ {
+ if ((isRegularFile() || isDir()) && autoget && !d->m_metaInfo.isValid())
+ {
+ bool isLocalUrl;
+ KUrl url(mostLocalUrl(isLocalUrl));
+- d->m_metaInfo = KFileMetaInfo(url);//, mimetype() );
++ d->m_metaInfo = KFileMetaInfo(url.toLocalFile(), mimetype(), (KFileMetaInfo::What)what);
+ }
+ return d->m_metaInfo;
+ }
+Index: kio/kio/kfileitem.h
+===================================================================
+--- kio/kio/kfileitem.h (revision 1110210)
++++ kio/kio/kfileitem.h (revision 1110211)
+@@ -550,11 +550,14 @@
+
+ /**
+ * Returns the metainfo of this item.
++ *
++ * (since 4.4.3) By default it uses the KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo.
++ * If you need more information, create your own KFileMetaInfo object and set it using setMetaInfo()
+ * @param autoget if true, the metainfo will automatically be created
+- * @param what ignored
++ * @param what how much metainfo you need to retrieve from the file (KFileMetaInfo::WhatFlag)
+ */
+ KFileMetaInfo metaInfo(bool autoget = true,
+- int what = KFileMetaInfo::Fastest) const;
++ int what = KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo) const;
+
+ /**
+ * @deprecated simply use '='
+Index: kio/kfile/kmetaprops.cpp
+===================================================================
+--- kio/kfile/kmetaprops.cpp (revision 1110210)
++++ kio/kfile/kmetaprops.cpp (revision 1110211)
+@@ -63,7 +63,8 @@
+ d->m_info = fileitem.metaInfo();
+ if (!d->m_info.isValid())
+ {
+- d->m_info = KFileMetaInfo(properties->kurl().path(KUrl::RemoveTrailingSlash));
++ d->m_info = KFileMetaInfo(properties->kurl().path(KUrl::RemoveTrailingSlash), QString(),
++ KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo);
+ fileitem.setMetaInfo(d->m_info);
+ }
+
\ No newline at end of file diff --git a/kde-base/kdelibs/kdelibs-4.4.2.ebuild b/kde-base/kdelibs/kdelibs-4.4.2.ebuild index 49d72df9bef2..0dc724ab33f9 100644 --- a/kde-base/kdelibs/kdelibs-4.4.2.ebuild +++ b/kde-base/kdelibs/kdelibs-4.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.2.ebuild,v 1.3 2010/04/08 23:23:32 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.2.ebuild,v 1.4 2010/04/09 00:38:54 tampakrap Exp $ EAPI="3" @@ -129,6 +129,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch" "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" "${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch" + "${FILESDIR}/${P}-hang.patch" ) src_prepare() { |