diff options
author | Radu Moisan <radu.moisan@intel.com> | 2012-08-06 16:07:02 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-15 14:26:39 +0100 |
commit | 1834db1ddd02887238144728fc90c50b4805071c (patch) | |
tree | 61156c4e5bb569957078a2519c3005208850f86e /meta/recipes-graphics | |
parent | 5c96735dbc9e77f2b5dd86f532aa467d78e553e2 (diff) | |
download | poky-1834db1ddd02887238144728fc90c50b4805071c.tar.gz |
pango: upgrade to upstream stable 1.30.0
(From OE-Core rev: dec33ee2c8badb64b90ce8230f218c6898f3703c)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch | 16 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango-1.28.4/noconst.patch | 408 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch (renamed from meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango_1.28.4.bb | 14 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango_1.30.0.bb | 15 |
6 files changed, 27 insertions, 438 deletions
diff --git a/meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch b/meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch deleted file mode 100644 index 6d9e74bfcc..0000000000 --- a/meta/recipes-graphics/pango/pango-1.28.4/no-tests.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [ disable tests make sense in embedded, but not appropriate for upstream] | ||
2 | |||
3 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
4 | |||
5 | Index: pango-1.22.2/Makefile.am | ||
6 | =================================================================== | ||
7 | --- pango-1.22.2.orig/Makefile.am | ||
8 | +++ pango-1.22.2/Makefile.am | ||
9 | @@ -1,6 +1,6 @@ | ||
10 | ## Process this file with automake to create Makefile.in. | ||
11 | |||
12 | -SUBDIRS= pango modules pango-view examples docs tools tests | ||
13 | +SUBDIRS= pango modules pango-view examples docs tools | ||
14 | |||
15 | EXTRA_DIST = \ | ||
16 | autogen.sh \ | ||
diff --git a/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch b/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch deleted file mode 100644 index d4832a5040..0000000000 --- a/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch +++ /dev/null | |||
@@ -1,408 +0,0 @@ | |||
1 | G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid | ||
2 | build failures. | ||
3 | |||
4 | RP 2011/10/12 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: pango-1.28.4/pango/fonts.c | ||
9 | =================================================================== | ||
10 | --- pango-1.28.4.orig/pango/fonts.c 2011-10-12 01:32:09.372046342 +0100 | ||
11 | +++ pango-1.28.4/pango/fonts.c 2011-10-12 01:32:34.512036630 +0100 | ||
12 | @@ -165,7 +165,7 @@ | ||
13 | * %NULL if not previously set. This has the same life-time | ||
14 | * as the font description itself and should not be freed. | ||
15 | **/ | ||
16 | -G_CONST_RETURN char * | ||
17 | +const char * | ||
18 | pango_font_description_get_family (const PangoFontDescription *desc) | ||
19 | { | ||
20 | g_return_val_if_fail (desc != NULL, NULL); | ||
21 | @@ -1927,7 +1927,7 @@ | ||
22 | * Return value: the name of the family. This string is owned | ||
23 | * by the family object and must not be modified or freed. | ||
24 | **/ | ||
25 | -G_CONST_RETURN char * | ||
26 | +const char * | ||
27 | pango_font_family_get_name (PangoFontFamily *family) | ||
28 | { | ||
29 | g_return_val_if_fail (PANGO_IS_FONT_FAMILY (family), NULL); | ||
30 | @@ -2060,7 +2060,7 @@ | ||
31 | * Return value: the face name for the face. This string is | ||
32 | * owned by the face object and must not be modified or freed. | ||
33 | **/ | ||
34 | -G_CONST_RETURN char * | ||
35 | +const char * | ||
36 | pango_font_face_get_face_name (PangoFontFace *face) | ||
37 | { | ||
38 | g_return_val_if_fail (PANGO_IS_FONT_FACE (face), NULL); | ||
39 | Index: pango-1.28.4/pango/pango-attributes.c | ||
40 | =================================================================== | ||
41 | --- pango-1.28.4.orig/pango/pango-attributes.c 2011-10-12 01:32:09.552046155 +0100 | ||
42 | +++ pango-1.28.4/pango/pango-attributes.c 2011-10-12 01:32:34.522037975 +0100 | ||
43 | @@ -97,7 +97,7 @@ | ||
44 | * | ||
45 | * Since: 1.22 | ||
46 | **/ | ||
47 | -G_CONST_RETURN char * | ||
48 | +const char * | ||
49 | pango_attr_type_get_name (PangoAttrType type) | ||
50 | { | ||
51 | const char *result = NULL; | ||
52 | Index: pango-1.28.4/pango/pango-attributes.h | ||
53 | =================================================================== | ||
54 | --- pango-1.28.4.orig/pango/pango-attributes.h 2011-10-12 01:32:12.712046218 +0100 | ||
55 | +++ pango-1.28.4/pango/pango-attributes.h 2011-10-12 01:32:36.342045777 +0100 | ||
56 | @@ -180,7 +180,7 @@ | ||
57 | }; | ||
58 | |||
59 | PangoAttrType pango_attr_type_register (const gchar *name); | ||
60 | -G_CONST_RETURN char * pango_attr_type_get_name (PangoAttrType type) G_GNUC_CONST; | ||
61 | +const char * pango_attr_type_get_name (PangoAttrType type) G_GNUC_CONST; | ||
62 | |||
63 | void pango_attribute_init (PangoAttribute *attr, | ||
64 | const PangoAttrClass *klass); | ||
65 | Index: pango-1.28.4/pango/pango-context.c | ||
66 | =================================================================== | ||
67 | --- pango-1.28.4.orig/pango/pango-context.c 2011-10-12 01:32:09.782046152 +0100 | ||
68 | +++ pango-1.28.4/pango/pango-context.c 2011-10-12 01:32:34.532039187 +0100 | ||
69 | @@ -188,7 +188,7 @@ | ||
70 | * | ||
71 | * Since: 1.6 | ||
72 | **/ | ||
73 | -G_CONST_RETURN PangoMatrix * | ||
74 | +const PangoMatrix * | ||
75 | pango_context_get_matrix (PangoContext *context) | ||
76 | { | ||
77 | g_return_val_if_fail (PANGO_IS_CONTEXT (context), NULL); | ||
78 | Index: pango-1.28.4/pango/pango-context.h | ||
79 | =================================================================== | ||
80 | --- pango-1.28.4.orig/pango/pango-context.h 2011-10-12 01:32:12.892046153 +0100 | ||
81 | +++ pango-1.28.4/pango/pango-context.h 2011-10-12 01:32:36.352046105 +0100 | ||
82 | @@ -86,7 +86,7 @@ | ||
83 | |||
84 | void pango_context_set_matrix (PangoContext *context, | ||
85 | const PangoMatrix *matrix); | ||
86 | -G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext *context); | ||
87 | +const PangoMatrix *pango_context_get_matrix (PangoContext *context); | ||
88 | |||
89 | /* Break a string of Unicode characters into segments with | ||
90 | * consistent shaping/language engine and bidrectional level. | ||
91 | Index: pango-1.28.4/pango/pango-font.h | ||
92 | =================================================================== | ||
93 | --- pango-1.28.4.orig/pango/pango-font.h 2011-10-12 01:32:13.072046150 +0100 | ||
94 | +++ pango-1.28.4/pango/pango-font.h 2011-10-12 01:32:36.362046243 +0100 | ||
95 | @@ -117,7 +117,7 @@ | ||
96 | const char *family); | ||
97 | void pango_font_description_set_family_static (PangoFontDescription *desc, | ||
98 | const char *family); | ||
99 | -G_CONST_RETURN char *pango_font_description_get_family (const PangoFontDescription *desc) G_GNUC_PURE; | ||
100 | +const char *pango_font_description_get_family (const PangoFontDescription *desc) G_GNUC_PURE; | ||
101 | void pango_font_description_set_style (PangoFontDescription *desc, | ||
102 | PangoStyle style); | ||
103 | PangoStyle pango_font_description_get_style (const PangoFontDescription *desc) G_GNUC_PURE; | ||
104 | @@ -212,7 +212,7 @@ | ||
105 | void pango_font_family_list_faces (PangoFontFamily *family, | ||
106 | PangoFontFace ***faces, | ||
107 | int *n_faces); | ||
108 | -G_CONST_RETURN char *pango_font_family_get_name (PangoFontFamily *family) G_GNUC_PURE; | ||
109 | +const char *pango_font_family_get_name (PangoFontFamily *family) G_GNUC_PURE; | ||
110 | gboolean pango_font_family_is_monospace (PangoFontFamily *family) G_GNUC_PURE; | ||
111 | |||
112 | #ifdef PANGO_ENABLE_BACKEND | ||
113 | @@ -261,7 +261,7 @@ | ||
114 | GType pango_font_face_get_type (void) G_GNUC_CONST; | ||
115 | |||
116 | PangoFontDescription *pango_font_face_describe (PangoFontFace *face); | ||
117 | -G_CONST_RETURN char *pango_font_face_get_face_name (PangoFontFace *face) G_GNUC_PURE; | ||
118 | +const char *pango_font_face_get_face_name (PangoFontFace *face) G_GNUC_PURE; | ||
119 | void pango_font_face_list_sizes (PangoFontFace *face, | ||
120 | int **sizes, | ||
121 | int *n_sizes); | ||
122 | Index: pango-1.28.4/pango/pango-fontmap.c | ||
123 | =================================================================== | ||
124 | --- pango-1.28.4.orig/pango/pango-fontmap.c 2011-10-12 01:32:09.912046152 +0100 | ||
125 | +++ pango-1.28.4/pango/pango-fontmap.c 2011-10-12 01:32:34.542040267 +0100 | ||
126 | @@ -290,7 +290,7 @@ | ||
127 | * | ||
128 | * Since: 1.4 | ||
129 | **/ | ||
130 | -G_CONST_RETURN char * | ||
131 | +const char * | ||
132 | pango_font_map_get_shape_engine_type (PangoFontMap *fontmap) | ||
133 | { | ||
134 | g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL); | ||
135 | Index: pango-1.28.4/pango/pango-language.c | ||
136 | =================================================================== | ||
137 | --- pango-1.28.4.orig/pango/pango-language.c 2011-10-12 01:32:10.052046151 +0100 | ||
138 | +++ pango-1.28.4/pango/pango-language.c 2011-10-12 01:32:34.542040267 +0100 | ||
139 | @@ -319,7 +319,7 @@ | ||
140 | * Returns: a string representing the language tag. This is owned by | ||
141 | * Pango and should not be freed. | ||
142 | */ | ||
143 | -G_CONST_RETURN char * | ||
144 | +const char * | ||
145 | (pango_language_to_string) (PangoLanguage *language) | ||
146 | { | ||
147 | return pango_language_to_string (language); | ||
148 | @@ -531,7 +531,7 @@ | ||
149 | * Return value: the sample string. This value is owned by Pango | ||
150 | * and should not be freed. | ||
151 | **/ | ||
152 | -G_CONST_RETURN char * | ||
153 | +const char * | ||
154 | pango_language_get_sample_string (PangoLanguage *language) | ||
155 | { | ||
156 | const LangInfo *lang_info; | ||
157 | @@ -592,7 +592,7 @@ | ||
158 | |||
159 | * Since: 1.22 | ||
160 | **/ | ||
161 | -G_CONST_RETURN PangoScript * | ||
162 | +const PangoScript * | ||
163 | pango_language_get_scripts (PangoLanguage *language, | ||
164 | int *num_scripts) | ||
165 | { | ||
166 | Index: pango-1.28.4/pango/pango-language.h | ||
167 | =================================================================== | ||
168 | --- pango-1.28.4.orig/pango/pango-language.h 2011-10-12 01:32:13.262046150 +0100 | ||
169 | +++ pango-1.28.4/pango/pango-language.h 2011-10-12 01:32:36.362046243 +0100 | ||
170 | @@ -34,11 +34,11 @@ | ||
171 | GType pango_language_get_type (void) G_GNUC_CONST; | ||
172 | PangoLanguage *pango_language_from_string (const char *language); | ||
173 | |||
174 | -G_CONST_RETURN char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST; | ||
175 | +const char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST; | ||
176 | /* For back compat. Will have to keep indefinitely. */ | ||
177 | #define pango_language_to_string(language) ((const char *)language) | ||
178 | |||
179 | -G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST; | ||
180 | +const char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST; | ||
181 | PangoLanguage *pango_language_get_default (void) G_GNUC_CONST; | ||
182 | |||
183 | gboolean pango_language_matches (PangoLanguage *language, | ||
184 | @@ -48,7 +48,7 @@ | ||
185 | |||
186 | gboolean pango_language_includes_script (PangoLanguage *language, | ||
187 | PangoScript script) G_GNUC_PURE; | ||
188 | -G_CONST_RETURN PangoScript *pango_language_get_scripts (PangoLanguage *language, | ||
189 | +const PangoScript *pango_language_get_scripts (PangoLanguage *language, | ||
190 | int *num_scripts); | ||
191 | |||
192 | G_END_DECLS | ||
193 | Index: pango-1.28.4/pango/pango-layout.c | ||
194 | =================================================================== | ||
195 | --- pango-1.28.4.orig/pango/pango-layout.c 2011-10-12 01:32:10.072046151 +0100 | ||
196 | +++ pango-1.28.4/pango/pango-layout.c 2011-10-12 01:32:34.552041215 +0100 | ||
197 | @@ -677,7 +677,7 @@ | ||
198 | * | ||
199 | * Since: 1.8 | ||
200 | **/ | ||
201 | -G_CONST_RETURN PangoFontDescription * | ||
202 | +const PangoFontDescription * | ||
203 | pango_layout_get_font_description (PangoLayout *layout) | ||
204 | { | ||
205 | g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL); | ||
206 | @@ -1087,7 +1087,7 @@ | ||
207 | * | ||
208 | * Return value: the text in the @layout. | ||
209 | **/ | ||
210 | -G_CONST_RETURN char* | ||
211 | +const char* | ||
212 | pango_layout_get_text (PangoLayout *layout) | ||
213 | { | ||
214 | g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL); | ||
215 | Index: pango-1.28.4/pango/pango-layout.h | ||
216 | =================================================================== | ||
217 | --- pango-1.28.4.orig/pango/pango-layout.h 2011-10-12 01:32:13.302046150 +0100 | ||
218 | +++ pango-1.28.4/pango/pango-layout.h 2011-10-12 01:32:36.362046243 +0100 | ||
219 | @@ -116,7 +116,7 @@ | ||
220 | void pango_layout_set_font_description (PangoLayout *layout, | ||
221 | const PangoFontDescription *desc); | ||
222 | |||
223 | -G_CONST_RETURN PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout); | ||
224 | +const PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout); | ||
225 | |||
226 | void pango_layout_set_width (PangoLayout *layout, | ||
227 | int width); | ||
228 | Index: pango-1.28.4/pango/pango-ot-ruleset.c | ||
229 | =================================================================== | ||
230 | --- pango-1.28.4.orig/pango/pango-ot-ruleset.c 2011-10-12 01:32:10.152046150 +0100 | ||
231 | +++ pango-1.28.4/pango/pango-ot-ruleset.c 2011-10-12 01:32:34.552041215 +0100 | ||
232 | @@ -107,7 +107,7 @@ | ||
233 | * | ||
234 | * Since: 1.18 | ||
235 | **/ | ||
236 | -G_CONST_RETURN PangoOTRuleset * | ||
237 | +const PangoOTRuleset * | ||
238 | pango_ot_ruleset_get_for_description (PangoOTInfo *info, | ||
239 | const PangoOTRulesetDescription *desc) | ||
240 | { | ||
241 | Index: pango-1.28.4/pango/pango-renderer.c | ||
242 | =================================================================== | ||
243 | --- pango-1.28.4.orig/pango/pango-renderer.c 2011-10-12 01:32:10.192046151 +0100 | ||
244 | +++ pango-1.28.4/pango/pango-renderer.c 2011-10-12 01:32:34.562041682 +0100 | ||
245 | @@ -1352,7 +1352,7 @@ | ||
246 | * | ||
247 | * Since: 1.8 | ||
248 | **/ | ||
249 | -G_CONST_RETURN PangoMatrix * | ||
250 | +const PangoMatrix * | ||
251 | pango_renderer_get_matrix (PangoRenderer *renderer) | ||
252 | { | ||
253 | g_return_val_if_fail (PANGO_IS_RENDERER (renderer), NULL); | ||
254 | Index: pango-1.28.4/pango/pango-renderer.h | ||
255 | =================================================================== | ||
256 | --- pango-1.28.4.orig/pango/pango-renderer.h 2011-10-12 01:32:13.402046150 +0100 | ||
257 | +++ pango-1.28.4/pango/pango-renderer.h 2011-10-12 01:32:36.362046243 +0100 | ||
258 | @@ -249,7 +249,7 @@ | ||
259 | |||
260 | void pango_renderer_set_matrix (PangoRenderer *renderer, | ||
261 | const PangoMatrix *matrix); | ||
262 | -G_CONST_RETURN PangoMatrix *pango_renderer_get_matrix (PangoRenderer *renderer); | ||
263 | +const PangoMatrix *pango_renderer_get_matrix (PangoRenderer *renderer); | ||
264 | |||
265 | PangoLayout *pango_renderer_get_layout (PangoRenderer *renderer); | ||
266 | PangoLayoutLine *pango_renderer_get_layout_line (PangoRenderer *renderer); | ||
267 | Index: pango-1.28.4/pango/pango-script.c | ||
268 | =================================================================== | ||
269 | --- pango-1.28.4.orig/pango/pango-script.c 2011-10-12 01:32:10.212046151 +0100 | ||
270 | +++ pango-1.28.4/pango/pango-script.c 2011-10-12 01:32:34.562041682 +0100 | ||
271 | @@ -165,8 +165,8 @@ | ||
272 | **/ | ||
273 | void | ||
274 | pango_script_iter_get_range (PangoScriptIter *iter, | ||
275 | - G_CONST_RETURN char **start, | ||
276 | - G_CONST_RETURN char **end, | ||
277 | + const char **start, | ||
278 | + const char **end, | ||
279 | PangoScript *script) | ||
280 | { | ||
281 | if (start) | ||
282 | Index: pango-1.28.4/pango/pango-script.h | ||
283 | =================================================================== | ||
284 | --- pango-1.28.4.orig/pango/pango-script.h 2011-10-12 01:32:13.422046150 +0100 | ||
285 | +++ pango-1.28.4/pango/pango-script.h 2011-10-12 01:32:36.362046243 +0100 | ||
286 | @@ -129,8 +129,8 @@ | ||
287 | PangoScriptIter *pango_script_iter_new (const char *text, | ||
288 | int length); | ||
289 | void pango_script_iter_get_range (PangoScriptIter *iter, | ||
290 | - G_CONST_RETURN char **start, | ||
291 | - G_CONST_RETURN char **end, | ||
292 | + const char **start, | ||
293 | + const char **end, | ||
294 | PangoScript *script); | ||
295 | gboolean pango_script_iter_next (PangoScriptIter *iter); | ||
296 | void pango_script_iter_free (PangoScriptIter *iter); | ||
297 | Index: pango-1.28.4/pango/pango-utils.c | ||
298 | =================================================================== | ||
299 | --- pango-1.28.4.orig/pango/pango-utils.c 2011-10-12 01:32:10.242046149 +0100 | ||
300 | +++ pango-1.28.4/pango/pango-utils.c 2011-10-12 01:32:34.562041682 +0100 | ||
301 | @@ -689,7 +689,7 @@ | ||
302 | * Return value: the Pango sysconf directory. The returned string should | ||
303 | * not be freed. | ||
304 | */ | ||
305 | -G_CONST_RETURN char * | ||
306 | +const char * | ||
307 | pango_get_sysconf_subdirectory (void) | ||
308 | { | ||
309 | #ifdef G_OS_WIN32 | ||
310 | @@ -718,7 +718,7 @@ | ||
311 | * Return value: the Pango lib directory. The returned string should | ||
312 | * not be freed. | ||
313 | */ | ||
314 | -G_CONST_RETURN char * | ||
315 | +const char * | ||
316 | pango_get_lib_subdirectory (void) | ||
317 | { | ||
318 | #ifdef G_OS_WIN32 | ||
319 | Index: pango-1.28.4/pango/pango-utils.h | ||
320 | =================================================================== | ||
321 | --- pango-1.28.4.orig/pango/pango-utils.h 2011-10-12 01:32:13.512046149 +0100 | ||
322 | +++ pango-1.28.4/pango/pango-utils.h 2011-10-12 01:32:36.362046243 +0100 | ||
323 | @@ -82,13 +82,13 @@ | ||
324 | * stored in the registry). The returned string should not be | ||
325 | * g_free'd. | ||
326 | */ | ||
327 | -G_CONST_RETURN char * pango_get_sysconf_subdirectory (void) G_GNUC_PURE; | ||
328 | +const char * pango_get_sysconf_subdirectory (void) G_GNUC_PURE; | ||
329 | |||
330 | /* Ditto for LIBDIR/pango. On Win32, use the same Pango | ||
331 | * installation directory. This returned string should not be | ||
332 | * g_free'd either. | ||
333 | */ | ||
334 | -G_CONST_RETURN char * pango_get_lib_subdirectory (void) G_GNUC_PURE; | ||
335 | +const char * pango_get_lib_subdirectory (void) G_GNUC_PURE; | ||
336 | |||
337 | #endif /* PANGO_ENABLE_BACKEND */ | ||
338 | |||
339 | @@ -131,10 +131,10 @@ | ||
340 | int pango_version (void) G_GNUC_CONST; | ||
341 | |||
342 | /* Return run-time Pango version as an string */ | ||
343 | -G_CONST_RETURN char * pango_version_string (void) G_GNUC_CONST; | ||
344 | +const char * pango_version_string (void) G_GNUC_CONST; | ||
345 | |||
346 | /* Check that run-time Pango is as new as required */ | ||
347 | -G_CONST_RETURN char * pango_version_check (int required_major, | ||
348 | +const char * pango_version_check (int required_major, | ||
349 | int required_minor, | ||
350 | int required_micro) G_GNUC_CONST; | ||
351 | |||
352 | Index: pango-1.28.4/pango/pangocairo-context.c | ||
353 | =================================================================== | ||
354 | --- pango-1.28.4.orig/pango/pangocairo-context.c 2011-10-12 01:32:09.622046154 +0100 | ||
355 | +++ pango-1.28.4/pango/pangocairo-context.c 2011-10-12 01:32:34.522037975 +0100 | ||
356 | @@ -260,7 +260,7 @@ | ||
357 | * | ||
358 | * Since: 1.10 | ||
359 | **/ | ||
360 | -G_CONST_RETURN cairo_font_options_t * | ||
361 | +const cairo_font_options_t * | ||
362 | pango_cairo_context_get_font_options (PangoContext *context) | ||
363 | { | ||
364 | PangoCairoContextInfo *info; | ||
365 | @@ -286,7 +286,7 @@ | ||
366 | * Return value: the combined set of font options. This value is owned | ||
367 | * by the context and must not be modified or freed. | ||
368 | **/ | ||
369 | -G_CONST_RETURN cairo_font_options_t * | ||
370 | +const cairo_font_options_t * | ||
371 | _pango_cairo_context_get_merged_font_options (PangoContext *context) | ||
372 | { | ||
373 | PangoCairoContextInfo *info = get_context_info (context, TRUE); | ||
374 | Index: pango-1.28.4/pango/pangoft2.c | ||
375 | =================================================================== | ||
376 | --- pango-1.28.4.orig/pango/pangoft2.c 2011-10-12 01:32:09.942046152 +0100 | ||
377 | +++ pango-1.28.4/pango/pangoft2.c 2011-10-12 01:32:34.542040267 +0100 | ||
378 | @@ -520,7 +520,7 @@ | ||
379 | return ((ft_error_description *) pkey)->code - ((ft_error_description *) pbase)->code; | ||
380 | } | ||
381 | |||
382 | -G_CONST_RETURN char * | ||
383 | +const char * | ||
384 | _pango_ft2_ft_strerror (FT_Error error) | ||
385 | { | ||
386 | #undef __FTERRORS_H__ | ||
387 | Index: pango-1.28.4/pango/pangox-fontmap.c | ||
388 | =================================================================== | ||
389 | --- pango-1.28.4.orig/pango/pangox-fontmap.c 2011-10-12 01:32:10.352046151 +0100 | ||
390 | +++ pango-1.28.4/pango/pangox-fontmap.c 2011-10-12 01:32:34.572042704 +0100 | ||
391 | @@ -1441,7 +1441,7 @@ | ||
392 | } | ||
393 | |||
394 | |||
395 | -G_CONST_RETURN char * | ||
396 | +const char * | ||
397 | pango_x_fontmap_name_from_atom (PangoFontMap *fontmap, | ||
398 | Atom atom) | ||
399 | { | ||
400 | @@ -1645,7 +1645,7 @@ | ||
401 | } | ||
402 | } | ||
403 | |||
404 | -static G_CONST_RETURN char * | ||
405 | +static const char * | ||
406 | pango_x_family_get_name (PangoFontFamily *family) | ||
407 | { | ||
408 | PangoXFamily *xfamily = PANGO_X_FAMILY (family); | ||
diff --git a/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch b/meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch index 3f00ad8de5..3f00ad8de5 100644 --- a/meta/recipes-graphics/pango/pango-1.28.4/multilib-fix-clean.patch +++ b/meta/recipes-graphics/pango/pango-1.30.0/multilib-fix-clean.patch | |||
diff --git a/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch b/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch new file mode 100644 index 0000000000..5a6e4c1a13 --- /dev/null +++ b/meta/recipes-graphics/pango/pango-1.30.0/no-tests.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Index: pango-1.30.0/Makefile.am | ||
2 | =================================================================== | ||
3 | --- pango-1.30.0.orig/Makefile.am 2011-08-16 04:11:08.000000000 +0300 | ||
4 | +++ pango-1.30.0/Makefile.am 2012-08-06 12:48:27.000000000 +0300 | ||
5 | @@ -1,6 +1,6 @@ | ||
6 | ## Process this file with automake to create Makefile.in. | ||
7 | |||
8 | -SUBDIRS= pango modules pango-view examples docs tools tests build | ||
9 | +SUBDIRS= pango modules pango-view examples docs tools build | ||
10 | |||
11 | EXTRA_DIST = \ | ||
12 | autogen.sh \ | ||
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb deleted file mode 100644 index 48695920d1..0000000000 --- a/meta/recipes-graphics/pango/pango_1.28.4.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | require pango.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
4 | |||
5 | PR = "r9" | ||
6 | |||
7 | SRC_URI += "file://no-tests.patch \ | ||
8 | file://noconst.patch \ | ||
9 | file://multilib-fix-clean.patch" | ||
10 | |||
11 | SRC_URI[archive.md5sum] = "3f3989700f04e9117d30544a9078b3a0" | ||
12 | SRC_URI[archive.sha256sum] = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f" | ||
13 | |||
14 | #PARALLEL_MAKE = "" | ||
diff --git a/meta/recipes-graphics/pango/pango_1.30.0.bb b/meta/recipes-graphics/pango/pango_1.30.0.bb new file mode 100644 index 0000000000..25101f2ea2 --- /dev/null +++ b/meta/recipes-graphics/pango/pango_1.30.0.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | require pango.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
4 | |||
5 | PR = "r0" | ||
6 | |||
7 | GNOME_COMPRESS_TYPE="xz" | ||
8 | |||
9 | SRC_URI += "file://no-tests.patch \ | ||
10 | file://multilib-fix-clean.patch" | ||
11 | |||
12 | SRC_URI[archive.md5sum] = "2a70627ffd9f43c52c04cc0b05fe359f" | ||
13 | SRC_URI[archive.sha256sum] = "7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff" | ||
14 | |||
15 | #PARALLEL_MAKE = "" | ||