From b29866c765eb643223ec1040cd37975db33b046e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 11 Feb 2019 13:52:09 -0800
Subject: [PATCH] Backport MR #402 to fix missing logo on login screen

---
 ...Use-content-size-for-returned-images.patch | 34 +++++++++++++++++++
 gnome-shell.spec                              |  9 ++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 0001-texture-cache-Use-content-size-for-returned-images.patch

diff --git a/0001-texture-cache-Use-content-size-for-returned-images.patch b/0001-texture-cache-Use-content-size-for-returned-images.patch
new file mode 100644
index 0000000..d37585e
--- /dev/null
+++ b/0001-texture-cache-Use-content-size-for-returned-images.patch
@@ -0,0 +1,34 @@
+From 81f0e7de9eb1cb30806dd44c615d2cc895b58a49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sat, 9 Feb 2019 19:16:15 +0100
+Subject: [PATCH] texture-cache: Use content size for returned images
+
+Since commit deec0bf2550, the texture cache is based on ClutterImage
+rather than ClutterTexture. As ClutterImage (like all ClutterContent)
+is only concerned with painting, it doesn't influence the size of the
+actor it is added to at all, and the returned actor will now stay at
+size 0x0 after the image has been loaded.
+
+Set up the actor to follow the content's size instead, to get closer
+to the previous behavior.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/402
+---
+ src/st/st-texture-cache.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
+index 1d11ce71c..967ad9e2e 100644
+--- a/src/st/st-texture-cache.c
++++ b/src/st/st-texture-cache.c
+@@ -71,6 +71,7 @@ create_invisible_actor (void)
+ {
+   return g_object_new (CLUTTER_TYPE_ACTOR,
+                        "opacity", 0,
++                       "request-mode", CLUTTER_REQUEST_CONTENT_SIZE,
+                        NULL);
+ }
+ 
+-- 
+2.20.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 450a6e7..521aab9 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.31.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -17,6 +17,10 @@ Patch1: gnome-shell-favourite-apps-firefox.patch
 Patch2: 0001-endSessionDialog-Immediately-add-buttons-to-the-dial.patch
 Patch3: 0002-endSessionDialog-Support-rebooting-into-the-bootload.patch
 
+# Backport https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/402
+# to fix (hopefully) missing Fedora logo on login screen
+Patch4: 0001-texture-cache-Use-content-size-for-returned-images.patch
+
 %define libcroco_version 0.6.8
 %define eds_version 3.17.2
 %define gnome_desktop_version 3.7.90
@@ -206,6 +210,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Mon Feb 11 2019 Adam Williamson <awilliam@redhat.com> - 3.31.90-2
+- Backport MR #402 to fix missing logo on login screen
+
 * Thu Feb 07 2019 Florian Müllner <fmuellner@redhat.com> - 3.31.90-1
 - Update to 3.31.90