From eb03a367055cf1efdcda44bccc7cbcdc0dd16bdb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 13 Dec 2022 11:56:55 -0500
Subject: ci: Update the Fedora image to F37

gi-docgen is unhappy on older Fedoras.
---
 .gitlab-ci.yml               | 2 +-
 .gitlab-ci/fedora.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b8d413c..af18fc3a 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:v9
+  FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v10
 
 .only-default:
   only:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 73ade0c4..dbf85908 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:37
 
 RUN dnf -y install \
     abattis-cantarell-fonts \
-- 
cgit v1.2.1


From 87b32d2ee37ae8b2768e0025aa6c85778489a145 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 13 Dec 2022 12:56:26 -0500
Subject: Update test results

Newer harfbuzz in F37 changes this.
---
 tests/layouts/valid-20.layout | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/layouts/valid-20.layout b/tests/layouts/valid-20.layout
index db692b73..5b2bcf15 100644
--- a/tests/layouts/valid-20.layout
+++ b/tests/layouts/valid-20.layout
@@ -40,7 +40,7 @@
     "is-wrapped" : false,
     "is-ellipsized" : false,
     "unknown-glyphs" : 0,
-    "width" : 67584,
+    "width" : 76800,
     "height" : 25600,
     "log-attrs" : [
       {
@@ -138,7 +138,7 @@
             "glyphs" : [
               {
                 "glyph" : 244,
-                "width" : 15360,
+                "width" : 18432,
                 "x-offset" : 14764,
                 "y-offset" : 3845,
                 "is-cluster-start" : true,
@@ -146,7 +146,7 @@
               },
               {
                 "glyph" : 272,
-                "width" : 15360,
+                "width" : 18432,
                 "x-offset" : 14764,
                 "y-offset" : 4280,
                 "is-cluster-start" : true,
@@ -154,7 +154,7 @@
               },
               {
                 "glyph" : 273,
-                "width" : 15360,
+                "width" : 18432,
                 "x-offset" : 14764,
                 "y-offset" : 3507,
                 "is-cluster-start" : true,
-- 
cgit v1.2.1