Update CI to Fedora 38

.gitlab-ci.yml

@@ -2,7 +2,7 @@
 include:
   - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
   - project: 'freedesktop/ci-templates'
-    ref: '88ed1082df2af02090916566742543f1dbaee988'
+    ref: '7811ba9814a3bad379377241c6c6b62d78b20eac'
     file: '/templates/fedora.yml'
 
 # From https://gitlab.freedesktop.org/freedesktop/ci-templates/-/blob/master/src/gitlab-ci.tmpl
@@ -15,8 +15,8 @@ workflow:
 
 variables:
   FDO_UPSTREAM_REPO: 'cairo/cairo'
-  FDO_DISTRIBUTION_VERSION: '34'
-  FDO_DISTRIBUTION_TAG: '2021-09-20.0'
+  FDO_DISTRIBUTION_VERSION: '38'
+  FDO_DISTRIBUTION_TAG: '2023-04-29.1'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one
   # See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-image-tags.yml for latest
@@ -96,6 +96,7 @@ fedora image:
       dejavu-serif-fonts
       google-noto-emoji-color-fonts
       fonttools
+      util-linux
 
 .test fedora meson:
   dependencies:
@@ -259,6 +260,7 @@ meson mingw-32 build:
   before_script:
     - dnf install -y 'dnf-command(builddep)'
     - dnf builddep -y mingw32-cairo
+    - dnf install -y mingw32-gcc-c++
   script:
     - mkdir builddir
     - cd builddir
@@ -277,6 +279,7 @@ meson mingw-64 build:
   before_script:
     - dnf install -y 'dnf-command(builddep)'
     - dnf builddep -y mingw64-cairo
+    - dnf install -y mingw64-gcc-c++
   script:
     - mkdir builddir
     - cd builddir

.gitlab-ci/ignore-ps3-argb32.txt

@@ -68,7 +68,6 @@ filter-nearest-offset
 filter-nearest-transformed
 finer-grained-fallbacks
 font-matrix-translation
-ft-color-font
 ft-text-vertical-layout-type1
 ft-text-vertical-layout-type3
 gradient-constant-alpha
@@ -208,7 +207,6 @@ trap-clip
 twin
 unclosed-strokes
 user-font
-user-font-color
 user-font-mask
 user-font-proxy
 user-font-rescale

.gitlab-ci/ignore-ps3-rgb24.txt

@@ -64,7 +64,6 @@ fill-rule
 filter-nearest-offset
 filter-nearest-transformed
 font-matrix-translation
-ft-color-font
 ft-text-vertical-layout-type1
 ft-text-vertical-layout-type3
 gradient-zero-stops

.gitlab-ci/ignore-svg11-argb32.txt

@@ -19,7 +19,6 @@ paint-source-alpha
 paint-with-alpha
 paint-with-alpha-clip
 paint-with-alpha-clip-mask
-record1414x-fill-alpha
 record1414x-paint-alpha
 record1414x-paint-alpha-clip
 record1414x-paint-alpha-clip-mask

.gitlab-ci/ignore-svg11-rgb24.txt

@@ -58,7 +58,6 @@ pixman-rotate
 ps-surface-source
 radial-gradient-mask-source
 radial-gradient-source
-record1414x-fill-alpha
 record1414x-paint
 record1414x-paint-alpha
 record1414x-paint-alpha-clip

test/cairo-test-runner.c

@@ -883,7 +883,7 @@ main (int argc, char **argv)
 	if (ctx.test->preamble != NULL) {
 	    status = _cairo_test_runner_preamble (&runner, &ctx);
 	    if (getenv ("CAIRO_TEST_UGLY_HACK_TO_IGNORE_PS_FAILURES")) {
-		if (strcmp (ctx.test_name, "ps-eps") == 0 || strcmp (ctx.test_name, "fallback-resolution") == 0) {
+		if (strcmp (ctx.test_name, "ps-eps") == 0) {
 		    if (status == CAIRO_TEST_FAILURE) {
 			cairo_test_log (&ctx, "Turning FAIL into XFAIL due to env\n");
 			fprintf (stderr, "Turning FAIL into XFAIL due to env\n");