Accepting request 420998 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/420998
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=117
This commit is contained in:
Dominique Leuenberger 2016-08-25 07:50:58 +00:00 committed by Git OBS Bridge
commit 0ca2ef1482
6 changed files with 53 additions and 46 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b23fd558623bfdc726066be3f47bb5fb8ed9c0ad980a95d6afc6397b6d41171e
size 1607512

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c13eba5ecd3b516538815ab33765ae04bd6faf1549407e81f3bf17b08f2a94d
size 1662400

View File

@ -1,38 +0,0 @@
From 71c26cc7ce8da0c1aec7ff98604f479e7e9ef675 Mon Sep 17 00:00:00 2001
From: Hyungwon Hwang <hyungwon.hwang7@gmail.com>
Date: Fri, 10 Jun 2016 19:34:48 +0900
Subject: background: free MetaBackground explicitly when its
MetaBackgroundActor is destroyed
The memory which MetaBackground resides is freed automatically, when its
wrapper object Background is freed by garbage collection. But because the
memory for MetaBackground is huge, changing the background or changing the
background mode repeatedly makes a lot of memory to be in use until garbage
collection runs.
This patch frees the MetaBackground object explicitly when its
MetaBackgroundActor is destroyed which is the moment that the memory in the
object is not used anymore.
https://bugzilla.gnome.org/show_bug.cgi?id=766353
Signed-off-by: Hyungwon Hwang <hyungwon.hwang7@gmail.com>
---
js/ui/background.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/js/ui/background.js b/js/ui/background.js
index 5db1e6c..762c76c 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -696,6 +696,7 @@ const BackgroundManager = new Lang.Class({
time: FADE_ANIMATION_TIME,
transition: 'easeOutQuad',
onComplete: function() {
+ oldBackgroundActor.background.run_dispose();
oldBackgroundActor.destroy();
}
});
--
cgit v0.12

View File

@ -0,0 +1,31 @@
From 890a1f112b62d95678f765f71013ee4c2c68ab88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 25 Jul 2016 18:46:59 +0200
Subject: calendar-server: Add back missing return value
In commit 7e0e224e0, when moving from e_cal_recur_generate_instances()
to e_cal_client_generate_instances(), the return value of the
ECalRecurInstanceFn callback was accidentally removed; add it
back.
https://bugzilla.gnome.org/show_bug.cgi?id=769156
---
src/calendar-server/gnome-shell-calendar-server.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/calendar-server/gnome-shell-calendar-server.c b/src/calendar-server/gnome-shell-calendar-server.c
index 5ff12f2..57bc71b 100644
--- a/src/calendar-server/gnome-shell-calendar-server.c
+++ b/src/calendar-server/gnome-shell-calendar-server.c
@@ -443,6 +443,8 @@ generate_instances_cb (ECalComponent *comp,
occurrence->rid = e_cal_component_get_recurid_as_string (comp);
appointment->occurrences = g_slist_append (appointment->occurrences, occurrence);
+
+ return TRUE;
}
--
cgit v0.12

View File

@ -1,8 +1,22 @@
-------------------------------------------------------------------
Fri Aug 19 22:16:11 UTC 2016 - zaitor@opensuse.org
- Update to version 3.20.4:
+ Free old backgrounds immediately (bgo#766353).
+ Adjust to flatpak PermissionStore API changes (bgo#766598).
+ calendar: Only hide dismissed occurrence of recurring event
(bgo#748226).
+ Updated translations.
- Drop gnome-shell-background-free-MetaBackground.patch: Fixed
upstream.
- Add gnome-shell-fix-missing-return.patch: Fix build, add missing
return value in gnome-calendar.
-------------------------------------------------------------------
Thu Aug 11 09:11:37 UTC 2016 - qzhao@suse.com
- Add gnome-shell-disable-ibus-when-not-installed.patch: Disable
ibus when it not installed, especially out of CJK areas
ibus when it not installed, especially out of CJK areas
(bsc#987360).
-------------------------------------------------------------------

View File

@ -17,7 +17,7 @@
Name: gnome-shell
Version: 3.20.3
Version: 3.20.4
Release: 0
Summary: GNOME Shell
License: GPL-2.0+
@ -26,10 +26,10 @@ Url: http://live.gnome.org/GnomeShell
Source: http://download.gnome.org/sources/gnome-shell/3.20/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized
Patch1: gnome-shell-private-connection.patch
# PATCH-FIX-UPSTREAM gnome-shell-background-free-MetaBackground.patch bgo#766353 zaitor@opensuse.org -- Free MetaBackground explicitly when its MetaBackgroundActor is destroyed
Patch2: gnome-shell-background-free-MetaBackground.patch
# PATCH-FIX-OPENSUSE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area.
Patch3: gnome-shell-disable-ibus-when-not-installed.patch
Patch2: gnome-shell-disable-ibus-when-not-installed.patch
# PATCH-FIX-UPSTREAM gnome-shell-fix-missing-return.patch zaitor@opensuse.org -- Fix a missing return, patch from upstream stable git.
Patch3: gnome-shell-fix-missing-return.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++
BuildRequires: intltool