Patchwork [meta-systemd,2/2] libxfce4ui: fix xfwm4 crash (no window borders) on first start

login
register
mail settings
Submitter Andreas Müller
Date Aug. 27, 2012, 8:36 a.m.
Message ID <1346056611-31432-3-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/35385/
State Accepted
Commit 8d55a7f24fa25fbe8efd19db5c2af97e27dc369c
Headers show

Comments

Andreas Müller - Aug. 27, 2012, 8:36 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...-private-xfce4-keyboard-shortcuts.xml-fix.patch |   31 ++++++++++++++++++++
 .../recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb    |    3 ++
 2 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch

Patch

diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch
new file mode 100644
index 0000000..b8c9178
--- /dev/null
+++ b/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch
@@ -0,0 +1,31 @@ 
+From 708e59caaf1c0c271a96a4d1fe46b122aff45e34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 27 Aug 2012 09:16:29 +0200
+Subject: [PATCH] libxfce4kbd-private/xfce4-keyboard-shortcuts.xml: fix xfwm4
+ crash on first start
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ libxfce4kbd-private/xfce4-keyboard-shortcuts.xml |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
+index 723a10d..e6502f3 100644
+--- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
++++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
+@@ -66,4 +66,8 @@
+       <property name="&lt;Control&gt;F12" type="string" value="workspace_12_key"/>
+     </property>
+   </property>
++  <property name="providers" type="array">
++    <value type="string" value="commands"/>
++    <value type="string" value="xfwm4"/>
++  </property>
+ </channel>
+-- 
+1.7.6.5
+
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb
index ae9dddf..e2bc81e 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb
@@ -3,9 +3,12 @@  SECTION = "x11/libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
 DEPENDS = "gtk+ intltool libxfce4util startup-notification xfconf"
+PR = "r1"
 
 inherit xfce
 
+SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch"
+
 FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
 
 SRC_URI[md5sum] = "30bd432dd0f19305e846a122d4c7c6fe"