summaryrefslogtreecommitdiff
path: root/recipes-lxde
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2012-10-05 17:20:58 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2012-10-18 20:32:58 +0200
commit712e345ecad8f2e9393a9b41ca41a1f87070ad79 (patch)
tree02c3c7f256aacbed49091a4bcbf58fd8863bea22 /recipes-lxde
parentb7991ad5c6a5479da39f5da84424fc588fe0fe7e (diff)
lxdm, moved general changes to oe-tworaz/meta-lxde
Diffstat (limited to 'recipes-lxde')
-rw-r--r--recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch25
-rw-r--r--recipes-lxde/lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch25
-rw-r--r--recipes-lxde/lxdm/lxdm_0.4.1.bbappend4
3 files changed, 1 insertions, 53 deletions
diff --git a/recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch b/recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch
deleted file mode 100644
index f0ca23b..0000000
--- a/recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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] 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
-
diff --git a/recipes-lxde/lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch b/recipes-lxde/lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch
deleted file mode 100644
index 43a8b1c..0000000
--- a/recipes-lxde/lxdm/lxdm/missingAM_GLIB_GNU_GETTEXT.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urNdb lxdm-0.4.1.old//config.h.in lxdm-0.4.1//config.h.in
---- lxdm-0.4.1.old//config.h.in 2011-07-29 15:43:45.000000000 +0200
-+++ lxdm-0.4.1//config.h.in 2011-11-29 22:26:14.000000000 +0100
-@@ -1,5 +1,8 @@
- /* config.h.in. Generated from configure.ac by autoheader. */
-
-+/* always defined to indicate that i18n is enabled */
-+/*#undef ENABLE_NLS*/
-+
- /* Gettext package. */
- #undef GETTEXT_PACKAGE
-
-diff -urNdb lxdm-0.4.1.old//configure.ac lxdm-0.4.1//configure.ac
---- lxdm-0.4.1.old//configure.ac 2011-07-29 15:42:33.000000000 +0200
-+++ lxdm-0.4.1//configure.ac 2011-11-29 22:23:08.000000000 +0100
-@@ -141,6 +141,9 @@
- GETTEXT_PACKAGE=lxdm
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-+AM_GLIB_GNU_GETTEXT
-+
-+#AC_SUBST(GMSGFMT, ($MSGFMT))
-
- AC_CONFIG_FILES([
- Makefile
diff --git a/recipes-lxde/lxdm/lxdm_0.4.1.bbappend b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
index a31c9ed..028de4c 100644
--- a/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
+++ b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
@@ -1,11 +1,9 @@
-PRINC = "2"
+PRINC = "3"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
- file://missingAM_GLIB_GNU_GETTEXT.patch \
file://configfiles.patch \
- file://fix_event_check_bug_caused_cpu_100.patch \
"
#issues during V2.0alpha development, might be removed later