XFCE: update 4.2.x to 4.4.1

- xfcalendar replaced by orage
- xffm replaced by thunar
- added mousepad
- added xfce-terminal
- added XFCE engine for GTK
- added XFCE icon theme (Rodest)
builds, not tested on device

diff --git a/packages/xfce/.mtn2git_empty b/packages/xfce/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb
new file mode 100644 (file)
index 0000000..6bf0e12
--- /dev/null
+++ b/packages/xfce/exo_0.3.2.bb
@@ -0,0 +1,17 @@
+
+DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+
+inherit pkgconfig xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2"
+
+# Note: Python checking is broken
+
+do_stage() {
+    autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+                ${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so"
+FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*"
+FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug/exo-preferred-applications-settings.*"

diff --git a/packages/xfce/gtk-xfce-engine_2.4.1.bb b/packages/xfce/gtk-xfce-engine_2.4.1.bb
new file mode 100644 (file)
index 0000000..bcfecaf
--- /dev/null
+++ b/packages/xfce/gtk-xfce-engine_2.4.1.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "XFCE theme for GTK"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/gtk-xfce-engine-${PV}.tar.bz2"
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
+                ${datadir}/themes/"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"

diff --git a/packages/libxfce4mcs/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc
similarity index 100%
rename from packages/libxfce4mcs/libxfce4mcs.inc
rename to packages/xfce/libxfce4mcs.inc

diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb b/packages/xfce/libxfce4mcs_4.4.1.bb
similarity index 100%
rename from packages/libxfce4mcs/libxfce4mcs_4.2.2.bb
rename to packages/xfce/libxfce4mcs_4.4.1.bb

diff --git a/packages/libxfce4util/libxfce4util.inc b/packages/xfce/libxfce4util.inc
similarity index 88%
rename from packages/libxfce4util/libxfce4util.inc
rename to packages/xfce/libxfce4util.inc
index dbe6501..b30c8f9 100644 (file)
--- a/packages/libxfce4util/libxfce4util.inc
+++ b/packages/xfce/libxfce4util.inc
@@ -24,8 +24,6 @@ do_stage() {
 
        oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
 
-        install -d ${STAGING_DATADIR}/aclocal/
-        install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/
 }
 
 FILES_${PN}-dev += " ${datadir}/xfce4/m4"

diff --git a/packages/libxfce4util/libxfce4util_4.2.2.bb b/packages/xfce/libxfce4util_4.4.1.bb
similarity index 94%
rename from packages/libxfce4util/libxfce4util_4.2.2.bb
rename to packages/xfce/libxfce4util_4.4.1.bb
index bc64430..70f5dda 100644 (file)
--- a/packages/libxfce4util/libxfce4util_4.2.2.bb
+++ b/packages/xfce/libxfce4util_4.4.1.bb
@@ -3,5 +3,3 @@
 # Released under the MIT license (see packages/COPYING)
 
 require ${PN}.inc
-PR = "r1"
-

diff --git a/packages/libxfcegui4/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc
similarity index 100%
rename from packages/libxfcegui4/libxfcegui4.inc
rename to packages/xfce/libxfcegui4.inc

diff --git a/packages/libxfcegui4/libxfcegui4_4.2.3.bb b/packages/xfce/libxfcegui4_4.4.1.bb
similarity index 100%
rename from packages/libxfcegui4/libxfcegui4_4.2.3.bb
rename to packages/xfce/libxfcegui4_4.4.1.bb

diff --git a/packages/xfce/mousepad_0.2.12.bb b/packages/xfce/mousepad_0.2.12.bb
new file mode 100644 (file)
index 0000000..670a28d
--- /dev/null
+++ b/packages/xfce/mousepad_0.2.12.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "Text editor for Xfce based on Leafpad"
+DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/mousepad-${PV}.tar.bz2"

diff --git a/packages/xfce/orage_4.4.1.bb b/packages/xfce/orage_4.4.1.bb
new file mode 100644 (file)
index 0000000..b8f5284
--- /dev/null
+++ b/packages/xfce/orage_4.4.1.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Calendar application for the Xfce Desktop  Environment"
+DEPENDS = "libxfcegui4 exo libxml-parser-perl-native xfce4-panel xfce-mcs-manager"
+RREPLACES = "xfcalendar"
+
+inherit xfce

diff --git a/packages/xfce/thunar_0.8.0.bb b/packages/xfce/thunar_0.8.0.bb
new file mode 100644 (file)
index 0000000..ea739e4
--- /dev/null
+++ b/packages/xfce/thunar_0.8.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "File manager for the Xfce Desktop Environment"
+DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm"
+
+inherit xfce
+
+SRC_URI = "http://thunar.xfce.org/download/sources/Thunar/0.8.0/Thunar-0.8.0.tar.bz2"
+
+S = "${WORKDIR}/Thunar-${PV}/"
+
+FILES_${PN} += "${libdir}/thunarx-1/*.so \
+                ${datadir}/dbus-1 \
+                ${datadir}/thumbnailers \
+                ${datadir}/Thunar \
+                ${datadir}/xfce4"
+FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/"

diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc
similarity index 100%
rename from packages/xfce-mcs-manager/xfce-mcs-manager.inc
rename to packages/xfce/xfce-mcs-manager.inc

diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb
similarity index 100%
rename from packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb
rename to packages/xfce/xfce-mcs-manager_4.4.1.bb

diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc
similarity index 100%
rename from packages/xfce-mcs-plugins/xfce-mcs-plugins.inc
rename to packages/xfce/xfce-mcs-plugins.inc

diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
similarity index 100%
rename from packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb
rename to packages/xfce/xfce-mcs-plugins_4.4.1.bb

diff --git a/packages/xfce/xfce-terminal_0.2.6.bb b/packages/xfce/xfce-terminal_0.2.6.bb
new file mode 100644 (file)
index 0000000..07a8eb6
--- /dev/null
+++ b/packages/xfce/xfce-terminal_0.2.6.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
+DEPENDS = "exo vte dbus-glib gtk+"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/Terminal-${PV}.tar.bz2"
+
+S = "${WORKDIR}/Terminal-${PV}"

diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce/xfce-utils.inc
similarity index 100%
rename from packages/xfce-utils/xfce-utils.inc
rename to packages/xfce/xfce-utils.inc

diff --git a/packages/xfce-utils/xfce-utils_4.2.2.bb b/packages/xfce/xfce-utils_4.4.1.bb
similarity index 100%
rename from packages/xfce-utils/xfce-utils_4.2.2.bb
rename to packages/xfce/xfce-utils_4.4.1.bb

diff --git a/packages/xfce4-goodies/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc
similarity index 100%
rename from packages/xfce4-goodies/xfce4-appfinder.inc
rename to packages/xfce/xfce4-appfinder.inc

diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb
similarity index 100%
rename from packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb
rename to packages/xfce/xfce4-appfinder_4.4.1.bb

diff --git a/packages/xfce/xfce4-icon-theme_4.4.1.bb b/packages/xfce/xfce4-icon-theme_4.4.1.bb
new file mode 100644 (file)
index 0000000..69d9dac
--- /dev/null
+++ b/packages/xfce/xfce4-icon-theme_4.4.1.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "Rodent vector icon theme used by XFCE"
+PACKAGE_ARCH = "all"
+
+inherit xfce
+
+FILES_${PN} += "${datadir}/xfce4"

diff --git a/packages/xfce4-goodies/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc
similarity index 100%
rename from packages/xfce4-goodies/xfce4-mixer.inc
rename to packages/xfce/xfce4-mixer.inc

diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb b/packages/xfce/xfce4-mixer_4.4.1.bb
similarity index 100%
rename from packages/xfce4-goodies/xfce4-mixer_4.2.2.bb
rename to packages/xfce/xfce4-mixer_4.4.1.bb

diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc
similarity index 100%
rename from packages/xfce4-panel/xfce4-panel.inc
rename to packages/xfce/xfce4-panel.inc

diff --git a/packages/xfce4-panel/xfce4-panel_4.2.2.bb b/packages/xfce/xfce4-panel_4.4.1.bb
similarity index 100%
rename from packages/xfce4-panel/xfce4-panel_4.2.2.bb
rename to packages/xfce/xfce4-panel_4.4.1.bb

diff --git a/packages/xfce/xfce4-session_4.4.1.bb b/packages/xfce/xfce4-session_4.4.1.bb
new file mode 100644 (file)
index 0000000..a572b80
--- /dev/null
+++ b/packages/xfce/xfce4-session_4.4.1.bb
@@ -0,0 +1,4 @@
+DESCRIPTION = "Calendar application for the Xfce Desktop  Environment"
+DEPENDS = "libxfcegui4 libxfce4util xfce-mcs-manager dbus"
+
+inherit xfce

diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfce/xfdesktop.inc
similarity index 100%
rename from packages/xfdesktop/xfdesktop.inc
rename to packages/xfce/xfdesktop.inc

diff --git a/packages/xfdesktop/xfdesktop_4.2.2.bb b/packages/xfce/xfdesktop_4.4.1.bb
similarity index 100%
rename from packages/xfdesktop/xfdesktop_4.2.2.bb
rename to packages/xfce/xfdesktop_4.4.1.bb

diff --git a/packages/xfprint/xfprint_4.2.0.bb b/packages/xfce/xfprint_4.4.1.bb
similarity index 100%
rename from packages/xfprint/xfprint_4.2.0.bb
rename to packages/xfce/xfprint_4.4.1.bb

diff --git a/packages/xfwm4-themes/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc
similarity index 100%
rename from packages/xfwm4-themes/xfwm4-themes.inc
rename to packages/xfce/xfwm4-themes.inc

diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb b/packages/xfce/xfwm4-themes_4.4.1.bb
similarity index 100%
rename from packages/xfwm4-themes/xfwm4-themes_4.2.2.bb
rename to packages/xfce/xfwm4-themes_4.4.1.bb

diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfce/xfwm4.inc
similarity index 100%
rename from packages/xfwm4/xfwm4.inc
rename to packages/xfce/xfwm4.inc

diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb b/packages/xfce/xfwm4_4.4.1.bb
similarity index 83%
rename from packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb
rename to packages/xfce/xfwm4_4.4.1.bb
index f7c9797..2fc47e6 100644 (file)
--- a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb
+++ b/packages/xfce/xfwm4_4.4.1.bb
@@ -1,5 +1,6 @@
-# xfce4-appfinder build file
+# xfwm4 OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
+PR="r1"
 require ${PN}.inc

diff --git a/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb
deleted file mode 100644 (file)
index 6dd3c05..0000000
--- a/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mixer-plugin OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc