aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-04-25 13:45:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-04-25 13:45:51 +0000
commitd500b9cac60c5795e6a21e9adb4b0b31f79667d5 (patch)
treefa7dc7747f5876b285e6bafa40e7aa12c3f425b7 /main
parent93061bb8418d5a32c475a912290fde6523a62e3d (diff)
downloadaports-d500b9cac60c5795e6a21e9adb4b0b31f79667d5.tar.bz2
aports-d500b9cac60c5795e6a21e9adb4b0b31f79667d5.tar.xz
main/lxdm: glib-2.32 fix
Diffstat (limited to 'main')
-rw-r--r--main/lxdm/APKBUILD4
-rw-r--r--main/lxdm/glib2-2.32.0.patch21
2 files changed, 24 insertions, 1 deletions
diff --git a/main/lxdm/APKBUILD b/main/lxdm/APKBUILD
index cf43ab83b5..ec61116170 100644
--- a/main/lxdm/APKBUILD
+++ b/main/lxdm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=lxdm
pkgver=0.4.1
-pkgrel=3
+pkgrel=4
pkgdesc="LXDE desktop login manager"
url="http://wiki.lxde.org/en/LXDM"
license="GPL"
@@ -11,6 +11,7 @@ makedepends="gtk+-dev consolekit-dev"
install=
subpackages="$pkgname-lang"
source="http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
+ glib2-2.32.0.patch
background.png
lxdm.initd
index.theme.alpine"
@@ -67,6 +68,7 @@ package() {
}
md5sums="8da1cfc2be6dc9217c85a7cf51e1e821 lxdm-0.4.1.tar.gz
+32400e029dcfae4873e957e4c9135787 glib2-2.32.0.patch
a510afe725112947d16f6c1f0602effe background.png
d6455d172d5d897f6bfcefe9a1a632c7 lxdm.initd
06ea32ef440375839851c4bc7caea004 index.theme.alpine"
diff --git a/main/lxdm/glib2-2.32.0.patch b/main/lxdm/glib2-2.32.0.patch
new file mode 100644
index 0000000000..ee5f436b98
--- /dev/null
+++ b/main/lxdm/glib2-2.32.0.patch
@@ -0,0 +1,21 @@
+From: dgod <dgod.osa@gmail.com>
+Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
+Subject: fix event check bug caused cpu 100%
+X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
+
+fix event check bug caused cpu 100%
+---
+
+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)