pango: 1.50.13

This commit is contained in:
Owen Rafferty 2023-02-20 17:46:02 -06:00
parent 2068901d3e
commit c8f1ff6dc6
No known key found for this signature in database
3 changed files with 35 additions and 27 deletions

View File

@ -1,2 +1,2 @@
562e6594e0a605fc3a513b95063e1cc35f6d2dbee8978195c4051be4a38502c207
7e302c66e91be63160d6bdf0580549bc511295d689f3ee4a333c6d320ec24b9df7
afdd6742a0791cba06fe6935ed1294582a42abd4664a8c22828f481b85ff5b42d4
afad7fce3afe98072131cf4b97ec0d00340ea316812df9ae78c1d785121583c063

View File

@ -1,8 +1,8 @@
diff --git a/meson.build b/meson.build
index acead2d..2e51d8a 100644
index 50ec14b..f45dd6a 100644
--- a/meson.build
+++ b/meson.build
@@ -226,7 +226,6 @@ endif
@@ -200,7 +200,6 @@ endif
pango_deps = []
glib_req_version = '>= 2.62'
@ -10,31 +10,32 @@ index acead2d..2e51d8a 100644
libthai_req_version = '>= 0.1.9'
harfbuzz_req_version = '>= 2.6.0'
fontconfig_req_version = '>= 2.13.0'
@@ -246,10 +245,6 @@ gio_dep = dependency('gio-2.0', version: glib_req_version,
fallback: ['glib', 'libgio_dep'])
@@ -217,10 +216,6 @@ gobject_dep = dependency('gobject-2.0', version: glib_req_version)
gio_dep = dependency('gio-2.0', version: glib_req_version)
pango_deps += [glib_dep, gobject_dep, gio_dep]
-fribidi_dep = dependency('fribidi', version: fribidi_req_version,
- fallback: ['fribidi', 'libfribidi_dep'],
- default_options: ['docs=false'])
-pango_deps += fribidi_dep
-
thai_dep = dependency('libthai', version: libthai_req_version, required: get_option('libthai'))
if thai_dep.found()
pango_conf.set('HAVE_LIBTHAI', 1)
diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c
index 40123a6..328e617 100644
index 4277dc1..73d3476 100644
--- a/pango/pango-bidi-type.c
+++ b/pango/pango-bidi-type.c
@@ -23,13 +23,21 @@
@@ -23,14 +23,21 @@
#include <string.h>
-#include <fribidi.h>
-
#undef PANGO_DISABLE_DEPRECATED
#include "pango-bidi-type.h"
#include "pango-utils.h"
#include "pango-utils-private.h"
+typedef uint32_t FriBidiChar;
+typedef uint32_t FriBidiCharType;
@ -48,7 +49,7 @@ index 40123a6..328e617 100644
/**
* pango_bidi_type_for_unichar:
* @ch: a Unicode character
@@ -48,41 +56,7 @@
@@ -49,41 +56,7 @@
PangoBidiType
pango_bidi_type_for_unichar (gunichar ch)
{
@ -91,13 +92,15 @@ index 40123a6..328e617 100644
}
/* Some bidi-related functions */
@@ -117,36 +91,12 @@ pango_log2vis_get_embedding_levels (const gchar *text,
glong n_chars, i;
guint8 *embedding_levels_list;
@@ -136,38 +109,14 @@ pango_log2vis_fill_embedding_levels (const gchar *text,
{
glong i;
const gchar *p;
- FriBidiParType fribidi_base_dir;
FriBidiCharType *bidi_types;
FriBidiCharType bidi_types_[64];
FriBidiBracketType *bracket_types;
FriBidiBracketType bracket_types_[64];
- FriBidiLevel max_level;
- FriBidiCharType ored_types = 0;
- FriBidiCharType anded_strongs = FRIBIDI_TYPE_RLE;
@ -125,10 +128,10 @@ index 40123a6..328e617 100644
- break;
- }
-
if (length < 0)
length = strlen (text);
@@ -158,20 +108,11 @@ pango_log2vis_get_embedding_levels (const gchar *text,
if (n_chars < 64)
{
bidi_types = bidi_types_;
@@ -181,20 +130,11 @@ pango_log2vis_fill_embedding_levels (const gchar *text,
for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
{
@ -151,7 +154,7 @@ index 40123a6..328e617 100644
}
/* Short-circuit (malloc-expensive) FriBidi call for unidirectional
@@ -188,56 +129,11 @@ pango_log2vis_get_embedding_levels (const gchar *text,
@@ -211,59 +151,14 @@ pango_log2vis_fill_embedding_levels (const gchar *text,
* o base_dir doesn't have an RTL taste.
* o there are letters, and base_dir is weak.
*/
@ -201,15 +204,18 @@ index 40123a6..328e617 100644
- }
-
-resolved:
if (n_chars >= 64)
{
g_free (bidi_types);
g_free (bracket_types);
}
- *pbase_dir = (fribidi_base_dir == FRIBIDI_PAR_LTR) ? PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL;
+ *pbase_dir = PANGO_DIRECTION_LTR;
return embedding_levels_list;
}
@@ -261,17 +157,6 @@ resolved:
/**
@@ -285,18 +180,7 @@ resolved:
PangoDirection
pango_unichar_direction (gunichar ch)
{
@ -224,6 +230,8 @@ index 40123a6..328e617 100644
- else if (FRIBIDI_IS_RTL (fribidi_ch_type))
- return PANGO_DIRECTION_RTL;
- else
return PANGO_DIRECTION_LTR;
- return PANGO_DIRECTION_LTR;
+ return PANGO_DIRECTION_LTR;
}

View File

@ -1 +1 @@
1.50.12 1
1.50.13 1