Merge branch 'c10s' into a10s
This commit is contained in:
commit
ad8d6cb25a
1
.gitignore
vendored
1
.gitignore
vendored
@ -233,3 +233,4 @@ gnome-shell-2.31.5.tar.bz2
|
||||
/gnome-shell-47.0.tar.xz
|
||||
/gnome-shell-47.1.tar.xz
|
||||
/gnome-shell-47.2.tar.xz
|
||||
/gnome-shell-47.3.tar.xz
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 5ddabd342d8016b5b1c8a56ecca7de21e91feb3c Mon Sep 17 00:00:00 2001
|
||||
From 0bd4ecbbcc47a8574edae46b56695572a846a1e2 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Tue, 15 Jan 2019 12:54:32 -0500
|
||||
Subject: [PATCH] st-texture-cache: purge on resume
|
||||
@ -12,10 +12,10 @@ so the texture cache needs to evict all textures in that situation.
|
||||
3 files changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/js/ui/main.js b/js/ui/main.js
|
||||
index ad0ea962f1..d9646fea52 100644
|
||||
index 73980edb88..5c17258177 100644
|
||||
--- a/js/ui/main.js
|
||||
+++ b/js/ui/main.js
|
||||
@@ -265,7 +265,11 @@ async function _initializeUI() {
|
||||
@@ -263,7 +263,11 @@ async function _initializeUI() {
|
||||
return true;
|
||||
});
|
||||
|
||||
@ -29,10 +29,10 @@ index ad0ea962f1..d9646fea52 100644
|
||||
global.context.connect('notify::unsafe-mode', () => {
|
||||
if (!global.context.unsafe_mode)
|
||||
diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
|
||||
index a137480ad1..2e5c6c689a 100644
|
||||
index e03ec44619..ac19e98cf5 100644
|
||||
--- a/src/st/st-texture-cache.c
|
||||
+++ b/src/st/st-texture-cache.c
|
||||
@@ -129,6 +129,16 @@ st_texture_cache_class_init (StTextureCacheClass *klass)
|
||||
@@ -131,6 +131,16 @@ st_texture_cache_class_init (StTextureCacheClass *klass)
|
||||
G_TYPE_NONE, 1, G_TYPE_FILE);
|
||||
}
|
||||
|
||||
@ -42,7 +42,7 @@ index a137480ad1..2e5c6c689a 100644
|
||||
+{
|
||||
+ g_return_if_fail (ST_IS_TEXTURE_CACHE (cache));
|
||||
+
|
||||
+ g_hash_table_remove_all (cache->priv->keyed_cache);
|
||||
+ g_hash_table_remove_all (cache->keyed_cache);
|
||||
+ g_signal_emit (cache, signals[ICON_THEME_CHANGED], 0);
|
||||
+}
|
||||
+
|
||||
@ -50,10 +50,10 @@ index a137480ad1..2e5c6c689a 100644
|
||||
static void
|
||||
st_texture_cache_evict_icons (StTextureCache *cache)
|
||||
diff --git a/src/st/st-texture-cache.h b/src/st/st-texture-cache.h
|
||||
index 1c5be957c4..1a4bfde73f 100644
|
||||
index 7ca08ab34a..f600938047 100644
|
||||
--- a/src/st/st-texture-cache.h
|
||||
+++ b/src/st/st-texture-cache.h
|
||||
@@ -52,6 +52,7 @@ typedef enum {
|
||||
@@ -42,6 +42,7 @@ typedef enum {
|
||||
} StTextureCachePolicy;
|
||||
|
||||
StTextureCache* st_texture_cache_get_default (void);
|
||||
@ -62,5 +62,5 @@ index 1c5be957c4..1a4bfde73f 100644
|
||||
ClutterActor *
|
||||
st_texture_cache_load_sliced_image (StTextureCache *cache,
|
||||
--
|
||||
2.45.2
|
||||
2.47.1
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
%endif
|
||||
|
||||
Name: gnome-shell
|
||||
Version: 47.2
|
||||
Version: 47.3
|
||||
Release: %autorelease
|
||||
Summary: Window management and application launching for GNOME
|
||||
|
||||
@ -67,7 +67,6 @@ BuildRequires: bash-completion
|
||||
BuildRequires: gcc
|
||||
BuildRequires: meson
|
||||
BuildRequires: git
|
||||
BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version}
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
|
||||
BuildRequires: pkgconfig(gcr-4)
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gnome-shell-47.2.tar.xz) = 85e278f80fea53b13a030eeb2847352726810a43916889fe63e9f65b2920806e6406eb00ecc62bc8915e1f29112dc02059f5ce0e74bcbcb794be03ea191f8ef2
|
||||
SHA512 (gnome-shell-47.3.tar.xz) = d9d553ec0ccdd98fb7878b7bd7f64f966320d34df75c10967c85ceb79edf13a70d0c0898abdc46f3c790246dc387b4586dbfd0cc47ef321ab858f5c4863cc6e2
|
||||
|
Loading…
Reference in New Issue
Block a user