summaryrefslogtreecommitdiffstats
path: root/lxde
diff options
context:
space:
mode:
authorPol Vinogradov2012-05-19 22:37:39 -0400
committerPol Vinogradov2012-05-19 22:37:39 -0400
commite9865e0ad7de2fd508ae8581382bc07e0ce2bb1d (patch)
treecb990483b3a025918d130d76b6102dd187f471e3 /lxde
parent011322fe91d8d61905a6bbfb2ee67902ab22cd35 (diff)
lxde/lxdm: added high CPU load fix
Diffstat (limited to 'lxde')
-rw-r--r--lxde/lxdm/HISTORY4
-rwxr-xr-xlxde/lxdm/PRE_BUILD3
-rw-r--r--lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch27
3 files changed, 33 insertions, 1 deletions
diff --git a/lxde/lxdm/HISTORY b/lxde/lxdm/HISTORY
index 90882be32c..b09c9edd5d 100644
--- a/lxde/lxdm/HISTORY
+++ b/lxde/lxdm/HISTORY
@@ -1,3 +1,7 @@
+2012-05-19 Pol Vinogradov <vin.public@gmail.com>
+ * PRE_BUILD, lxdm-0.4.1-high-cpu-load.patch: added high CPU load fix from upstream
+SCM
+
2011-11-11 Arjan Bouter <abouter@sourcemage.org>
* DEPENDS: give a choice between gtk 2 and 3, added optional
dep on libxcb
diff --git a/lxde/lxdm/PRE_BUILD b/lxde/lxdm/PRE_BUILD
index 5b7f69134a..0982fae1ff 100755
--- a/lxde/lxdm/PRE_BUILD
+++ b/lxde/lxdm/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-rm ${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf}
+rm ${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf} &&
+patch -p1 < ${SPELL_DIRECTORY}/lxdm-0.4.1-high-cpu-load.patch
diff --git a/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch b/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
new file mode 100644
index 0000000000..3de97302ae
--- /dev/null
+++ b/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
@@ -0,0 +1,27 @@
+From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa@gmail.com>
+Date: Sun, 25 Dec 2011 15:23:19 +0800
+Subject: [PATCH 1/1] fix event check bug caused cpu 100%
+
+---
+ src/lxcom.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
+
+ static gboolean lxcom_check(GSource *source)
+ {
+- return TRUE;
++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
+--
+1.7.4.1
+
+
+