44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From e6ec698be127822661e31f7fca7d2e0107944b24 Mon Sep 17 00:00:00 2001
|
|
From: Yaakov Selkowitz <yselkowi@redhat.com>
|
|
Date: Tue, 17 Sep 2024 13:58:46 -0400
|
|
Subject: [PATCH] Fix build with glib 2.82
|
|
|
|
g_utf8_next_char no longer includes a cast to char* as of this change:
|
|
|
|
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4016
|
|
|
|
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
|
|
---
|
|
src/paps.cc | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/src/paps.cc
|
|
+++ b/src/paps.cc
|
|
@@ -1129,7 +1129,7 @@ split_text_into_paragraphs (PangoContext
|
|
while (p != nullptr && *p)
|
|
{
|
|
wc = g_utf8_get_char (p);
|
|
- next = g_utf8_next_char (p);
|
|
+ next = (char *) g_utf8_next_char (p);
|
|
if (wc == (gunichar)-1)
|
|
{
|
|
fprintf (stderr, _("%s: Invalid character in input\n"), g_get_prgname ());
|
|
@@ -1144,7 +1144,7 @@ split_text_into_paragraphs (PangoContext
|
|
para->length = p - last_para;
|
|
/* handle dos line breaks */
|
|
if (wc == '\r' && *next == '\n')
|
|
- next = g_utf8_next_char(next);
|
|
+ next = (char *) g_utf8_next_char(next);
|
|
para->layout = pango_layout_new (pango_context);
|
|
|
|
if (page_layout->cpi > 0.0L)
|
|
@@ -1215,7 +1215,7 @@ split_text_into_paragraphs (PangoContext
|
|
g_free (newtext);
|
|
|
|
para->length = i;
|
|
- next = g_utf8_offset_to_pointer (para->text, para->length);
|
|
+ next = (char *) g_utf8_offset_to_pointer (para->text, para->length);
|
|
wc = g_utf8_get_char (g_utf8_prev_char (next));
|
|
}
|
|
else
|