diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2010-08-11 18:42:42 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2010-08-11 18:42:42 +0200 |
| commit | c5c6239b20f6bacb66431f7929c052f21eea4b66 (patch) | |
| tree | 67057724b60403397ae2ded5fd46f9ef515f79da | |
| parent | 1ff79de0aba2952519bfcd6451a7f82358685890 (diff) | |
| download | kde-c5c6239b20f6bacb66431f7929c052f21eea4b66.tar.gz kde-c5c6239b20f6bacb66431f7929c052f21eea4b66.tar.bz2 kde-c5c6239b20f6bacb66431f7929c052f21eea4b66.zip | |
[kdeplasma-addons] Update the patch with the one that is in svn.
| -rw-r--r-- | kde-base/kdeplasma-addons/Manifest | 2 | ||||
| -rw-r--r-- | kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest index 21ae5d19403..b0557b06f5c 100644 --- a/kde-base/kdeplasma-addons/Manifest +++ b/kde-base/kdeplasma-addons/Manifest @@ -1,4 +1,4 @@ -AUX 4.5.0-fix_lancelot.patch 589 RMD160 3cd201843223c571328825906aa3b2ce241d184a SHA1 fcabe4723fb6edd3fdce92dd9ec134c953c6f04a SHA256 741ff6c74a00d8eb6314127255e828a1cd2e2eb08e48e063bdc652ab30353dc1 +AUX 4.5.0-fix_lancelot.patch 644 RMD160 6f24e16d7665be1acb775cb74e51b62216375618 SHA1 280a774f1331d37ab7138b90b95911deaed3223b SHA256 842de8ff76d1353c4865628d4905f953bccd33d486c33f86b908a69485a5d097 AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 42e9dab676b617686ef159752b4643491e0dfdd7 SHA1 2e1e74e01e64f277636b099af2b292af091ec33b SHA256 a19a933f282f1be4ab67949c1de9a4ead8e05d2ff78dafbdd600682f3c8e59b9 AUX kdeplasma-addons-4.4.74-cmake.patch 2623 RMD160 dd1fc6913c715184fdb4e0681507ad46207f25c5 SHA1 67809abb832d8f4e3f5c521be54bf8eacbd9c0c5 SHA256 d2e3ea559e422cc0fd822f9a014bf2d4621525deb40e86181be65ddc51a1d745 AUX kdeplasma-addons-4.4.92-lancelot.patch 474 RMD160 8734c038e6fe0d7a9fb9055eeda408d4ba1cd440 SHA1 e67f1206b9eb94aec5e9e252e814175e16d64b0a SHA256 2f68494810746ac83cb0fc650c7a2d573076c6fa00db6ef14aa067fc9e6c10ec diff --git a/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch b/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch index 87da4a7a834..4ae43194973 100644 --- a/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch +++ b/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch @@ -1,15 +1,21 @@ -diff -urN kdeplasma-addons-4.5.0/libs/lancelot-datamodels/MessagesKmail_p.h kdeplasma-addons-4.5.0.new//libs/lancelot-datamodels/MessagesKmail_p.h ---- kdeplasma-addons-4.5.0/libs/lancelot-datamodels/MessagesKmail_p.h 2010-05-16 22:05:13.000000000 +0200 -+++ kdeplasma-addons-4.5.0.new//libs/lancelot-datamodels/MessagesKmail_p.h 2010-08-11 18:29:53.420249671 +0200 -@@ -21,8 +21,11 @@ +Index: trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h +=================================================================== +--- trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h (revision 1162199) ++++ trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h (revision 1162200) +@@ -21,11 +21,14 @@ #include <QHash> #include <KIcon> #include <KJob> + ++#include "config-lancelot-datamodels.h" ++ +#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS #include <Akonadi/Entity> #include <Akonadi/Collection> +#endif - #include "config-lancelot-datamodels.h" +-#include "config-lancelot-datamodels.h" +- + namespace Lancelot { + namespace Models { |