From 1cc36e3dea77168223ce470086af3415017e8562 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 31 May 2008 01:35:36 +0000
Subject: xfdesktop: improve packaging and include desktop files required for
 plugins to work * commit by Laibsch

---
 packages/xfce/xfdesktop.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages/xfce')

diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc
index 50a4f488cc..bd5bb7223c 100644
--- a/packages/xfce/xfdesktop.inc
+++ b/packages/xfce/xfdesktop.inc
@@ -11,5 +11,7 @@ PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins"
 
 FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*"
 FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
-FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so"
+FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so \
+                ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
+                ${datadir}/xfce4/panel-plugins/*.desktop"
 FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug"
-- 
cgit v1.2.3


From baa4cc04ca0136566df6ddaa0fed5367b5fc7581 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 31 May 2008 01:42:46 +0000
Subject: xfce4-panel: improve packaging and include desktop files required for
 plugins to work * commit by Laibsch

---
 packages/xfce/xfce4-panel.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/xfce')

diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc
index dbd1baef60..6ad71fcf82 100644
--- a/packages/xfce/xfce4-panel.inc
+++ b/packages/xfce/xfce4-panel.inc
@@ -20,6 +20,7 @@ do_install() {
 }
 
 PACKAGES += "${PN}-plugins ${PN}-mcs-plugins"
-FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*"
+FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \
+                        ${datadir}/xfce4/panel-plugins/*.desktop"
 FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/"
 FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug"
-- 
cgit v1.2.3


From 52ec107c716c78ea743faa99e6b7dad58925ed27 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 1 Jun 2008 05:40:06 +0000
Subject: xfwm4: don't mangle the include path * Currently all related
 libraries properly install at /usr/include/xfce4/   and the mangle is then
 breaking the compilation process. * commit by Laibsch

---
 packages/xfce/xfwm4.inc | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'packages/xfce')

diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc
index e7e5bc1862..e443a841ae 100644
--- a/packages/xfce/xfwm4.inc
+++ b/packages/xfce/xfwm4.inc
@@ -14,10 +14,6 @@ RDEPENDS = "xfwm4-theme-default"
 
 EXTRA_OECONF += " --enable-startup-notification"
 
-do_configure_append() {
-	sed -i s:/usr/include/xfce4::g mcs-plugin/Makefile
-}
-
 PACKAGES_DYNAMIC = "xfwm4-theme-*"
 
 python populate_packages_prepend () {
-- 
cgit v1.2.3