Merge branch 'bump-ci-image' into 'main'

ci: Rebase the image to Fedora 34

See merge request GNOME/pango!542

3 files changed, 10 insertions, 4 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6195501c..e93f7dea 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:v7
+  FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v8
 
 .only-default:
   only:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index e905deee..a7600b46 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:34
 
 RUN dnf -y install \
     abattis-cantarell-fonts \
@@ -33,6 +33,7 @@ RUN dnf -y install \
     libubsan \
     libXft-devel \
     llvm \
+    meson \
     ninja-build \
     python3 \
     python3-jinja2 \
@@ -46,8 +47,6 @@ RUN dnf -y install \
     thai-scalable-waree-fonts \
  && dnf clean all
 
-RUN pip3 install meson==0.56
-
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
diff --git a/NEWS b/NEWS
index 0f7cc078..b3c0ae0b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Overview of changes
+===================
+* Fix a crash in tab handling
+* Fix tab positioning without line wrapping
+* Fix an assertion failure found by fuzzing
+* Make underlines work again for broken fonts
+
 Overview of changes in 1.50.0, 02-12-2021
 =========================================
 * Fix glyph placement in gravity east