From: Theo Chatzimichos Date: Fri, 9 Apr 2010 00:38:54 +0000 (+0000) Subject: Apply patch to kdelibs to fix hang caused in dolphin when accessing network filesyste... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57a569e43206fb50d67345ff305de95de5bdb5ed;p=gentoo.git Apply patch to kdelibs to fix hang caused in dolphin when accessing network filesystems, full desc bug 313681 kde bug 216932 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- 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 + 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 kdelibs-4.4.1-r1.ebuild, kdelibs-4.4.2.ebuild: diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 183a1cc21678..5c5a36a4d325 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -16,6 +16,7 @@ AUX kdelibs-4.3.3-klauncher_mac.patch 1126 RMD160 073d2ce7fc431257dec40617f7269f AUX kdelibs-4.3.3-plasma-pixmap-cache.patch 656 RMD160 9b8173f035ab3cb1867c21f3d5ffc3f5e4d25578 SHA1 d83b15cc16e8638ef5402b82957a93c3acc48534 SHA256 d8e4fd4ad1a3c405d8beac05be53f8f028bc8974520707821fb99ee19ca13c7c AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 RMD160 c7f53343cb8713bb2c7d195563d5fe399adb9939 SHA1 03e60a01c7665e9074ddc412c90f157a044ce9ba SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a AUX kdelibs-4.3.80-module-suffix.patch 3919 RMD160 ed225d685594d53df9792b1472925a371bbc41da SHA1 efa963a74c60dcc23c3f925a479cf753b6247ccf SHA256 06fedf486f3a459cb3366fe1865583863924b48f78f0d5f6b327a42438c83976 +AUX kdelibs-4.4.2-hang.patch 2382 RMD160 57d188083baca9c7f7b7f0b8b61ecad48acbc26e SHA1 d564b65eace113844363f555c86ef925e7eecf25 SHA256 15d0395acd66ac18b00c4914cb11e330b32a4b03ec5c8292c5445b673b1db788 AUX kdelibs-4.4.66-macos-unbundle.patch 4618 RMD160 a968d41e3b8c3f05e3b64a7487b0da0ae34fa8cc SHA1 36412cbe6b50b8b3ac5ae598910ac51dd37a48b7 SHA256 3a3b753af670cfadfb67a591c6cca5ed62ceffb97dcb326b9f2e684db1ba596d DIST kdelibs-4.3.3.tar.bz2 10516364 RMD160 3d6a2c971cef12fb2cb9ba64a10200b2cf098043 SHA1 89b55982e007c44835a9da0f540dd57fa096df45 SHA256 bec0b11b9db010fb14e1bc438ef77dd417a429168eb7d14dc5dee50ea23b5fb3 DIST kdelibs-4.3.5.tar.bz2 10524879 RMD160 6b8e060854d637072fe94f0e3397ff1dd9b86583 SHA1 35dcbc06b468451cb4e839aa5771b4e6bc512188 SHA256 65823e34e2b4f6579251f3dddb23774f381c3576cca420417964027b8fe4b40e @@ -24,6 +25,6 @@ DIST kdelibs-4.4.2.tar.bz2 14082099 RMD160 7506f87bc098aedb84b3b50707065a4f8060a EBUILD kdelibs-4.3.3-r1.ebuild 6388 RMD160 957b2e5a91398d7a1d6be8807c75a93a80776f87 SHA1 69e1d08d6ecff21083c1487f004147b4bc631eea SHA256 3fbbfe5cd7d764faa68e89d2b838d35096920a9155f247f491711f50d6a3d446 EBUILD kdelibs-4.3.5.ebuild 8947 RMD160 1d537646dd3bc43b31b3644ada917668c3c37445 SHA1 f4637756d209e75a9ce1f51d7dea60a78cb0f8d5 SHA256 adc782d6e1c3a7889bd53b8ed078c730d9f14806ebd6d7768630471091c2edea EBUILD kdelibs-4.4.1-r1.ebuild 9062 RMD160 51c35f422c765e88281f1c6aeaa939bad2dbbcdb SHA1 e7c1728df816c4f359a5be609c27b46db53c65aa SHA256 4eeb531b5d408f04d6c2ee60c72bd66247c84607ccd00ce3f17ba562eddba417 -EBUILD kdelibs-4.4.2.ebuild 9270 RMD160 df7e1fe06b636e3c58cb2597cd9c0d7556db6e5f SHA1 8df4bdf77df313d072bbff52b6478b3f524eaf87 SHA256 fa574b5d43207dcdb40e183ffc1fe722e0d1e30554e76e7aa61064dfeb6546c2 -MISC ChangeLog 113245 RMD160 4300beb7f79ed09c56cba4bbb837565a9103856d SHA1 928e77e1a71fecb4b2c35745f0c54eb373511567 SHA256 2264a5106aa9b1c1797c4166f254f7e72faf0e32573eb0afb73b07c871f016a4 +EBUILD kdelibs-4.4.2.ebuild 9302 RMD160 9c6a8a2df3a37d565cab73e08161246464540090 SHA1 cfd8b0af6519a3af27ed5f48cecb3186a2eb3808 SHA256 4033c28e69b5619a6cbaa184e7ae8f273e8c211bfb53ead31756fcf55d50d952 +MISC ChangeLog 113489 RMD160 3bdfbd146833784449753a645791269b3020ebe8 SHA1 a9138cad0d9b00461443eca78d0c9cc01a53732e SHA256 f45bf7ec56837d676f17a40e62372c808f7fcecc05f2e29818e5c0b8a7b3a34d MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a 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() {