x11-toolkits/pangox-compat: fix build with clang 15
During an exp-run for llvm 15 (see bug 265425), it turned out that x11-toolkits/pangox-compat failed to build with clang 15: pangox.c:983:15: error: incompatible integer to pointer conversion assigning to 'PangoFontMetrics *' (aka 'struct _PangoFontMetrics *') from 'int' [-Wint-conversion] metrics = pango_font_metrics_new (); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ pangox-fontmap.c:944:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion] char *files_str = pango_config_key_get ("PangoX/AliasFiles"); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is because pangox-compat uses two private functions from the main pango library, which are not declared in the public pango headers. Fix the errors by adding the two private functions in pango-impl-utils.h, copying the declarations from pango-font-private.h and pango-utils-private.h. PR: 268301 Approved by: fluffy (maintainer) MFH: 2022Q4
This commit is contained in:
parent
e3f34f8a65
commit
c7823054d4
|
@ -0,0 +1,14 @@
|
|||
--- pango-impl-utils.h.orig 2012-08-27 23:19:32 UTC
|
||||
+++ pango-impl-utils.h
|
||||
@@ -174,6 +174,11 @@ pango_glyph_string_reverse_range (PangoGlyphString *gl
|
||||
}
|
||||
}
|
||||
|
||||
+/* From pango-font-private.h */
|
||||
+PangoFontMetrics *pango_font_metrics_new (void);
|
||||
+
|
||||
+/* From pango-utils-private.h */
|
||||
+char *pango_config_key_get (const char *key);
|
||||
|
||||
G_END_DECLS
|
||||
|
Loading…
Reference in New Issue