Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/calligra/files: calligra-2.4.2-marble.patch
Date: Sat, 23 Jun 2012 22:44:13
Message-Id: 20120623224402.087F42004C@flycatcher.gentoo.org
1 dilfridge 12/06/23 22:44:02
2
3 Added: calligra-2.4.2-marble.patch
4 Log:
5 Fix build with marble shape, remove old
6
7 (Portage version: 2.2.0_alpha111/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-office/calligra/files/calligra-2.4.2-marble.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/files/calligra-2.4.2-marble.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/calligra/files/calligra-2.4.2-marble.patch?rev=1.1&content-type=text/plain
14
15 Index: calligra-2.4.2-marble.patch
16 ===================================================================
17 From 94aa2f51a338c017339129b6c90c2d9da665e528 Mon Sep 17 00:00:00 2001
18 From: "Andreas K. Huettel (dilfridge)" <dilfridge@g.o>
19 Date: Sun, 24 Jun 2012 00:05:21 +0200
20 Subject: [PATCH] Marble includes need prefix marble/
21
22 ---
23 .../forms/widgets/mapbrowser/MapBrowserWidget.cpp | 2 +-
24 .../forms/widgets/mapbrowser/MapBrowserWidget.h | 2 +-
25 libs/main/rdf/KoRdfLocation.cpp | 4 ++--
26 libs/main/rdf/KoRdfLocationEditWidget.cpp | 4 ++--
27 plugins/mapshape/MapShape.cpp | 2 +-
28 .../mapshape/MapShapeCommandChangeProjection.cpp | 2 +-
29 plugins/mapshape/MapShapeCommandContentChange.cpp | 2 +-
30 plugins/mapshape/MapShapeCommandSetMapThemeId.cpp | 2 +-
31 plugins/mapshape/MapShapeCommandZoom.cpp | 2 +-
32 plugins/mapshape/MapTool.cpp | 2 +-
33 plugins/reporting/maps/KoReportItemMaps.cpp | 4 ++--
34 plugins/reporting/maps/KoReportItemMaps.h | 2 +-
35 12 files changed, 15 insertions(+), 15 deletions(-)
36
37 diff --git a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
38 index 0983141..bd0cf29 100644
39 --- a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
40 +++ b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.cpp
41 @@ -19,7 +19,7 @@
42
43
44 #include "MapBrowserWidget.h"
45 -#include <MarbleWidget.h>
46 +#include <marble/MarbleWidget.h>
47 #include <QPointF>
48 #include <KDebug>
49
50 diff --git a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
51 index b699ca2..977eb5e 100644
52 --- a/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
53 +++ b/kexi/plugins/forms/widgets/mapbrowser/MapBrowserWidget.h
54 @@ -21,7 +21,7 @@
55 #ifndef MAPBROWSERWIDGET_H
56 #define MAPBROWSERWIDGET_H
57
58 -#include <MarbleWidget.h>
59 +#include <marble/MarbleWidget.h>
60
61 #include "widgetfactory.h"
62 #include "container.h"
63 diff --git a/libs/main/rdf/KoRdfLocation.cpp b/libs/main/rdf/KoRdfLocation.cpp
64 index b51d0a2..1511806 100644
65 --- a/libs/main/rdf/KoRdfLocation.cpp
66 +++ b/libs/main/rdf/KoRdfLocation.cpp
67 @@ -32,8 +32,8 @@
68 // marble for geolocation
69 // #ifdef CAN_USE_MARBLE
70 // #include <LatLonEdit.h>
71 -// #include <MarbleWidget.h>
72 -// #include <MarbleWidgetInputHandler.h>
73 +// #include <marble/MarbleWidget.h>
74 +// #include <marble/MarbleWidgetInputHandler.h>
75 // #endif
76
77 using namespace Soprano;
78 diff --git a/libs/main/rdf/KoRdfLocationEditWidget.cpp b/libs/main/rdf/KoRdfLocationEditWidget.cpp
79 index 0436570..13bb23d 100644
80 --- a/libs/main/rdf/KoRdfLocationEditWidget.cpp
81 +++ b/libs/main/rdf/KoRdfLocationEditWidget.cpp
82 @@ -26,8 +26,8 @@
83 // marble for geolocation
84 // #ifdef CAN_USE_MARBLE
85 // #include <LatLonEdit.h>
86 -// #include <MarbleWidget.h>
87 -// #include <MarbleWidgetInputHandler.h>
88 +// #include <marble/MarbleWidget.h>
89 +// #include <marble/MarbleWidgetInputHandler.h>
90 // #endif
91
92 class KoRdfLocationEditWidgetPrivate
93 diff --git a/plugins/mapshape/MapShape.cpp b/plugins/mapshape/MapShape.cpp
94 index 06e3b0a..e8ec0c6 100644
95 --- a/plugins/mapshape/MapShape.cpp
96 +++ b/plugins/mapshape/MapShape.cpp
97 @@ -21,7 +21,7 @@
98
99
100 #include "MapShape.h"
101 -#include <MarbleWidget.h>
102 +#include <marble/MarbleWidget.h>
103 #include <MarbleModel.h>
104 #include <KoImageData.h>
105 #include <KoXmlNS.h>
106 diff --git a/plugins/mapshape/MapShapeCommandChangeProjection.cpp b/plugins/mapshape/MapShapeCommandChangeProjection.cpp
107 index b41ed6b..9800725 100644
108 --- a/plugins/mapshape/MapShapeCommandChangeProjection.cpp
109 +++ b/plugins/mapshape/MapShapeCommandChangeProjection.cpp
110 @@ -21,7 +21,7 @@
111 #include "MapShapeCommandChangeProjection.h"
112 #include "MapShape.h"
113
114 -#include <MarbleWidget.h>
115 +#include <marble/MarbleWidget.h>
116
117 MapShapeCommandChangeProjection::MapShapeCommandChangeProjection(MapShape * shape, Marble::Projection projection, KUndo2Command *parent)
118 : KUndo2Command(parent)
119 diff --git a/plugins/mapshape/MapShapeCommandContentChange.cpp b/plugins/mapshape/MapShapeCommandContentChange.cpp
120 index 52fc500..2ed8802 100644
121 --- a/plugins/mapshape/MapShapeCommandContentChange.cpp
122 +++ b/plugins/mapshape/MapShapeCommandContentChange.cpp
123 @@ -20,7 +20,7 @@
124 #include "MapShapeCommandContentChange.h"
125
126 #include "MapShape.h"
127 -#include <MarbleWidget.h>
128 +#include <marble/MarbleWidget.h>
129 #include <QPointF>
130
131
132 diff --git a/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp b/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
133 index 78c245a..4ca53ef 100644
134 --- a/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
135 +++ b/plugins/mapshape/MapShapeCommandSetMapThemeId.cpp
136 @@ -21,7 +21,7 @@
137 #include "MapShapeCommandSetMapThemeId.h"
138 #include "MapShape.h"
139
140 -#include <MarbleWidget.h>
141 +#include <marble/MarbleWidget.h>
142
143 MapShapeCommandSetMapThemeId::MapShapeCommandSetMapThemeId(MapShape * shape, const QString& mapThemeId, KUndo2Command *parent)
144 : KUndo2Command(parent)
145 diff --git a/plugins/mapshape/MapShapeCommandZoom.cpp b/plugins/mapshape/MapShapeCommandZoom.cpp
146 index edeb6d7..6d0f897 100644
147 --- a/plugins/mapshape/MapShapeCommandZoom.cpp
148 +++ b/plugins/mapshape/MapShapeCommandZoom.cpp
149 @@ -21,7 +21,7 @@
150 #include "MapShapeCommandZoom.h"
151 #include "MapShape.h"
152
153 -#include <MarbleWidget.h>
154 +#include <marble/MarbleWidget.h>
155
156
157 MapShapeCommandZoom::MapShapeCommandZoom(MapShape * shape, signed int value, KUndo2Command *parent)
158 diff --git a/plugins/mapshape/MapTool.cpp b/plugins/mapshape/MapTool.cpp
159 index 3733271..0f4bfca 100644
160 --- a/plugins/mapshape/MapTool.cpp
161 +++ b/plugins/mapshape/MapTool.cpp
162 @@ -42,7 +42,7 @@
163 #include <KoPointerEvent.h>
164
165 #include <MarbleControlBox.h>
166 -#include <MarbleWidget.h>
167 +#include <marble/MarbleWidget.h>
168 #include <GeoDataLatLonAltBox.h>
169
170
171 diff --git a/plugins/reporting/maps/KoReportItemMaps.cpp b/plugins/reporting/maps/KoReportItemMaps.cpp
172 index 01969c3..ba2fa73 100644
173 --- a/plugins/reporting/maps/KoReportItemMaps.cpp
174 +++ b/plugins/reporting/maps/KoReportItemMaps.cpp
175 @@ -25,8 +25,8 @@
176 #include <QBuffer>
177 #include <kcodecs.h>
178 #include <renderobjects.h>
179 -#include <MarbleWidget.h>
180 -#include <MarbleModel.h>
181 +#include <marble/MarbleWidget.h>
182 +#include <marble/MarbleModel.h>
183 #include <QImage>
184 #include <QPixmap>
185 #include <sys/socket.h>
186 diff --git a/plugins/reporting/maps/KoReportItemMaps.h b/plugins/reporting/maps/KoReportItemMaps.h
187 index d07f2d0..a838a70 100644
188 --- a/plugins/reporting/maps/KoReportItemMaps.h
189 +++ b/plugins/reporting/maps/KoReportItemMaps.h
190 @@ -29,7 +29,7 @@
191 #include <kdebug.h>
192 #include <klocalizedstring.h>
193 #include <kglobalsettings.h>
194 -#include <MarbleWidget.h>
195 +#include <marble/MarbleWidget.h>
196 #include <RdfForward.h>
197 #include <QMap>
198
199 --
200 1.7.9.2
Report Message
Find on MARC Find on Google Groups