summaryrefslogtreecommitdiff
path: root/recipes-lxde
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2012-08-15 18:11:34 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2012-08-15 18:11:34 +0200
commit755d6f51d10293a03d850db927052df35f42e23c (patch)
tree727022a33a4af5720c858028683262b64a0c5731 /recipes-lxde
parent600fc07667fa1f8df560fd7f7de563b31600f145 (diff)
L4T R15, oe-core Image V2.0Beta1
Diffstat (limited to 'recipes-lxde')
-rw-r--r--recipes-lxde/lxde-common/lxde-common-0.5.5/panel-buttons.patch14
-rw-r--r--recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend6
-rw-r--r--recipes-lxde/lxdm/lxdm/configfiles.patch31
-rw-r--r--recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch25
-rw-r--r--recipes-lxde/lxdm/lxdm_0.4.1.bbappend6
-rw-r--r--recipes-lxde/lxpanel/lxpanel_0.5.8.bbappend4
6 files changed, 79 insertions, 7 deletions
diff --git a/recipes-lxde/lxde-common/lxde-common-0.5.5/panel-buttons.patch b/recipes-lxde/lxde-common/lxde-common-0.5.5/panel-buttons.patch
new file mode 100644
index 0000000..45bd988
--- /dev/null
+++ b/recipes-lxde/lxde-common/lxde-common-0.5.5/panel-buttons.patch
@@ -0,0 +1,14 @@
+--- lxde-common-0.5.5/lxpanel/panel.in~ 2011-07-29 16:04:03.000000000 +0200
++++ lxde-common-0.5.5/lxpanel/panel.in 2012-07-27 14:19:20.661190542 +0200
+@@ -53,7 +53,10 @@
+ id=pcmanfm.desktop
+ }
+ Button {
+- id=firefox.desktop
++ id=mozilla-firefox.desktop
++ }
++ Button {
++ id=lxterminal.desktop
+ }
+ }
+ }
diff --git a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend
index d4b5b35..e63cf4b 100644
--- a/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend
+++ b/recipes-lxde/lxde-common/lxde-common_0.5.5.bbappend
@@ -1,10 +1,9 @@
-PRINC = "1"
+PRINC = "2"
WALLPAPER-MACHINE = "toradex-neutral.png"
WALLPAPER-MACHINE_colibri-t20 = "toradex-t20.png"
WALLPAPER-MACHINE_colibri-t30 = "toradex-t30.png"
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}-${PV}"], d)}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
SRC_URI += " \
file://autostart.patch \
@@ -15,6 +14,7 @@ SRC_URI += " \
file://desktop.conf \
file://defaults.list \
file://hdmiaudio.sh \
+ file://panel-buttons.patch \
"
do_install_append () {
diff --git a/recipes-lxde/lxdm/lxdm/configfiles.patch b/recipes-lxde/lxdm/lxdm/configfiles.patch
index 37ed74d..7ac93cb 100644
--- a/recipes-lxde/lxdm/lxdm/configfiles.patch
+++ b/recipes-lxde/lxdm/lxdm/configfiles.patch
@@ -1,6 +1,6 @@
diff -ur lxdm-0.4.1/data.orig//lxdm.conf lxdm-0.4.1/data/lxdm.conf
--- lxdm-0.4.1/data.orig//lxdm.conf 2011-07-29 15:44:51.000000000 +0200
-+++ lxdm-0.4.1/data/lxdm.conf 2011-12-31 12:22:46.000000000 +0100
++++ lxdm-0.4.1/data/lxdm.conf 2012-07-25 17:50:13.101251148 +0200
@@ -1,6 +1,6 @@
[base]
## uncomment and set autologin username to enable autologin
@@ -9,6 +9,35 @@ diff -ur lxdm-0.4.1/data.orig//lxdm.conf lxdm-0.4.1/data/lxdm.conf
## uncomment and set timeout to enable timeout autologin,
## the value should >=5
+@@ -16,7 +16,7 @@
+ # xauth_path=/tmp
+
+ ## greeter used to welcome the user
+-greeter=/usr/local/libexec/lxdm-greeter-gtk
++greeter=/usr/libexec/lxdm-greeter-gtk
+
+ [server]
+ ## arg used to start xserver, not fully function
+diff -Naur --exclude temp lxdm-0.4.1-r3.orig/lxdm-0.4.1/data/lxdm.conf.in lxdm-0.4.1-r3/lxdm-0.4.1/data/lxdm.conf.in
+--- lxdm-0.4.1/data/lxdm.conf.in 2012-07-25 10:47:22.681189278 +0200
++++ lxdm-0.4.1/data/lxdm.conf.in 2012-07-25 17:49:49.861217834 +0200
+@@ -1,6 +1,6 @@
+ [base]
+ ## uncomment and set autologin username to enable autologin
+-# autologin=dgod
++autologin=root
+
+ ## uncomment and set timeout to enable timeout autologin,
+ ## the value should >=5
+@@ -16,7 +16,7 @@
+ # xauth_path=/tmp
+
+ ## greeter used to welcome the user
+-greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
++greeter=/usr/libexec/lxdm-greeter-gtk
+
+ [server]
+ ## arg used to start xserver, not fully function
diff -ur lxdm-0.4.1/data.orig//PostLogout.in lxdm-0.4.1/data/PostLogout.in
--- lxdm-0.4.1/data.orig//PostLogout.in 2011-07-29 15:42:33.000000000 +0200
+++ lxdm-0.4.1/data/PostLogout.in 2011-12-31 12:21:41.000000000 +0100
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
new file mode 100644
index 0000000..f0ca23b
--- /dev/null
+++ b/recipes-lxde/lxdm/lxdm/fix_event_check_bug_caused_cpu_100.patch
@@ -0,0 +1,25 @@
+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_0.4.1.bbappend b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
index ce46a81..57589d9 100644
--- a/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
+++ b/recipes-lxde/lxdm/lxdm_0.4.1.bbappend
@@ -1,11 +1,11 @@
-PRINC = "1"
+PRINC = "2"
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://missingAM_GLIB_GNU_GETTEXT.patch \
file://configfiles.patch \
+ file://fix_event_check_bug_caused_cpu_100.patch \
"
pkg_postinst_${PN}() {
# Register up as default dm
diff --git a/recipes-lxde/lxpanel/lxpanel_0.5.8.bbappend b/recipes-lxde/lxpanel/lxpanel_0.5.8.bbappend
new file mode 100644
index 0000000..5c21d6a
--- /dev/null
+++ b/recipes-lxde/lxpanel/lxpanel_0.5.8.bbappend
@@ -0,0 +1,4 @@
+PRINC = "1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+