Fix CR/LF in patch

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 5c5a36a4d325b5458c83c123d987de7622e7e79c..bf18db3f0207766130433e57e634c7f3b352a8d2 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -16,7 +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.2-hang.patch 2328 RMD160 776f7485b67ee3b851b060040676c366dc23db4a SHA1 6d6ac98f2ae5b566cbbfc91418ab265bb8793863 SHA256 da18313fe70d7afd69f871c51363c8b412f081815c0cbd6c5c5073fc4999b1d8
 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

diff --git a/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch b/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch
index cfb7609a3a443e01859f137f72ef1db307fcd45d..a9bf81d905448bb9a4aed9f7b141291a32633caa 100644 (file)
--- a/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.4.2-hang.patch
@@ -1,55 +1,55 @@
-Index: kio/kio/kfileitem.cpp\r
-===================================================================\r
---- kio/kio/kfileitem.cpp       (revision 1110210)\r
-+++ kio/kio/kfileitem.cpp       (revision 1110211)\r
-@@ -1217,13 +1217,13 @@\r
-     d->m_metaInfo = info;\r
- }\r
- \r
--KFileMetaInfo KFileItem::metaInfo(bool autoget, int) const\r
-+KFileMetaInfo KFileItem::metaInfo(bool autoget, int what) const\r
- {\r
-     if ((isRegularFile() || isDir()) && autoget && !d->m_metaInfo.isValid())\r
-     {\r
-         bool isLocalUrl;\r
-         KUrl url(mostLocalUrl(isLocalUrl));\r
--        d->m_metaInfo = KFileMetaInfo(url);//, mimetype() );\r
-+        d->m_metaInfo = KFileMetaInfo(url.toLocalFile(), mimetype(), (KFileMetaInfo::What)what);\r
-     }\r
-     return d->m_metaInfo;\r
- }\r
-Index: kio/kio/kfileitem.h\r
-===================================================================\r
---- kio/kio/kfileitem.h (revision 1110210)\r
-+++ kio/kio/kfileitem.h (revision 1110211)\r
-@@ -550,11 +550,14 @@\r
- \r
-     /**\r
-      * Returns the metainfo of this item.\r
-+     *\r
-+     * (since 4.4.3) By default it uses the KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo.\r
-+     * If you need more information, create your own KFileMetaInfo object and set it using setMetaInfo()\r
-      * @param autoget if true, the metainfo will automatically be created\r
--     * @param what ignored\r
-+     * @param what how much metainfo you need to retrieve from the file (KFileMetaInfo::WhatFlag)\r
-      */\r
-     KFileMetaInfo metaInfo(bool autoget = true,\r
--                                   int what = KFileMetaInfo::Fastest) const;\r
-+                           int what = KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo) const;\r
- \r
-     /**\r
-      * @deprecated simply use '='\r
-Index: kio/kfile/kmetaprops.cpp\r
-===================================================================\r
---- kio/kfile/kmetaprops.cpp    (revision 1110210)\r
-+++ kio/kfile/kmetaprops.cpp    (revision 1110211)\r
-@@ -63,7 +63,8 @@\r
-     d->m_info  = fileitem.metaInfo();\r
-     if (!d->m_info.isValid())\r
-     {\r
--        d->m_info = KFileMetaInfo(properties->kurl().path(KUrl::RemoveTrailingSlash));\r
-+        d->m_info = KFileMetaInfo(properties->kurl().path(KUrl::RemoveTrailingSlash), QString(),\r
-+                                  KFileMetaInfo::ContentInfo | KFileMetaInfo::TechnicalInfo);\r
-         fileitem.setMetaInfo(d->m_info);\r
-     }\r
+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