From 714830db3b5b1bf3329bf7b2d805a253bb30d83c Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 27 Mar 2017 23:08:56 +0200 Subject: xfwm4: 4.12.3 -> 4.12.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After ages my patch was finally applied Signed-off-by: Andreas Müller --- ...-display-events-when-time-is-set-backward.patch | 33 ---------------------- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb | 31 -------------------- meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb | 30 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch delete mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb create mode 100644 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb (limited to 'meta-xfce') 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?= -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 ---- - 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.3.bb deleted file mode 100644 index ad70860c0f..0000000000 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="Xfce4 Window Manager" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification exo-native" - -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" - -python populate_packages_prepend () { - themedir = d.expand('${datadir}/themes') - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES_DYNAMIC += "^xfwm4-theme-.*" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" -ALTERNATIVE_PRIORITY[x-window-manager] = "30" - -RDEPENDS_${PN} = "xfwm4-theme-default" -FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ - ${datadir}/xfwm4/defaults \ -" -FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" - diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb new file mode 100644 index 0000000000..2aa68e3fde --- /dev/null +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb @@ -0,0 +1,30 @@ +DESCRIPTION="Xfce4 Window Manager" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification exo-native" + +inherit xfce update-alternatives distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[md5sum] = "3ec136efc5387fd3b53cd66b684f52d7" +SRC_URI[sha256sum] = "fa74048a75649a6e92df763a3cfb706d3fed1e1a6adf567f6693325a5a6efb36" + +python populate_packages_prepend () { + themedir = d.expand('${datadir}/themes') + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "^xfwm4-theme-.*" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" +ALTERNATIVE_PRIORITY[x-window-manager] = "30" + +RDEPENDS_${PN} = "xfwm4-theme-default" +FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ + ${datadir}/xfwm4/defaults \ +" +FILES_${PN}-dbg += "${libexecdir}/xfce4/xfwm4/.debug/*" + -- cgit 1.2.3-korg