diff options
| author | Simon McVittie <smcv@debian.org> | 2020-11-05 11:01:23 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2020-11-06 11:13:27 +0000 |
| commit | 28b76b8537ca67cba2bf28ead2eec8100345f135 (patch) | |
| tree | 43eac2047becdab936563d2f558b2b8fc81099c4 | |
| parent | 555b65ebfd22809a5833711f33bf67f819bd0efe (diff) | |
ft2, xft: Write out the full type of the SubstituteFunc
If the SubstituteFunc used for the now-deprecated set_default_substitute
functions is an alias for PangoFcSubstituteFunc, GObject-Introspection
doesn't realise it's a function pointer, and doesn't flag the user data
and destroy-notify arguments as such. This results in bindings like
PyGI thinking that they are entirely separate arguments, which is an
introspection API break (and probably not something that can
practically be called any more).
Signed-off-by: Simon McVittie <smcv@debian.org>
Bug: https://gitlab.gnome.org/GNOME/pango/-/issues/510
Applied-upstream: 1.47.1, commit:d770d498bff51ae0320fc0447cfcb1de53ea0a29
Gbp-Pq: Name ft2-xft-Write-out-the-full-type-of-the-SubstituteFunc.patch
| -rw-r--r-- | pango/pangoft2.h | 3 | ||||
| -rw-r--r-- | pango/pangoxft.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pango/pangoft2.h b/pango/pangoft2.h index 892aa039..96228316 100644 --- a/pango/pangoft2.h +++ b/pango/pangoft2.h @@ -67,7 +67,8 @@ typedef struct _PangoFT2FontMap PangoFT2FontMap; * * Function type for doing final config tweaking on prepared FcPatterns. */ -typedef PangoFcSubstituteFunc PangoFT2SubstituteFunc; +typedef void (*PangoFT2SubstituteFunc) (FcPattern *pattern, + gpointer data); /* Calls for applications */ diff --git a/pango/pangoxft.h b/pango/pangoxft.h index eb17f97c..0852c202 100644 --- a/pango/pangoxft.h +++ b/pango/pangoxft.h @@ -85,7 +85,8 @@ typedef struct _PangoXftFont PangoXftFont; * * Function type for doing final config tweaking on prepared FcPatterns. */ -typedef PangoFcSubstituteFunc PangoXftSubstituteFunc; +typedef void (*PangoXftSubstituteFunc) (FcPattern *pattern, + gpointer data); /* Calls for applications */ |