Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/libkolab/files: libkolab-fix-include.patch
Date: Wed, 01 Aug 2012 20:03:40
Message-Id: 20120801200325.419B82004C@flycatcher.gentoo.org
1 johu 12/08/01 20:03:25
2
3 Added: libkolab-fix-include.patch
4 Log:
5 Initial commit. Import from kde overlay. Needed for KDE SC 4.9.0.
6
7 (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-libs/libkolab/files/libkolab-fix-include.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libkolab/files/libkolab-fix-include.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libkolab/files/libkolab-fix-include.patch?rev=1.1&content-type=text/plain
14
15 Index: libkolab-fix-include.patch
16 ===================================================================
17 --- conversion/commonconversion.h 2012-05-02 07:56:08.000000000 -0400
18 +++ conversion/commonconversion.h 2012-07-02 23:04:24.762660720 -0400
19 @@ -20,7 +20,7 @@
20
21 #include <KDE/KDateTime>
22 #include <QStringList>
23 -#include <kolab/kolabcontainers.h>
24 +#include <kolabcontainers.h>
25
26
27 namespace Kolab {
28 @@ -32,4 +32,4 @@
29 };
30 };
31
32 -#endif
33 \ No newline at end of file
34 +#endif
35 --- conversion/kabcconversion.h 2012-05-02 07:56:08.000000000 -0400
36 +++ conversion/kabcconversion.h 2012-07-02 23:04:24.762660720 -0400
37 @@ -20,7 +20,7 @@
38
39 #include "kolab_export.h"
40
41 -#include <kolab/kolabcontact.h>
42 +#include <kolabcontact.h>
43 #include <kabc/addressee.h>
44 #include <kabc/contactgroup.h>
45
46 @@ -40,4 +40,4 @@
47 };
48 };
49
50 -#endif
51 \ No newline at end of file
52 +#endif
53 --- conversion/kcalconversion.h 2012-05-02 07:56:08.000000000 -0400
54 +++ conversion/kcalconversion.h 2012-07-02 23:04:24.763660720 -0400
55 @@ -20,9 +20,9 @@
56
57 #include "kolab_export.h"
58
59 -#include <kolab/kolabevent.h>
60 -#include <kolab/kolabtodo.h>
61 -#include <kolab/kolabjournal.h>
62 +#include <kolabevent.h>
63 +#include <kolabtodo.h>
64 +#include <kolabjournal.h>
65 #include <kcalcore/event.h>
66 #include <kcalcore/todo.h>
67 #include <kcalcore/journal.h>
68 @@ -49,4 +49,4 @@
69 };
70 };
71
72 -#endif
73 \ No newline at end of file
74 +#endif
75 --- conversion/kolabconversion.h 2012-05-02 07:56:08.000000000 -0400
76 +++ conversion/kolabconversion.h 2012-07-02 23:04:24.764660720 -0400
77 @@ -20,7 +20,7 @@
78
79 #include "kolab_export.h"
80
81 -#include <kolab/kolabnote.h>
82 +#include <kolabnote.h>
83 #include <kmime/kmime_message.h>
84
85 namespace Kolab {
86 @@ -36,4 +36,4 @@
87 };
88 };
89
90 -#endif
91 \ No newline at end of file
92 +#endif
93 --- kolabformat/errorhandler.cpp 2012-05-02 07:56:08.000000000 -0400
94 +++ kolabformat/errorhandler.cpp 2012-07-02 23:04:24.764660720 -0400
95 @@ -20,7 +20,7 @@
96
97 #include <qdebug.h>
98
99 -#include <kolab/kolabformat.h>
100 +#include <kolabformat.h>
101
102 namespace Kolab {
103
104 --- kolabformat/kolabobject.cpp 2012-05-02 07:56:08.000000000 -0400
105 +++ kolabformat/kolabobject.cpp 2012-07-02 23:04:24.765660720 -0400
106 @@ -34,7 +34,7 @@
107 #include <conversion/kabcconversion.h>
108 #include <conversion/kolabconversion.h>
109 #include <akonadi/notes/noteutils.h>
110 -#include <kolab/kolabformat.h>
111 +#include <kolabformat.h>
112
113
114 namespace Kolab {
115 --- tests/benchmark.cpp 2012-05-02 07:56:08.000000000 -0400
116 +++ tests/benchmark.cpp 2012-07-02 23:05:22.746664944 -0400
117 @@ -19,7 +19,7 @@
118 #include "kolabformatV2/event.h"
119 #include "conversion/kcalconversion.h"
120 #include <kmime/kmime_message.h>
121 -#include <kolab/kolabformat.h>
122 +#include <kolabformat.h>
123 #include <kdebug.h>
124 #include "testutils.h"
125
126 --- tests/formattest.cpp 2012-05-02 07:56:08.000000000 -0400
127 +++ tests/formattest.cpp 2012-07-02 23:05:34.920665858 -0400
128 @@ -26,8 +26,8 @@
129 #include <qtemporaryfile.h>
130 #include <QBuffer>
131 #include <kdebug.h>
132 -#include <kolab/kolabcontainers.h>
133 -#include <kolab/kolabformat.h>
134 +#include <kolabcontainers.h>
135 +#include <kolabformat.h>
136
137 #include <kcalcore/icalformat.h>
138 #include <kabc/vcardconverter.h>
139 --- tests/kcalconversiontest.cpp 2012-05-02 07:56:08.000000000 -0400
140 +++ tests/kcalconversiontest.cpp 2012-07-02 23:05:46.269666653 -0400
141 @@ -4,7 +4,7 @@
142 #include <QtCore/QObject>
143 #include <QtTest/QtTest>
144 #include <KDE/KSystemTimeZones>
145 -#include <kolab/kolabcontact.h>
146 +#include <kolabcontact.h>
147 #include <kcalcore/recurrence.h>
148 #include <kabc/addressee.h>
149
150 --- tests/upgradetest.cpp 2012-05-02 07:56:08.000000000 -0400
151 +++ tests/upgradetest.cpp 2012-07-02 23:06:03.269667875 -0400
152 @@ -19,8 +19,8 @@
153 #include "upgradetest.h"
154
155 #include <QTest>
156 -#include <kolab/kolabcontainers.h>
157 -#include <kolab/kolabformat.h>
158 +#include <kolabcontainers.h>
159 +#include <kolabformat.h>
160
161 #include "testutils.h"
162 #include "kolabformat/kolabobject.h"