diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-04-24 16:59:52 -0300 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-04-25 13:58:56 +0200 |
| commit | 1c2e52a30e7714931bb40a3812eff3cfd36def8a (patch) | |
| tree | dd1524fde732eaa0678cc535fc346cc30ab99cff /meta-oe/recipes-graphics/xserver-common | |
| parent | 882c385d25385e73e22bdad4555e5af40a1c218c (diff) | |
| download | meta-openembedded-1c2e52a30e7714931bb40a3812eff3cfd36def8a.tar.gz | |
xserver-common: drop xinput-calibrator call as it is done by xdg now
The new xinput-calibrator package provides a xdg file that handles
this logic so drop it from session.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta-oe/recipes-graphics/xserver-common')
2 files changed, 0 insertions, 28 deletions
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch deleted file mode 100644 index 135b2a6939..0000000000 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | From 2877156d5bbc11f8d8e8d6aafd138173d2a4bd3b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Wed, 11 Apr 2012 14:31:34 +0200 | ||
| 4 | Subject: [PATCH 04/12] add Ts_Calibrate_xinput_calibrator Xsession.d script | ||
| 5 | |||
| 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 7 | --- | ||
| 8 | X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | 7 +++++++ | ||
| 9 | 1 files changed, 7 insertions(+), 0 deletions(-) | ||
| 10 | create mode 100644 X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | ||
| 11 | |||
| 12 | diff --git a/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator b/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | ||
| 13 | new file mode 100644 | ||
| 14 | index 0000000..6ef4d1e | ||
| 15 | --- /dev/null | ||
| 16 | +++ b/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | ||
| 17 | @@ -0,0 +1,7 @@ | ||
| 18 | +#!/bin/sh | ||
| 19 | + | ||
| 20 | +if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then | ||
| 21 | + if [ -e /etc/pointercal.xinput ] ; then | ||
| 22 | + /usr/bin/xinput_calibrator_once.sh | ||
| 23 | + fi | ||
| 24 | +fi | ||
| 25 | -- | ||
| 26 | 1.7.8.5 | ||
| 27 | |||
diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index b0823bf61c..1147fca305 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb | |||
| @@ -14,7 +14,6 @@ SRC_URI_append = " \ | |||
| 14 | file://0001-COPYING-add-GPLv2-license-file.patch \ | 14 | file://0001-COPYING-add-GPLv2-license-file.patch \ |
| 15 | file://0002-add-setdpi-Xinit.d-script.patch \ | 15 | file://0002-add-setdpi-Xinit.d-script.patch \ |
| 16 | file://0003-add-89xdgautostart-Xsession.d-script.patch \ | 16 | file://0003-add-89xdgautostart-Xsession.d-script.patch \ |
| 17 | file://0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch \ | ||
| 18 | file://0005-add-XWindowManager-Xsession.d-script.patch \ | 17 | file://0005-add-XWindowManager-Xsession.d-script.patch \ |
| 19 | file://0006-add-support-for-etc-X11-xserver-system.patch \ | 18 | file://0006-add-support-for-etc-X11-xserver-system.patch \ |
| 20 | file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \ | 19 | file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \ |
