git: 1f905384aff9 - main - x11-toolkits/pangox-compat: fix build with clang 16
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 May 2023 17:21:13 UTC
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f905384aff97cb61995ae241e77261bc109a865 commit 1f905384aff97cb61995ae241e77261bc109a865 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-05-29 16:44:45 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2023-05-29 17:20:12 +0000 x11-toolkits/pangox-compat: fix build with clang 16 Clang 16 has a new error about incompatible function types, which shows up when building x11-toolkits/pangox-compat: basic-x.c:687:23: error: incompatible function pointer types assigning to 'void (*)(PangoEngineShape *, PangoFont *, const char *, unsigned int, const PangoAnalysis *, PangoGlyphString *, const char *, unsigned int)' (aka 'void (*)(struct _PangoEngineShape *, struct _PangoFont *, const char *, unsigned int, const struct _PangoAnalysis *, struct _PangoGlyphString *, const char *, unsigned int)') from 'void (PangoEngineShape *, PangoFont *, const char *, gint, const PangoAnalysis *, PangoGlyphString *)' (aka 'void (struct _PangoEngineShape *, struct _PangoFont *, const char *, int, const struct _PangoAnalysis *, struct _PangoGlyphString *)') [-Wincompatible-function-pointer-types] class->script_shape = basic_engine_shape; ^ ~~~~~~~~~~~~~~~~~~ This is because the 'script_shape' callback function in pango 1.50 has the 'length' argument as 'unsigned int', and also two additional parameters 'paragraph_text' and 'paragraph_length'. Even though it looks like this callback function is never used, correct the arguments to fix the error. PR: 271709 Approved by: fluffy (maintainer) MFH: 2023Q2 --- x11-toolkits/pangox-compat/Makefile | 2 +- x11-toolkits/pangox-compat/files/patch-basic-x.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/pangox-compat/Makefile b/x11-toolkits/pangox-compat/Makefile index 52cb317a78fb..010b13432572 100644 --- a/x11-toolkits/pangox-compat/Makefile +++ b/x11-toolkits/pangox-compat/Makefile @@ -1,6 +1,6 @@ PORTNAME= pangox-compat DISTVERSION= 0.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/pangox-compat/files/patch-basic-x.c b/x11-toolkits/pangox-compat/files/patch-basic-x.c new file mode 100644 index 000000000000..54438bc31cc2 --- /dev/null +++ b/x11-toolkits/pangox-compat/files/patch-basic-x.c @@ -0,0 +1,16 @@ +--- basic-x.c.orig 2012-08-27 23:19:32 UTC ++++ basic-x.c +@@ -556,9 +556,11 @@ basic_engine_shape (PangoEngineShape *engine G_GNUC_UN + basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, + PangoFont *font, + const char *text, +- gint length, ++ unsigned int length, + const PangoAnalysis *analysis, +- PangoGlyphString *glyphs) ++ PangoGlyphString *glyphs, ++ const char *paragraph_text G_GNUC_UNUSED, ++ unsigned int paragraph_length G_GNUC_UNUSED) + { + int n_chars; + int i;