diff options
| -rw-r--r-- | meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch | 33 | ||||
| -rw-r--r-- | meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb (renamed from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb) | 5 |
2 files changed, 2 insertions, 36 deletions
diff --git a/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch b/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch deleted file mode 100644 index 08fd76bb29..0000000000 --- a/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From e87977696f03b0c9f72884f8e3e3ec3248dfd80a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
| 3 | Date: Tue, 18 Jun 2013 12:46:42 +0200 | ||
| 4 | Subject: [PATCH] don't block display events when time is set backwards | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [1] | ||
| 10 | |||
| 11 | [1] https://bugzilla.xfce.org/show_bug.cgi?id=10184 | ||
| 12 | |||
| 13 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 14 | --- | ||
| 15 | src/display.c | 2 +- | ||
| 16 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/src/display.c b/src/display.c | ||
| 19 | index 00318d5..651bc7a 100644 | ||
| 20 | --- a/src/display.c | ||
| 21 | +++ b/src/display.c | ||
| 22 | @@ -733,7 +733,7 @@ myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent *ev) | ||
| 23 | break; | ||
| 24 | } | ||
| 25 | |||
| 26 | - if ((timestamp != (guint32) CurrentTime) && TIMESTAMP_IS_BEFORE(display->current_time, timestamp)) | ||
| 27 | + if ((timestamp != (guint32) CurrentTime) /*&& TIMESTAMP_IS_BEFORE(display->current_time, timestamp)*/) | ||
| 28 | { | ||
| 29 | display->current_time = timestamp; | ||
| 30 | } | ||
| 31 | -- | ||
| 32 | 1.7.6.5 | ||
| 33 | |||
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb index ad70860c0f..2aa68e3fde 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb | |||
| @@ -8,9 +8,8 @@ inherit xfce update-alternatives distro_features_check | |||
| 8 | 8 | ||
| 9 | REQUIRED_DISTRO_FEATURES = "x11" | 9 | REQUIRED_DISTRO_FEATURES = "x11" |
| 10 | 10 | ||
| 11 | SRC_URI += "file://0001-don-t-block-display-events-when-time-is-set-backward.patch" | 11 | SRC_URI[md5sum] = "3ec136efc5387fd3b53cd66b684f52d7" |
| 12 | SRC_URI[md5sum] = "197ef087ca6a263627f1bea6d5a79d6f" | 12 | SRC_URI[sha256sum] = "fa74048a75649a6e92df763a3cfb706d3fed1e1a6adf567f6693325a5a6efb36" |
| 13 | SRC_URI[sha256sum] = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac" | ||
| 14 | 13 | ||
| 15 | python populate_packages_prepend () { | 14 | python populate_packages_prepend () { |
| 16 | themedir = d.expand('${datadir}/themes') | 15 | themedir = d.expand('${datadir}/themes') |
