diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2010-08-11 18:32:36 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2010-08-11 18:32:36 +0200 |
| commit | 1ff79de0aba2952519bfcd6451a7f82358685890 (patch) | |
| tree | d14f67dabe78051681ddeb3580857e34d90581c5 | |
| parent | 397fc630b8e6e04fbea05d485fd711469f59b74d (diff) | |
| download | kde-1ff79de0aba2952519bfcd6451a7f82358685890.tar.gz kde-1ff79de0aba2952519bfcd6451a7f82358685890.tar.bz2 kde-1ff79de0aba2952519bfcd6451a7f82358685890.zip | |
[kde-base/kdeplasma-addons] Fix lancelot issues with kdepimlibs
| -rw-r--r-- | kde-base/kdeplasma-addons/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch | 15 | ||||
| -rw-r--r-- | kde-base/kdeplasma-addons/kdeplasma-addons-4.5.0.ebuild | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest index 348dbf087da..21ae5d19403 100644 --- a/kde-base/kdeplasma-addons/Manifest +++ b/kde-base/kdeplasma-addons/Manifest @@ -1,9 +1,10 @@ +AUX 4.5.0-fix_lancelot.patch 589 RMD160 3cd201843223c571328825906aa3b2ce241d184a SHA1 fcabe4723fb6edd3fdce92dd9ec134c953c6f04a SHA256 741ff6c74a00d8eb6314127255e828a1cd2e2eb08e48e063bdc652ab30353dc1 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 DIST kdeplasma-addons-4.5.0.tar.bz2 1746437 RMD160 88dfa5b81370a1e02643f15f71c6c3b063212e2f SHA1 48386ebf8a049f2456bf0e88ba46fced0351cd02 SHA256 06c668f8cf54e79216b9007a8a7e095bb837f235ab0e1bdf339f625d0c651fec EBUILD kdeplasma-addons-4.4.9999.ebuild 2062 RMD160 9c21e9df51893b3af57b22daa71bc332010b50d6 SHA1 ba0c5f4119a7d1c6f1f62f4ec43d92cb21eaf67c SHA256 2bf18adf84c6c8e943979f4b2edaae77c7be04aa4dd7d544d4136c0e82eaea2c -EBUILD kdeplasma-addons-4.5.0.ebuild 2050 RMD160 d865ff819cda6ec38bbfce548ca9dcf2e0dda20c SHA1 fd3b71b00e7fa6675ba53d297f5b70deda49ea98 SHA256 f3dc300497aa31370b490428c0209b77983ff5afab291da606d1d399625f2f7a +EBUILD kdeplasma-addons-4.5.0.ebuild 2090 RMD160 51af1f692b4dd91fe4e59da79b3a02b84a0b859d SHA1 dbe8ba8033682076a4eb65e4fa8cb03db1367cfb SHA256 387c57218b4a559dc1ae0779ec73085051d2a95bc9e91250e4943ccba55467b0 EBUILD kdeplasma-addons-4.5.9999.ebuild 2000 RMD160 b1237fb499cbc5ed23c40ef7a7cddae1446d393a SHA1 41717e704205cc87f8901c0350aa144d78316640 SHA256 a96686bf21b94dddc58be2a976700ade2f6738270bab7a943ca1437475b2078b EBUILD kdeplasma-addons-9999.ebuild 2000 RMD160 b1237fb499cbc5ed23c40ef7a7cddae1446d393a SHA1 41717e704205cc87f8901c0350aa144d78316640 SHA256 a96686bf21b94dddc58be2a976700ade2f6738270bab7a943ca1437475b2078b MISC metadata.xml 513 RMD160 c7aded626277a79aa0a0b879476ecb5377f97f86 SHA1 cd2f44eccf545b4232bf77415d6aa5b79015e702 SHA256 f682111bd3c2ed82effd027c8fe51d56704be560452a101db8e3557ef0e0a572 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 new file mode 100644 index 00000000000..87da4a7a834 --- /dev/null +++ b/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch @@ -0,0 +1,15 @@ +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 @@ + #include <QHash> + #include <KIcon> + #include <KJob> ++ ++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS + #include <Akonadi/Entity> + #include <Akonadi/Collection> ++#endif + + #include "config-lancelot-datamodels.h" + diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.0.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.0.ebuild index d178ddccbfe..ea2614565df 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.0.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.0.ebuild @@ -47,6 +47,7 @@ add_blocker kdebase-data '<4.2.88' PATCHES=( "${FILESDIR}/${PN}-4.4.74-cmake.patch" + "${FILESDIR}/${PV}-fix_lancelot.patch" ) src_prepare() { |