From c2faa0722e6c264b18d69a2f3f37fe5b81a9e675 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 10 May 2007 13:46:39 +0000 Subject: [PATCH] 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 --- packages/xfce/.mtn2git_empty | 0 packages/xfce/exo_0.3.2.bb | 17 +++++++++++++++++ packages/xfce/gtk-xfce-engine_2.4.1.bb | 9 +++++++++ packages/{libxfce4mcs => xfce}/libxfce4mcs.inc | 0 .../libxfce4mcs_4.4.1.bb} | 0 .../{libxfce4util => xfce}/libxfce4util.inc | 2 -- .../libxfce4util_4.4.1.bb} | 2 -- packages/{libxfcegui4 => xfce}/libxfcegui4.inc | 0 .../libxfcegui4_4.4.1.bb} | 0 packages/xfce/mousepad_0.2.12.bb | 6 ++++++ packages/xfce/orage_4.4.1.bb | 5 +++++ packages/xfce/thunar_0.8.0.bb | 15 +++++++++++++++ .../xfce-mcs-manager.inc | 0 .../xfce-mcs-manager_4.4.1.bb} | 0 .../xfce-mcs-plugins.inc | 0 .../xfce-mcs-plugins_4.4.1.bb} | 0 packages/xfce/xfce-terminal_0.2.6.bb | 8 ++++++++ packages/{xfce-utils => xfce}/xfce-utils.inc | 0 .../xfce-utils_4.4.1.bb} | 0 .../{xfce4-goodies => xfce}/xfce4-appfinder.inc | 0 .../xfce4-appfinder_4.4.1.bb} | 0 packages/xfce/xfce4-icon-theme_4.4.1.bb | 6 ++++++ .../{xfce4-goodies => xfce}/xfce4-mixer.inc | 0 .../xfce4-mixer_4.4.1.bb} | 0 packages/{xfce4-panel => xfce}/xfce4-panel.inc | 0 .../xfce4-panel_4.4.1.bb} | 0 packages/xfce/xfce4-session_4.4.1.bb | 4 ++++ packages/{xfdesktop => xfce}/xfdesktop.inc | 0 .../xfdesktop_4.4.1.bb} | 0 .../xfprint_4.2.0.bb => xfce/xfprint_4.4.1.bb} | 0 .../{xfwm4-themes => xfce}/xfwm4-themes.inc | 0 .../xfwm4-themes_4.4.1.bb} | 0 packages/{xfwm4 => xfce}/xfwm4.inc | 0 .../xfwm4_4.4.1.bb} | 3 ++- packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb | 5 ----- 35 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 packages/xfce/.mtn2git_empty create mode 100644 packages/xfce/exo_0.3.2.bb create mode 100644 packages/xfce/gtk-xfce-engine_2.4.1.bb rename packages/{libxfce4mcs => xfce}/libxfce4mcs.inc (100%) rename packages/{libxfce4mcs/libxfce4mcs_4.2.2.bb => xfce/libxfce4mcs_4.4.1.bb} (100%) rename packages/{libxfce4util => xfce}/libxfce4util.inc (88%) rename packages/{libxfce4util/libxfce4util_4.2.2.bb => xfce/libxfce4util_4.4.1.bb} (94%) rename packages/{libxfcegui4 => xfce}/libxfcegui4.inc (100%) rename packages/{libxfcegui4/libxfcegui4_4.2.3.bb => xfce/libxfcegui4_4.4.1.bb} (100%) create mode 100644 packages/xfce/mousepad_0.2.12.bb create mode 100644 packages/xfce/orage_4.4.1.bb create mode 100644 packages/xfce/thunar_0.8.0.bb rename packages/{xfce-mcs-manager => xfce}/xfce-mcs-manager.inc (100%) rename packages/{xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb => xfce/xfce-mcs-manager_4.4.1.bb} (100%) rename packages/{xfce-mcs-plugins => xfce}/xfce-mcs-plugins.inc (100%) rename packages/{xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb => xfce/xfce-mcs-plugins_4.4.1.bb} (100%) create mode 100644 packages/xfce/xfce-terminal_0.2.6.bb rename packages/{xfce-utils => xfce}/xfce-utils.inc (100%) rename packages/{xfce-utils/xfce-utils_4.2.2.bb => xfce/xfce-utils_4.4.1.bb} (100%) rename packages/{xfce4-goodies => xfce}/xfce4-appfinder.inc (100%) rename packages/{xfce4-goodies/xfce4-appfinder_4.2.2.bb => xfce/xfce4-appfinder_4.4.1.bb} (100%) create mode 100644 packages/xfce/xfce4-icon-theme_4.4.1.bb rename packages/{xfce4-goodies => xfce}/xfce4-mixer.inc (100%) rename packages/{xfce4-goodies/xfce4-mixer_4.2.2.bb => xfce/xfce4-mixer_4.4.1.bb} (100%) rename packages/{xfce4-panel => xfce}/xfce4-panel.inc (100%) rename packages/{xfce4-panel/xfce4-panel_4.2.2.bb => xfce/xfce4-panel_4.4.1.bb} (100%) create mode 100644 packages/xfce/xfce4-session_4.4.1.bb rename packages/{xfdesktop => xfce}/xfdesktop.inc (100%) rename packages/{xfdesktop/xfdesktop_4.2.2.bb => xfce/xfdesktop_4.4.1.bb} (100%) rename packages/{xfprint/xfprint_4.2.0.bb => xfce/xfprint_4.4.1.bb} (100%) rename packages/{xfwm4-themes => xfce}/xfwm4-themes.inc (100%) rename packages/{xfwm4-themes/xfwm4-themes_4.2.2.bb => xfce/xfwm4-themes_4.4.1.bb} (100%) rename packages/{xfwm4 => xfce}/xfwm4.inc (100%) rename packages/{xfce4-goodies/xfce4-appfinder_4.3.99.2.bb => xfce/xfwm4_4.4.1.bb} (83%) delete mode 100644 packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb diff --git a/packages/xfce/.mtn2git_empty b/packages/xfce/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb new file mode 100644 index 0000000000..6bf0e1292f --- /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 index 0000000000..bcfecaf53b --- /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 dbe6501e42..b30c8f9445 100644 --- 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 bc6443021f..70f5ddac93 100644 --- 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 index 0000000000..670a28dbd7 --- /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 index 0000000000..b8f5284454 --- /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 index 0000000000..ea739e4cde --- /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 index 0000000000..07a8eb6eb5 --- /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 index 0000000000..69d9dacbac --- /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 index 0000000000..a572b80f55 --- /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 f7c97970d5..2fc47e641e 100644 --- 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 index 6dd3c0565b..0000000000 --- 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 -- 2.39.5