aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2017-03-27 23:08:56 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-04-18 14:21:45 +0200
commit714830db3b5b1bf3329bf7b2d805a253bb30d83c (patch)
tree97e2f5bc62da9f8fa77388b358ff54031285bee1
parentfe7ee79d29b97293a7baa75723cf08a1c903d3e3 (diff)
downloadmeta-openembedded-contrib-714830db3b5b1bf3329bf7b2d805a253bb30d83c.tar.gz
meta-openembedded-contrib-714830db3b5b1bf3329bf7b2d805a253bb30d83c.tar.bz2
meta-openembedded-contrib-714830db3b5b1bf3329bf7b2d805a253bb30d83c.zip
xfwm4: 4.12.3 -> 4.12.4
After ages my patch was finally applied Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-rw-r--r--meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch33
-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 @@
-From e87977696f03b0c9f72884f8e3e3ec3248dfd80a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Tue, 18 Jun 2013 12:46:42 +0200
-Subject: [PATCH] don't block display events when time is set backwards
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Submitted [1]
-
-[1] https://bugzilla.xfce.org/show_bug.cgi?id=10184
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/display.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/display.c b/src/display.c
-index 00318d5..651bc7a 100644
---- a/src/display.c
-+++ b/src/display.c
-@@ -733,7 +733,7 @@ myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent *ev)
- break;
- }
-
-- if ((timestamp != (guint32) CurrentTime) && TIMESTAMP_IS_BEFORE(display->current_time, timestamp))
-+ if ((timestamp != (guint32) CurrentTime) /*&& TIMESTAMP_IS_BEFORE(display->current_time, timestamp)*/)
- {
- display->current_time = timestamp;
- }
---
-1.7.6.5
-
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
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI += "file://0001-don-t-block-display-events-when-time-is-set-backward.patch"
-SRC_URI[md5sum] = "197ef087ca6a263627f1bea6d5a79d6f"
-SRC_URI[sha256sum] = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac"
+SRC_URI[md5sum] = "3ec136efc5387fd3b53cd66b684f52d7"
+SRC_URI[sha256sum] = "fa74048a75649a6e92df763a3cfb706d3fed1e1a6adf567f6693325a5a6efb36"
python populate_packages_prepend () {
themedir = d.expand('${datadir}/themes')