[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#780229: marked as done (unblock (pre-approval): mate-settings-daemon/1.8.2-3)

Your message dated Thu, 12 Mar 2015 08:42:35 +0100
with message-id <5501436B.4070701@thykier.net>
and subject line Re: Bug#780229: unblock (pre-approval): mate-settings-daemon/1.8.2-3
has caused the Debian Bug report #780229,
regarding unblock (pre-approval): mate-settings-daemon/1.8.2-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
780229: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780229
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please consider unblocking planned upload of package mate-settings-daemon.

+  * debian/changelo:
+    + Fix typo in previous changelog stanza.

Is that ok as I did that in the .debdiff? Should this be mentioned here?

+  * debian/patches:
+    + Add debian/patches/1001_fix-numlock-cpu-usage.patch. Prevent m-s-d from
+      causing high CPU load if the user repetitively toggles the NUMLOCK key
+      while being connected via a remote session (NX, X2Go, VNC, xrdp, etc.)
+      or sometimes also in a local X.org session. (Closes: #780226,
+      LP:1364111).

-> This issue has been bugging me personally and also a customer of mine
for a while now when connected to MATE via X2Go. I always thought that it
was related to nxagent/x2goagent.

While triaging bug reports in the MATE upstream issue tracker, I stumbled
over the patch shipped with this upload proposal (see #780226 for
details).

The provided patch by Nilesh Govindrajan fixes the high CPU load issue
(and probably also another issue observed under X2Go [1]).

light+love,
Mike


[1] http://bugs.x2go.org/402

unblock mate-settings-daemon/1.8.2-3

-- System Information:
Debian Release: 8.0
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)

diff -Nru mate-settings-daemon-1.8.2/debian/changelog mate-settings-daemon-1.8.2/debian/changelog
--- mate-settings-daemon-1.8.2/debian/changelog	2015-03-10 18:00:07.000000000 +0100
+++ mate-settings-daemon-1.8.2/debian/changelog	2015-03-10 20:40:59.000000000 +0100
@@ -1,10 +1,23 @@
+mate-settings-daemon (1.8.2-3) unstable; urgency=medium
+
+  * debian/changelo:
+    + Fix typo in previous changelog stanza.
+  * debian/patches:
+    + Add debian/patches/1001_fix-numlock-cpu-usage.patch. Prevent m-s-d from
+      causing high CPU load if the user repetitively toggles the NUMLOCK key
+      while being connected via a remote session (NX, X2Go, VNC, xrdp, etc.)
+      or sometimes also in a local X.org session. (Closes: #780226,
+      LP:1364111).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 10 Mar 2015 20:36:14 +0100
+
 mate-settings-daemon (1.8.2-2) unstable; urgency=medium
 
   [ Mike Gabriel ]
   * debian/patches:
     + Add README file explaining our patch naming scheme.
     + Add 0002_fix-a11y-keyboard-dialog-segfaults.patch. Fix segfaults when
-      clicking on the checkboxes in the a11y-keybord configuration dialog.
+      clicking on the checkboxes in the a11y-keyboard configuration dialog.
       (Closes: #779916).
 
  -- Mike Gabriel <sunweaver@debian.org>  Tue, 10 Mar 2015 17:59:38 +0100
diff -Nru mate-settings-daemon-1.8.2/debian/patches/1001_fix-numlock-cpu-usage.patch mate-settings-daemon-1.8.2/debian/patches/1001_fix-numlock-cpu-usage.patch
--- mate-settings-daemon-1.8.2/debian/patches/1001_fix-numlock-cpu-usage.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-settings-daemon-1.8.2/debian/patches/1001_fix-numlock-cpu-usage.patch	2015-03-10 20:35:25.000000000 +0100
@@ -0,0 +1,35 @@
+Author: Nilesh Govindrajan (https://github.com/nilesh)
+Description: Prevent nxagent/xrdp/xvnc from causing high CPU loads on toggling NUMLOCK
+Origin: https://github.com/mate-desktop/mate-settings-daemon/issues/57#issuecomment-73353036
+
+--- a/plugins/keyboard/msd-keyboard-manager.c    2015-02-07 12:17:03.372168487 +0530
++++ b/plugins/keyboard/msd-keyboard-manager.c 2015-02-07 10:57:10.936047797 +0530
+@@ -267,10 +267,6 @@
+         bell_volume   = (volume_string && !strcmp (volume_string, "on")) ? 50 : 0;
+         g_free (volume_string);
+
+-#ifdef HAVE_X11_EXTENSIONS_XKB_H
+-        rnumlock      = g_settings_get_boolean  (settings, KEY_NUMLOCK_REMEMBER);
+-#endif /* HAVE_X11_EXTENSIONS_XKB_H */
+-
+         gdk_error_trap_push ();
+         if (repeat) {
+                 gboolean rate_set = FALSE;
+@@ -306,9 +302,13 @@
+                                 &kbdcontrol);
+
+ #ifdef HAVE_X11_EXTENSIONS_XKB_H
+-        if (manager->priv->have_xkb && rnumlock) {
+-                numlock_set_xkb_state (numlock_get_settings_state (settings));
+-        }
++        rnumlock      = g_settings_get_boolean  (settings, KEY_NUMLOCK_REMEMBER);
++
++       if(rnumlock == 0 || key == NULL) {
++           if (manager->priv->have_xkb && rnumlock) {
++                   numlock_set_xkb_state (numlock_get_settings_state (settings));
++           }
++       }
+ #endif /* HAVE_X11_EXTENSIONS_XKB_H */
+
+         XSync (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), FALSE);
+
diff -Nru mate-settings-daemon-1.8.2/debian/patches/series mate-settings-daemon-1.8.2/debian/patches/series
--- mate-settings-daemon-1.8.2/debian/patches/series	2015-03-10 17:58:15.000000000 +0100
+++ mate-settings-daemon-1.8.2/debian/patches/series	2015-03-10 20:13:41.000000000 +0100
@@ -1,3 +1,4 @@
 0001_prefer-gcalculator-for-media-keys.patch
 0002_fix-a11y-keyboard-dialog-segfaults.patch
+1001_fix-numlock-cpu-usage.patch

--- End Message ---
--- Begin Message --- 
On 2015-03-12 05:12, Mike Gabriel wrote:
> Control: tags -1 - moreinfo
> 
> Hi Niels,
> 
> [...]
> 
> uploaded and accepted in unstable.
> 
> light+love
> Mike

Unblocked, thanks.

~Niels

--- End Message ---
Reply to: