diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/meson-junit-report.py | 2 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | docs/pango.toml.in | 2 | ||||
| -rw-r--r-- | docs/pangocairo.toml.in | 2 | ||||
| -rw-r--r-- | docs/pangofc.toml.in | 2 | ||||
| -rw-r--r-- | docs/pangoft2.toml.in | 2 | ||||
| -rw-r--r-- | docs/pangoot.toml.in | 2 | ||||
| -rw-r--r-- | docs/pangoxft.toml.in | 2 | ||||
| -rw-r--r-- | pango/break-thai.c | 14 |
10 files changed, 22 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfe5f790..3b9f5200 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,4 +140,4 @@ pages: paths: - public only: - - master + - main diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py index fc96efba..aaa3f45a 100755 --- a/.gitlab-ci/meson-junit-report.py +++ b/.gitlab-ci/meson-junit-report.py @@ -24,7 +24,7 @@ aparser.add_argument('--job-id', metavar='ID', default='Unknown') aparser.add_argument('--branch', metavar='NAME', help='Branch of the project being tested', - default='master') + default='main') aparser.add_argument('--output', metavar='FILE', help='The output file, stdout by default', type=argparse.FileType('w', encoding='UTF-8'), @@ -1,3 +1,8 @@ +Overview of changes +=================== + +* Rename git `master` branch to `main` (#579) + Overview of changes in 1.48.7 ============================= - Fix a thread-safety issue in fontmap initialization diff --git a/docs/pango.toml.in b/docs/pango.toml.in index 56705fe8..c4a1c11e 100644 --- a/docs/pango.toml.in +++ b/docs/pango.toml.in @@ -54,7 +54,7 @@ name = "basic" show_index_summary = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/main/" [extra] content_files = [ diff --git a/docs/pangocairo.toml.in b/docs/pangocairo.toml.in index 3d41b82f..2c552714 100644 --- a/docs/pangocairo.toml.in +++ b/docs/pangocairo.toml.in @@ -27,7 +27,7 @@ name = "basic" show_index_summary = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/main/" [extra] content_files = [ diff --git a/docs/pangofc.toml.in b/docs/pangofc.toml.in index 061ff072..f78e7d0a 100644 --- a/docs/pangofc.toml.in +++ b/docs/pangofc.toml.in @@ -27,7 +27,7 @@ name = "basic" show_index_summary = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/main/" [extra] diff --git a/docs/pangoft2.toml.in b/docs/pangoft2.toml.in index c44dfe7f..ad6bdcd2 100644 --- a/docs/pangoft2.toml.in +++ b/docs/pangoft2.toml.in @@ -27,7 +27,7 @@ name = "basic" show_index_summary = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/main/" [extra] diff --git a/docs/pangoot.toml.in b/docs/pangoot.toml.in index 531cd640..c319ca79 100644 --- a/docs/pangoot.toml.in +++ b/docs/pangoot.toml.in @@ -22,7 +22,7 @@ name = "basic" show_index_summary = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/main/" [extra] diff --git a/docs/pangoxft.toml.in b/docs/pangoxft.toml.in index d117b388..6b87476d 100644 --- a/docs/pangoxft.toml.in +++ b/docs/pangoxft.toml.in @@ -27,7 +27,7 @@ name = "basic" show_index_summary = true [source-location] -base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/master/" +base_url = "https://gitlab.gnome.org/GNOME/pango/-/blob/main/" [extra] content_files = [ diff --git a/pango/break-thai.c b/pango/break-thai.c index 85b9e54a..871c0869 100644 --- a/pango/break-thai.c +++ b/pango/break-thai.c @@ -27,8 +27,10 @@ #include <thai/thwchar.h> #include <thai/thbrk.h> -#ifndef HAVE_TH_BRK_FIND_BREAKS -G_LOCK_DEFINE_STATIC (th_brk); +G_LOCK_DEFINE_STATIC (thai_brk); + +#ifdef HAVE_TH_BRK_FIND_BREAKS +static ThBrk *thai_brk = NULL; #endif /* @@ -79,13 +81,15 @@ break_thai (const char *text, /* find line break positions */ + G_LOCK (thai_brk); #ifdef HAVE_TH_BRK_FIND_BREAKS - len = th_brk_find_breaks(NULL, tis_text, brk_pnts, cnt); + if (thai_brk == NULL) + thai_brk = th_brk_new(NULL); + len = th_brk_find_breaks(thai_brk, tis_text, brk_pnts, cnt); #else - G_LOCK (th_brk); len = th_brk (tis_text, brk_pnts, cnt); - G_UNLOCK (th_brk); #endif + G_UNLOCK (thai_brk); for (cnt = 0; cnt < len; cnt++) if (attrs[brk_pnts[cnt]].is_char_break) |