1 |
ssuominen 12/07/10 10:30:05 |
2 |
|
3 |
Added: python-poppler-qt4-0.16.2-poppler020.patch |
4 |
Log: |
5 |
Fix building with app-text/poppler >= 0.20 wrt #425630 by Ben de Groot and Rafał Mużyło |
6 |
|
7 |
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-python/python-poppler-qt4/files/python-poppler-qt4-0.16.2-poppler020.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.16.2-poppler020.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.16.2-poppler020.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: python-poppler-qt4-0.16.2-poppler020.patch |
16 |
=================================================================== |
17 |
--- poppler-qt4.sip |
18 |
+++ poppler-qt4.sip |
19 |
@@ -9,6 +9,8 @@ |
20 |
POPPLER_V0_12_1 |
21 |
POPPLER_V0_14_0 |
22 |
POPPLER_V0_16_0 |
23 |
+ POPPLER_V0_18_0 |
24 |
+ POPPLER_V0_20_0 |
25 |
} |
26 |
|
27 |
%Include types.sip |
28 |
--- poppler-annotation.sip |
29 |
+++ poppler-annotation.sip |
30 |
@@ -45,6 +45,7 @@ |
31 |
void setFlags( int flags ); |
32 |
QRectF boundary() const; |
33 |
void setBoundary( const QRectF &boundary ); |
34 |
+%If(- POPPLER_V0_18_0) |
35 |
struct Style { |
36 |
// appearance properties |
37 |
QColor color; // black |
38 |
@@ -92,12 +93,18 @@ |
39 |
|
40 |
// QLinkedList< Poppler::Annotation::Revision >& revisions(); |
41 |
const QLinkedList< Poppler::Annotation::Revision >& revisions() const; |
42 |
+%End |
43 |
virtual SubType subType() const = 0; |
44 |
+%If(- POPPLER_V0_18_0) |
45 |
virtual void store( QDomNode & parentNode, QDomDocument & document ) const; |
46 |
+%End |
47 |
virtual ~Annotation(); |
48 |
|
49 |
private: |
50 |
Annotation(const Poppler::Annotation&); |
51 |
+%If(POPPLER_V0_20_0 -) |
52 |
+ virtual void store( QDomNode & parentNode, QDomDocument & document ) const; |
53 |
+%End |
54 |
|
55 |
%ConvertToSubClassCode |
56 |
switch (sipCpp->subType()) { |
57 |
@@ -151,17 +158,23 @@ |
58 |
%End |
59 |
|
60 |
public: |
61 |
+%If(- POPPLER_V0_18_0) |
62 |
TextAnnotation(); |
63 |
TextAnnotation( const QDomNode &node ); |
64 |
+%End |
65 |
virtual ~TextAnnotation(); |
66 |
+%If(- POPPLER_V0_18_0) |
67 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
68 |
+%End |
69 |
virtual SubType subType() const; |
70 |
|
71 |
enum TextType { Linked, InPlace }; |
72 |
enum InplaceIntent { Unknown, Callout, TypeWriter }; |
73 |
|
74 |
TextType textType() const; |
75 |
+%If(- POPPLER_V0_18_0) |
76 |
void setTextType( TextType type ); |
77 |
+%End |
78 |
|
79 |
QString textIcon() const; |
80 |
void setTextIcon( const QString &icon ); |
81 |
@@ -176,12 +189,20 @@ |
82 |
void setInplaceText( const QString &text ); |
83 |
|
84 |
QPointF calloutPoint( int id ) const; |
85 |
+%If(- POPPLER_V0_18_0) |
86 |
void setCalloutPoint( int id, const QPointF &point ); |
87 |
+%End |
88 |
|
89 |
InplaceIntent inplaceIntent() const; |
90 |
void setInplaceIntent( InplaceIntent intent ); |
91 |
|
92 |
private: |
93 |
+%If(POPPLER_V0_20_0 -) |
94 |
+ TextAnnotation(); |
95 |
+ TextAnnotation( const QDomNode &node ); |
96 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
97 |
+ void setTextType( TextType type ); |
98 |
+%End |
99 |
TextAnnotation(const Poppler::TextAnnotation&); |
100 |
|
101 |
}; // class TextAnnotation |
102 |
@@ -194,10 +215,14 @@ |
103 |
%End |
104 |
|
105 |
public: |
106 |
+%If(- POPPLER_V0_18_0) |
107 |
LineAnnotation(); |
108 |
LineAnnotation( const QDomNode &node ); |
109 |
+%End |
110 |
virtual ~LineAnnotation(); |
111 |
+%If(- POPPLER_V0_18_0) |
112 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
113 |
+%End |
114 |
virtual SubType subType() const; |
115 |
|
116 |
enum TermStyle { Square, Circle, Diamond, OpenArrow, ClosedArrow, None, |
117 |
@@ -232,6 +257,11 @@ |
118 |
void setLineIntent( LineIntent intent ); |
119 |
|
120 |
private: |
121 |
+%If(POPPLER_V0_20_0 -) |
122 |
+ LineAnnotation(); |
123 |
+ LineAnnotation( const QDomNode &node ); |
124 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
125 |
+%End |
126 |
LineAnnotation(const Poppler::LineAnnotation&); |
127 |
|
128 |
}; // class LineAnnotation |
129 |
@@ -244,10 +274,14 @@ |
130 |
%End |
131 |
|
132 |
public: |
133 |
+%If(- POPPLER_V0_18_0) |
134 |
GeomAnnotation(); |
135 |
GeomAnnotation( const QDomNode &node ); |
136 |
+%End |
137 |
virtual ~GeomAnnotation(); |
138 |
+%If(- POPPLER_V0_18_0) |
139 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
140 |
+%End |
141 |
virtual SubType subType() const; |
142 |
|
143 |
enum GeomType { InscribedSquare, InscribedCircle }; |
144 |
@@ -258,10 +292,17 @@ |
145 |
QColor geomInnerColor() const; |
146 |
void setGeomInnerColor( const QColor &color ); |
147 |
|
148 |
+%If(- POPPLER_V0_18_0) |
149 |
int geomPointWidth() const; |
150 |
void setGeomPointWidth( int width ); |
151 |
+%End |
152 |
|
153 |
private: |
154 |
+%If(POPPLER_V0_20_0 -) |
155 |
+ GeomAnnotation(); |
156 |
+ GeomAnnotation( const QDomNode &node ); |
157 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
158 |
+%End |
159 |
GeomAnnotation(const Poppler::GeomAnnotation&); |
160 |
|
161 |
}; // class GeomAnnotation |
162 |
@@ -274,10 +315,14 @@ |
163 |
%End |
164 |
|
165 |
public: |
166 |
+%If(- POPPLER_V0_18_0) |
167 |
HighlightAnnotation(); |
168 |
HighlightAnnotation( const QDomNode &node ); |
169 |
+%End |
170 |
virtual ~HighlightAnnotation(); |
171 |
+%If(- POPPLER_V0_18_0) |
172 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
173 |
+%End |
174 |
virtual SubType subType() const; |
175 |
enum HighlightType { |
176 |
Highlight, |
177 |
@@ -341,6 +386,11 @@ |
178 |
void setHighlightQuads( const QList< Poppler::HighlightAnnotation::Quad > &quads ); |
179 |
|
180 |
private: |
181 |
+%If(POPPLER_V0_20_0 -) |
182 |
+ HighlightAnnotation(); |
183 |
+ HighlightAnnotation( const QDomNode &node ); |
184 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
185 |
+%End |
186 |
HighlightAnnotation(const Poppler::HighlightAnnotation&); |
187 |
|
188 |
}; // class HighlightAnnotation |
189 |
@@ -353,13 +403,25 @@ |
190 |
%End |
191 |
|
192 |
public: |
193 |
+%If(- POPPLER_V0_18_0) |
194 |
StampAnnotation(); |
195 |
StampAnnotation( const QDomNode &node ); |
196 |
+%End |
197 |
virtual ~StampAnnotation(); |
198 |
+%If(- POPPLER_V0_18_0) |
199 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
200 |
+%End |
201 |
virtual SubType subType() const; |
202 |
QString stampIconName() const; |
203 |
void setStampIconName( const QString &name ); |
204 |
+ |
205 |
+private: |
206 |
+%If(POPPLER_V0_20_0 -) |
207 |
+ StampAnnotation(); |
208 |
+ StampAnnotation( const QDomNode &node ); |
209 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
210 |
+%End |
211 |
+ |
212 |
}; // class StampAnnotation |
213 |
|
214 |
|
215 |
@@ -370,15 +432,24 @@ |
216 |
%End |
217 |
|
218 |
public: |
219 |
+%If(- POPPLER_V0_18_0) |
220 |
InkAnnotation(); |
221 |
InkAnnotation( const QDomNode &node ); |
222 |
+%End |
223 |
virtual ~InkAnnotation(); |
224 |
+%If(- POPPLER_V0_18_0) |
225 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
226 |
+%End |
227 |
virtual SubType subType() const; |
228 |
QList< QLinkedList<QPointF> > inkPaths() const; |
229 |
void setInkPaths( const QList< QLinkedList<QPointF> > &paths ); |
230 |
|
231 |
private: |
232 |
+%If(POPPLER_V0_20_0 -) |
233 |
+ InkAnnotation(); |
234 |
+ InkAnnotation( const QDomNode &node ); |
235 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
236 |
+%End |
237 |
InkAnnotation(const Poppler::InkAnnotation&); |
238 |
|
239 |
}; // class InkAnnotation |
240 |
@@ -391,15 +462,24 @@ |
241 |
%End |
242 |
|
243 |
public: |
244 |
+%If(- POPPLER_V0_18_0) |
245 |
LinkAnnotation(); |
246 |
LinkAnnotation( const QDomNode &node ); |
247 |
+%End |
248 |
virtual ~LinkAnnotation(); |
249 |
+%If(- POPPLER_V0_18_0) |
250 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
251 |
+%End |
252 |
virtual SubType subType() const; |
253 |
|
254 |
enum HighlightMode { None, Invert, Outline, Push }; |
255 |
|
256 |
+%If(- POPPLER_V0_18_0) |
257 |
Poppler::Link* linkDestionation() const; |
258 |
+%End |
259 |
+%If(POPPLER_V0_20_0 -) |
260 |
+ Poppler::Link* linkDestination() const; |
261 |
+%End |
262 |
void setLinkDestination( Poppler::Link *link ); |
263 |
|
264 |
HighlightMode linkHighlightMode() const; |
265 |
@@ -409,6 +489,11 @@ |
266 |
void setLinkRegionPoint( int id, const QPointF &point ); |
267 |
|
268 |
private: |
269 |
+%If(POPPLER_V0_20_0 -) |
270 |
+ LinkAnnotation(); |
271 |
+ LinkAnnotation( const QDomNode &node ); |
272 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
273 |
+%End |
274 |
LinkAnnotation(const Poppler::LinkAnnotation&); |
275 |
|
276 |
}; // class LinkAnnotation |
277 |
@@ -421,16 +506,25 @@ |
278 |
%End |
279 |
|
280 |
public: |
281 |
+%If(- POPPLER_V0_18_0) |
282 |
CaretAnnotation(); |
283 |
CaretAnnotation( const QDomNode &node ); |
284 |
+%End |
285 |
virtual ~CaretAnnotation(); |
286 |
+%If(- POPPLER_V0_18_0) |
287 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
288 |
+%End |
289 |
virtual SubType subType() const; |
290 |
enum CaretSymbol { None, P }; |
291 |
CaretSymbol caretSymbol() const; |
292 |
void setCaretSymbol( CaretSymbol symbol ); |
293 |
|
294 |
private: |
295 |
+%If(POPPLER_V0_20_0 -) |
296 |
+ CaretAnnotation(); |
297 |
+ CaretAnnotation( const QDomNode &node ); |
298 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
299 |
+%End |
300 |
CaretAnnotation(const Poppler::CaretAnnotation&); |
301 |
|
302 |
}; // class CaretAnnotation |
303 |
@@ -443,10 +537,14 @@ |
304 |
%End |
305 |
|
306 |
public: |
307 |
+%If(- POPPLER_V0_18_0) |
308 |
FileAttachmentAnnotation(); |
309 |
FileAttachmentAnnotation( const QDomNode &node ); |
310 |
+%End |
311 |
virtual ~FileAttachmentAnnotation(); |
312 |
+%If(- POPPLER_V0_18_0) |
313 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
314 |
+%End |
315 |
virtual SubType subType() const; |
316 |
QString fileIconName() const; |
317 |
void setFileIconName( const QString &icon ); |
318 |
@@ -454,6 +552,11 @@ |
319 |
void setEmbeddedFile( Poppler::EmbeddedFile *ef ); |
320 |
|
321 |
private: |
322 |
+%If(POPPLER_V0_20_0 -) |
323 |
+ FileAttachmentAnnotation(); |
324 |
+ FileAttachmentAnnotation( const QDomNode &node ); |
325 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
326 |
+%End |
327 |
FileAttachmentAnnotation(const Poppler::FileAttachmentAnnotation&); |
328 |
|
329 |
}; // class FileAttachmentAnnotation |
330 |
@@ -466,10 +569,14 @@ |
331 |
%End |
332 |
|
333 |
public: |
334 |
+%If(- POPPLER_V0_18_0) |
335 |
SoundAnnotation(); |
336 |
SoundAnnotation( const QDomNode &node ); |
337 |
+%End |
338 |
virtual ~SoundAnnotation(); |
339 |
+%If(- POPPLER_V0_18_0) |
340 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
341 |
+%End |
342 |
virtual SubType subType() const; |
343 |
QString soundIconName() const; |
344 |
void setSoundIconName( const QString &icon ); |
345 |
@@ -477,6 +584,11 @@ |
346 |
void setSound( Poppler::SoundObject *ef ); |
347 |
|
348 |
private: |
349 |
+%If(POPPLER_V0_20_0 -) |
350 |
+ SoundAnnotation(); |
351 |
+ SoundAnnotation( const QDomNode &node ); |
352 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
353 |
+%End |
354 |
SoundAnnotation(const Poppler::SoundAnnotation&); |
355 |
|
356 |
}; // class SoundAnnotation |
357 |
@@ -489,10 +601,14 @@ |
358 |
%End |
359 |
|
360 |
public: |
361 |
+%If(- POPPLER_V0_18_0) |
362 |
MovieAnnotation(); |
363 |
MovieAnnotation( const QDomNode &node ); |
364 |
+%End |
365 |
virtual ~MovieAnnotation(); |
366 |
+%If(- POPPLER_V0_18_0) |
367 |
virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
368 |
+%End |
369 |
virtual SubType subType() const; |
370 |
|
371 |
Poppler::MovieObject* movie() const; |
372 |
@@ -501,6 +617,11 @@ |
373 |
void setMovieTitle( const QString &title ); |
374 |
|
375 |
private: |
376 |
+%If(POPPLER_V0_20_0 -) |
377 |
+ MovieAnnotation(); |
378 |
+ MovieAnnotation( const QDomNode &node ); |
379 |
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const; |
380 |
+%End |
381 |
MovieAnnotation(const Poppler::MovieAnnotation&); |
382 |
|
383 |
}; // class MovieAnnotation |
384 |
--- setup.py |
385 |
+++ setup.py |
386 |
@@ -131,8 +131,12 @@ |
387 |
tag = 'POPPLER_V0_12_1' |
388 |
elif ver < (0, 16, 0): |
389 |
tag = 'POPPLER_V0_14_0' |
390 |
+ elif ver < (0, 18, 0): |
391 |
+ tag = 'POPPLER_V0_16_0' |
392 |
+ elif ver < (0, 20, 0): |
393 |
+ tag = 'POPPLER_V0_18_0' |
394 |
else: |
395 |
- tag = 'POPPLER_V0_16_0' |
396 |
+ tag = 'POPPLER_V0_20_0' |
397 |
|
398 |
cmd = [sip_bin] |
399 |
if hasattr(self, 'sip_opts'): |