From 1c2e52a30e7714931bb40a3812eff3cfd36def8a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 24 Apr 2012 16:59:52 -0300 Subject: 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 --- ...brate_xinput_calibrator-Xsession.d-script.patch | 27 ---------------------- .../xserver-common/xserver-common_1.34.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch (limited to 'meta-oe/recipes-graphics/xserver-common') 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 @@ -From 2877156d5bbc11f8d8e8d6aafd138173d2a4bd3b Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 11 Apr 2012 14:31:34 +0200 -Subject: [PATCH 04/12] add Ts_Calibrate_xinput_calibrator Xsession.d script - -Signed-off-by: Martin Jansa ---- - X11/Xsession.d/89xTs_Calibrate_xinput_calibrator | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - create mode 100644 X11/Xsession.d/89xTs_Calibrate_xinput_calibrator - -diff --git a/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator b/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator -new file mode 100644 -index 0000000..6ef4d1e ---- /dev/null -+++ b/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator -@@ -0,0 +1,7 @@ -+#!/bin/sh -+ -+if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then -+ if [ -e /etc/pointercal.xinput ] ; then -+ /usr/bin/xinput_calibrator_once.sh -+ fi -+fi --- -1.7.8.5 - 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 = " \ file://0001-COPYING-add-GPLv2-license-file.patch \ file://0002-add-setdpi-Xinit.d-script.patch \ file://0003-add-89xdgautostart-Xsession.d-script.patch \ - file://0004-add-Ts_Calibrate_xinput_calibrator-Xsession.d-script.patch \ file://0005-add-XWindowManager-Xsession.d-script.patch \ file://0006-add-support-for-etc-X11-xserver-system.patch \ file://0007-use-own-functions-file-instead-etc-init.d-functions.patch \ -- cgit 1.2.3-korg