[oe] [meta-oe-meta-systemd 1/5] xinput-calibrator: update to latest git commit
Andreas Müller
schnitzeltony at googlemail.com
Tue Feb 5 22:18:39 UTC 2013
A new option --no-timeout was introduced. Unfortunately it is not working as
expected and has to be fixed.
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
...vent-timeout-exit-when-no-timeout-is-used.patch | 82 ++++++++++++++++++++
.../xinput-calibrator/xinput-calibrator_git.bb | 7 +-
2 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-Prevent-timeout-exit-when-no-timeout-is-used.patch
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-Prevent-timeout-exit-when-no-timeout-is-used.patch b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-Prevent-timeout-exit-when-no-timeout-is-used.patch
new file mode 100644
index 0000000..4cd29a6
--- /dev/null
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-Prevent-timeout-exit-when-no-timeout-is-used.patch
@@ -0,0 +1,82 @@
+From 5d404f02bfb9c6eabbbe93dea2a8eb7ed4fd07d6 Mon Sep 17 00:00:00 2001
+From: Jeff Lasslett <jeff.lasslett at gmail.com>
+Date: Wed, 9 Jan 2013 14:12:46 +1100
+Subject: [PATCH] Prevent timeout exit when --no-timeout is used
+
+Upstream-Status: Submitted [https://github.com/tias/xinput_calibrator/pull/45]
+
+---
+ src/gui/gtkmm.cpp | 30 ++++++++++++++++--------------
+ src/gui/x11.cpp | 13 +++++++------
+ 2 files changed, 23 insertions(+), 20 deletions(-)
+
+diff --git a/src/gui/gtkmm.cpp b/src/gui/gtkmm.cpp
+index 32bb889..2f52e25 100644
+--- a/src/gui/gtkmm.cpp
++++ b/src/gui/gtkmm.cpp
+@@ -204,21 +204,23 @@ void CalibrationArea::redraw()
+
+ bool CalibrationArea::on_timer_signal()
+ {
+- time_elapsed += time_step;
+- if (time_elapsed > max_time) {
+- exit(0);
+- }
+-
+- // Update clock
+- Glib::RefPtr<Gdk::Window> win = get_window();
+- if (win) {
+- const Gdk::Rectangle rect(display_width/2 - clock_radius - clock_line_width,
+- display_height/2 - clock_radius - clock_line_width,
+- 2 * clock_radius + 1 + 2 * clock_line_width,
+- 2 * clock_radius + 1 + 2 * clock_line_width);
+- win->invalidate_rect(rect, false);
++ if (calibrator->get_use_timeout()) {
++ time_elapsed += time_step;
++ if (time_elapsed > max_time) {
++ exit(0);
++ }
++
++ // Update clock
++ Glib::RefPtr<Gdk::Window> win = get_window();
++ if (win) {
++ const Gdk::Rectangle rect(display_width/2 - clock_radius - clock_line_width,
++ display_height/2 - clock_radius - clock_line_width,
++ 2 * clock_radius + 1 + 2 * clock_line_width,
++ 2 * clock_radius + 1 + 2 * clock_line_width);
++ win->invalidate_rect(rect, false);
++ }
+ }
+-
++
+ return true;
+ }
+
+diff --git a/src/gui/x11.cpp b/src/gui/x11.cpp
+index db8a8a5..dfcd9fd 100644
+--- a/src/gui/x11.cpp
++++ b/src/gui/x11.cpp
+@@ -293,13 +293,14 @@ bool GuiCalibratorX11::on_expose_event()
+
+ bool GuiCalibratorX11::on_timer_signal()
+ {
+- time_elapsed += time_step;
+- if (time_elapsed > max_time) {
+- exit(0);
+- }
+-
+ // Update clock
+- if(calibrator->get_use_timeout()){
++ if(calibrator->get_use_timeout()) {
++
++ time_elapsed += time_step;
++ if (time_elapsed > max_time) {
++ exit(0);
++ }
++
+ XSetForeground(display, gc, pixel[BLACK]);
+ XSetLineAttributes(display, gc, clock_line_width,
+ LineSolid, CapButt, JoinMiter);
+--
+1.7.4.4
+
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 97f9343..b71daeb 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -9,8 +9,11 @@ PR = "r1"
inherit autotools
-SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
-SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git"
+SRCREV = "e02de96acbe2fa5a57b0bda6821a053b1b123fd2"
+SRC_URI = " \
+ git://github.com/tias/xinput_calibrator.git;protocol=git \
+ file://0001-Prevent-timeout-exit-when-no-timeout-is-used.patch \
+"
S = "${WORKDIR}/git"
--
1.7.6.5
More information about the Openembedded-devel
mailing list