diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-04 01:28:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-04 01:28:08 +0000 |
| commit | 896bf51b0d525c7393d04eca2d57c838df406dfe (patch) | |
| tree | b57e53023d46100e2929456f5b8ea6b86c30f452 | |
| parent | ce3ff3508b9fd9413c5c7d6fbd2f59c7b287ba26 (diff) | |
| parent | 124cab53b3ea4f1ad555131ad9708869e13ffd1b (diff) | |
| download | pango-896bf51b0d525c7393d04eca2d57c838df406dfe.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/pango!266
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/fedora.Dockerfile | 2 | ||||
| -rw-r--r-- | pango/pango-layout.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a519504a..428b3ff6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: variables: COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror" MESON_TEST_TIMEOUT_MULTIPLIER: 2 - FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v3 + FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v4 linux-fedora: image: $FEDORA_IMAGE diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 9447bdb1..c1d0e5c4 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -41,7 +41,7 @@ RUN dnf -y install \ thai-scalable-waree-fonts \ && dnf clean all -RUN pip3 install meson==0.54.3 +RUN pip3 install meson==0.56 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 68ffd190..88e142af 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -407,7 +407,7 @@ pango_layout_get_width (PangoLayout *layout) * paragraph. That is, the total number of lines shown may well be more than * this value if the layout contains multiple paragraphs of text. * The default value of -1 means that first line of each paragraph is ellipsized. - * This behvaior may be changed in the future to act per layout instead of per + * This behavior may be changed in the future to act per layout instead of per * paragraph. File a bug against pango at <ulink * url="http://bugzilla.gnome.org/">http://bugzilla.gnome.org/</ulink> if your * code relies on this behavior. |