* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.4.2-hang.patch
@ 2010-04-09 0:38 Theo Chatzimichos (tampakrap)
0 siblings, 0 replies; 2+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2010-04-09 0:38 UTC (permalink / raw
To: gentoo-commits
tampakrap 10/04/09 00:38:54
Added: kdelibs-4.4.2-hang.patch
Log:
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)
Revision Changes Path
1.1 kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch?rev=1.1&content-type=text/plain
Index: kdelibs-4.4.2-hang.patch
===================================================================
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);
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.4.2-hang.patch
@ 2010-04-09 13:58 Maciej Mrozowski (reavertm)
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski (reavertm) @ 2010-04-09 13:58 UTC (permalink / raw
To: gentoo-commits
reavertm 10/04/09 13:58:04
Modified: kdelibs-4.4.2-hang.patch
Log:
Fix CR/LF in patch
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch?r1=1.1&r2=1.2
Index: kdelibs-4.4.2-hang.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.4.2-hang.patch 9 Apr 2010 00:38:54 -0000 1.1
+++ kdelibs-4.4.2-hang.patch 9 Apr 2010 13:58:04 -0000 1.2
@@ -1,55 +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);
- }
+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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-09 13:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-09 0:38 [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.4.2-hang.patch Theo Chatzimichos (tampakrap)
-- strict thread matches above, loose matches on Subject: below --
2010-04-09 13:58 Maciej Mrozowski (reavertm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox