From aa9a8702e4c862a934d3095f8676dc34afe54da4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 14 May 2022 08:41:18 -0400
Subject: [PATCH 1/2] ci: Update the Fedora image to Fedora 36

Also remove systemtap from the image, since
we don't need it.

The v36 image is still used in gtk-4-6.
---
 .gitlab-ci.yml               | 2 +-
 .gitlab-ci/README.md         | 3 +++
 .gitlab-ci/fedora.Dockerfile | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2d911ffe5..c560ee6b76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v36"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
 
 .only-default:
diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md
index 162a1a88df..295ffa33d2 100644
--- a/.gitlab-ci/README.md
+++ b/.gitlab-ci/README.md
@@ -14,6 +14,9 @@ Each Docker image has a tag composed of two parts:
 See the [container registry][registry] for the available images for each
 branch, as well as their available versions.
 
+Note that using `latest` as version number will overwrite the most
+recently uploaded image in the registry.
+
 ### Checklist for Updating a CI image
 
  - [ ] Update the `${image}.Dockerfile` file with the dependencies
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 31bb1697f5..6800059bf7 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:36
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -87,7 +87,6 @@ RUN dnf -y install \
     python3-wheel \
     redhat-rpm-config \
     sassc \
-    systemtap-sdt-devel \
     vulkan-devel \
     wayland-devel \
     wayland-protocols-devel \

From 1b355ff2e0f776b2472cb55ac5b1c86e4f672a4e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 14 May 2022 12:52:40 -0400
Subject: [PATCH 2/2] Drop the quit-mnemonic reftest

I can't quite figure out what this test was meant
to test, and how to make it do so in a way that
does not fall afoul of rendering issues in the GL
renderer and rounding differences in pango.

Can't win with reftests.
---
 testsuite/reftests/meson.build          |  3 ---
 testsuite/reftests/quit-mnemonic.css    |  3 ---
 testsuite/reftests/quit-mnemonic.ref.ui | 15 -----------
 testsuite/reftests/quit-mnemonic.ui     | 35 -------------------------
 4 files changed, 56 deletions(-)
 delete mode 100644 testsuite/reftests/quit-mnemonic.css
 delete mode 100644 testsuite/reftests/quit-mnemonic.ref.ui
 delete mode 100644 testsuite/reftests/quit-mnemonic.ui

diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 0b6d0fa84a..791cbe5ca0 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -482,9 +482,6 @@ testdata = [
   'pseudoclass-on-parent.css',
   'pseudoclass-on-parent.ref.ui',
   'pseudoclass-on-parent.ui',
-  'quit-mnemonic.css',
-  'quit-mnemonic.ref.ui',
-  'quit-mnemonic.ui',
   'repeating-radial-gradient-at-beginning.css',
   'repeating-radial-gradient-at-beginning.ref.ui',
   'repeating-radial-gradient-at-beginning.ui',
diff --git a/testsuite/reftests/quit-mnemonic.css b/testsuite/reftests/quit-mnemonic.css
deleted file mode 100644
index 127d7cc244..0000000000
--- a/testsuite/reftests/quit-mnemonic.css
+++ /dev/null
@@ -1,3 +0,0 @@
-* {
-    padding: 0;
-}
diff --git a/testsuite/reftests/quit-mnemonic.ref.ui b/testsuite/reftests/quit-mnemonic.ref.ui
deleted file mode 100644
index 2a3b9f669a..0000000000
--- a/testsuite/reftests/quit-mnemonic.ref.ui
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window1">
-    <property name="decorated">0</property>
-    <child>
-      <object class="GtkLabel" id="label1">
-        <property name="label" translatable="yes">Quit
-</property>
-        <attributes>
-          <attribute name="underline" value="low" start="0" end="1"></attribute>
-        </attributes>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/testsuite/reftests/quit-mnemonic.ui b/testsuite/reftests/quit-mnemonic.ui
deleted file mode 100644
index 703715883f..0000000000
--- a/testsuite/reftests/quit-mnemonic.ui
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window1">
-    <property name="decorated">0</property>
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="label" translatable="yes">Quit</property>
-            <attributes>
-              <attribute name="underline" value="low" start="0" end="1"></attribute>
-            </attributes>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
-              <property name="column-span">1</property>
-              <property name="row-span">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label2">
-            <property name="label" translatable="yes"> </property>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
-              <property name="column-span">1</property>
-              <property name="row-span">1</property>
-            </layout>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>