kiss-community/repo
2
0
Fork 1
mirror of https://codeberg.org/kiss-community/repo synced 2025-04-01 10:42:52 -06:00
Code Issues Wiki

pango: fix llvm 13. See #343

Browse Source
This commit is contained in:
Dylan Araps 2021-10-02 17:39:41 +03:00
parent b4901ca141
commit 0662ae909c
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/pango/checksums
View File

@ -1,2 +1,2 @@
be2899f8354f0e774b1ee59e0ffccdfb1d0f92627fc51d32b90b62449c077693 be2899f8354f0e774b1ee59e0ffccdfb1d0f92627fc51d32b90b62449c077693
b726d0e9e0a423bc4cd7de264c67cb22bf8256a9dde503fa9bcedaa220679bfe 28282fe8e26ca9b30976933ca26d1336a29c995570d83c7417c14db7f2b012b9

19
extra/pango/patches/no-fribidi.patch
View File

@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index c03bf85..a5bd314 100644 index 6d8de0b..93141b0 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -191,7 +191,6 @@ endif @@ -191,7 +191,6 @@ endif
@ -22,7 +22,7 @@ index c03bf85..a5bd314 100644
thai_dep = dependency('libthai', version: libthai_req_version, required: get_option('libthai')) thai_dep = dependency('libthai', version: libthai_req_version, required: get_option('libthai'))
if thai_dep.found() if thai_dep.found()
diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c
index 32858f7..1e4abed 100644 index 32858f7..ca8adfc 100644
--- a/pango/pango-bidi-type.c --- a/pango/pango-bidi-type.c
+++ b/pango/pango-bidi-type.c +++ b/pango/pango-bidi-type.c
@@ -23,13 +23,20 @@ @@ -23,13 +23,20 @@
@ -90,15 +90,15 @@ index 32858f7..1e4abed 100644
} }
/* Some bidi-related functions */ /* Some bidi-related functions */
@@ -116,36 +90,14 @@ pango_log2vis_get_embedding_levels (const gchar *text, @@ -116,36 +90,12 @@ pango_log2vis_get_embedding_levels (const gchar *text,
glong n_chars, i; glong n_chars, i;
guint8 *embedding_levels_list; guint8 *embedding_levels_list;
const gchar *p; const gchar *p;
- FriBidiParType fribidi_base_dir; - FriBidiParType fribidi_base_dir;
FriBidiCharType *bidi_types; FriBidiCharType *bidi_types;
FriBidiBracketType *bracket_types; FriBidiBracketType *bracket_types;
FriBidiLevel max_level; - FriBidiLevel max_level;
FriBidiCharType ored_types = 0; - FriBidiCharType ored_types = 0;
- FriBidiCharType anded_strongs = FRIBIDI_TYPE_RLE; - FriBidiCharType anded_strongs = FRIBIDI_TYPE_RLE;
G_STATIC_ASSERT (sizeof (FriBidiLevel) == sizeof (guint8)); G_STATIC_ASSERT (sizeof (FriBidiLevel) == sizeof (guint8));
@ -127,7 +127,7 @@ index 32858f7..1e4abed 100644
if (length < 0) if (length < 0)
length = strlen (text); length = strlen (text);
@@ -157,20 +109,12 @@ pango_log2vis_get_embedding_levels (const gchar *text, @@ -157,20 +107,11 @@ pango_log2vis_get_embedding_levels (const gchar *text,
for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++) for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
{ {
@ -146,12 +146,11 @@ index 32858f7..1e4abed 100644
- else - else
- bracket_types[i] = FRIBIDI_NO_BRACKET; - bracket_types[i] = FRIBIDI_NO_BRACKET;
+ bidi_types[i] = FRIBIDI_PAR_LTR; + bidi_types[i] = FRIBIDI_PAR_LTR;
+ ored_types |= FRIBIDI_PAR_LTR;
+ bracket_types[i] = 0; + bracket_types[i] = 0;
} }
/* Short-circuit (malloc-expensive) FriBidi call for unidirectional /* Short-circuit (malloc-expensive) FriBidi call for unidirectional
@@ -187,56 +131,13 @@ pango_log2vis_get_embedding_levels (const gchar *text, @@ -187,56 +128,12 @@ pango_log2vis_get_embedding_levels (const gchar *text,
* o base_dir doesn't have an RTL taste. * o base_dir doesn't have an RTL taste.
* o there are letters, and base_dir is weak. * o there are letters, and base_dir is weak.
*/ */
@ -200,7 +199,7 @@ index 32858f7..1e4abed 100644
- memset (embedding_levels_list, 0, length); - memset (embedding_levels_list, 0, length);
- } - }
resolved: -resolved:
g_free (bidi_types); g_free (bidi_types);
g_free (bracket_types); g_free (bracket_types);
@ -209,7 +208,7 @@ index 32858f7..1e4abed 100644
return embedding_levels_list; return embedding_levels_list;
} }
@@ -260,17 +161,6 @@ resolved: @@ -260,17 +157,6 @@ resolved:
PangoDirection PangoDirection
pango_unichar_direction (gunichar ch) pango_unichar_direction (gunichar ch)
{ {