From c2faa0722e6c264b18d69a2f3f37fe5b81a9e675 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 10 May 2007 13:46:39 +0000 Subject: 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/libxfce4mcs/libxfce4mcs.inc | 19 ------------- packages/libxfce4mcs/libxfce4mcs_4.2.2.bb | 5 ---- packages/libxfce4util/libxfce4util.inc | 31 ---------------------- packages/libxfce4util/libxfce4util_4.2.2.bb | 7 ----- packages/libxfcegui4/libxfcegui4.inc | 16 ----------- packages/libxfcegui4/libxfcegui4_4.2.3.bb | 5 ---- packages/xfce-mcs-manager/xfce-mcs-manager.inc | 25 ----------------- .../xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb | 5 ---- packages/xfce-mcs-plugins/xfce-mcs-plugins.inc | 12 --------- .../xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb | 5 ---- packages/xfce-utils/xfce-utils.inc | 29 -------------------- packages/xfce-utils/xfce-utils_4.2.2.bb | 6 ----- packages/xfce/.mtn2git_empty | 0 packages/xfce/exo_0.3.2.bb | 17 ++++++++++++ packages/xfce/gtk-xfce-engine_2.4.1.bb | 9 +++++++ packages/xfce/libxfce4mcs.inc | 19 +++++++++++++ packages/xfce/libxfce4mcs_4.4.1.bb | 5 ++++ packages/xfce/libxfce4util.inc | 29 ++++++++++++++++++++ packages/xfce/libxfce4util_4.4.1.bb | 5 ++++ packages/xfce/libxfcegui4.inc | 16 +++++++++++ packages/xfce/libxfcegui4_4.4.1.bb | 5 ++++ packages/xfce/mousepad_0.2.12.bb | 6 +++++ packages/xfce/orage_4.4.1.bb | 5 ++++ packages/xfce/thunar_0.8.0.bb | 15 +++++++++++ packages/xfce/xfce-mcs-manager.inc | 25 +++++++++++++++++ packages/xfce/xfce-mcs-manager_4.4.1.bb | 5 ++++ packages/xfce/xfce-mcs-plugins.inc | 12 +++++++++ packages/xfce/xfce-mcs-plugins_4.4.1.bb | 5 ++++ packages/xfce/xfce-terminal_0.2.6.bb | 8 ++++++ packages/xfce/xfce-utils.inc | 29 ++++++++++++++++++++ packages/xfce/xfce-utils_4.4.1.bb | 6 +++++ packages/xfce/xfce4-appfinder.inc | 8 ++++++ packages/xfce/xfce4-appfinder_4.4.1.bb | 5 ++++ packages/xfce/xfce4-icon-theme_4.4.1.bb | 6 +++++ packages/xfce/xfce4-mixer.inc | 9 +++++++ packages/xfce/xfce4-mixer_4.4.1.bb | 5 ++++ packages/xfce/xfce4-panel.inc | 24 +++++++++++++++++ packages/xfce/xfce4-panel_4.4.1.bb | 6 +++++ packages/xfce/xfce4-session_4.4.1.bb | 4 +++ packages/xfce/xfdesktop.inc | 14 ++++++++++ packages/xfce/xfdesktop_4.4.1.bb | 6 +++++ packages/xfce/xfprint_4.4.1.bb | 9 +++++++ packages/xfce/xfwm4-themes.inc | 18 +++++++++++++ packages/xfce/xfwm4-themes_4.4.1.bb | 5 ++++ packages/xfce/xfwm4.inc | 31 ++++++++++++++++++++++ packages/xfce/xfwm4_4.4.1.bb | 6 +++++ packages/xfce4-goodies/xfce4-appfinder.inc | 8 ------ packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb | 5 ---- packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb | 5 ---- packages/xfce4-goodies/xfce4-mixer.inc | 9 ------- packages/xfce4-goodies/xfce4-mixer_4.2.2.bb | 5 ---- packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb | 5 ---- packages/xfce4-panel/xfce4-panel.inc | 24 ----------------- packages/xfce4-panel/xfce4-panel_4.2.2.bb | 6 ----- packages/xfdesktop/xfdesktop.inc | 14 ---------- packages/xfdesktop/xfdesktop_4.2.2.bb | 6 ----- packages/xfprint/xfprint_4.2.0.bb | 9 ------- packages/xfwm4-themes/xfwm4-themes.inc | 18 ------------- packages/xfwm4-themes/xfwm4-themes_4.2.2.bb | 5 ---- packages/xfwm4/xfwm4.inc | 31 ---------------------- 60 files changed, 377 insertions(+), 315 deletions(-) delete mode 100644 packages/libxfce4mcs/libxfce4mcs.inc delete mode 100644 packages/libxfce4mcs/libxfce4mcs_4.2.2.bb delete mode 100644 packages/libxfce4util/libxfce4util.inc delete mode 100644 packages/libxfce4util/libxfce4util_4.2.2.bb delete mode 100644 packages/libxfcegui4/libxfcegui4.inc delete mode 100644 packages/libxfcegui4/libxfcegui4_4.2.3.bb delete mode 100644 packages/xfce-mcs-manager/xfce-mcs-manager.inc delete mode 100644 packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb delete mode 100644 packages/xfce-mcs-plugins/xfce-mcs-plugins.inc delete mode 100644 packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb delete mode 100644 packages/xfce-utils/xfce-utils.inc delete mode 100644 packages/xfce-utils/xfce-utils_4.2.2.bb 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 create mode 100644 packages/xfce/libxfce4mcs.inc create mode 100644 packages/xfce/libxfce4mcs_4.4.1.bb create mode 100644 packages/xfce/libxfce4util.inc create mode 100644 packages/xfce/libxfce4util_4.4.1.bb create mode 100644 packages/xfce/libxfcegui4.inc create mode 100644 packages/xfce/libxfcegui4_4.4.1.bb 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 create mode 100644 packages/xfce/xfce-mcs-manager.inc create mode 100644 packages/xfce/xfce-mcs-manager_4.4.1.bb create mode 100644 packages/xfce/xfce-mcs-plugins.inc create mode 100644 packages/xfce/xfce-mcs-plugins_4.4.1.bb create mode 100644 packages/xfce/xfce-terminal_0.2.6.bb create mode 100644 packages/xfce/xfce-utils.inc create mode 100644 packages/xfce/xfce-utils_4.4.1.bb create mode 100644 packages/xfce/xfce4-appfinder.inc create mode 100644 packages/xfce/xfce4-appfinder_4.4.1.bb create mode 100644 packages/xfce/xfce4-icon-theme_4.4.1.bb create mode 100644 packages/xfce/xfce4-mixer.inc create mode 100644 packages/xfce/xfce4-mixer_4.4.1.bb create mode 100644 packages/xfce/xfce4-panel.inc create mode 100644 packages/xfce/xfce4-panel_4.4.1.bb create mode 100644 packages/xfce/xfce4-session_4.4.1.bb create mode 100644 packages/xfce/xfdesktop.inc create mode 100644 packages/xfce/xfdesktop_4.4.1.bb create mode 100644 packages/xfce/xfprint_4.4.1.bb create mode 100644 packages/xfce/xfwm4-themes.inc create mode 100644 packages/xfce/xfwm4-themes_4.4.1.bb create mode 100644 packages/xfce/xfwm4.inc create mode 100644 packages/xfce/xfwm4_4.4.1.bb delete mode 100644 packages/xfce4-goodies/xfce4-appfinder.inc delete mode 100644 packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb delete mode 100644 packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb delete mode 100644 packages/xfce4-goodies/xfce4-mixer.inc delete mode 100644 packages/xfce4-goodies/xfce4-mixer_4.2.2.bb delete mode 100644 packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb delete mode 100644 packages/xfce4-panel/xfce4-panel.inc delete mode 100644 packages/xfce4-panel/xfce4-panel_4.2.2.bb delete mode 100644 packages/xfdesktop/xfdesktop.inc delete mode 100644 packages/xfdesktop/xfdesktop_4.2.2.bb delete mode 100644 packages/xfprint/xfprint_4.2.0.bb delete mode 100644 packages/xfwm4-themes/xfwm4-themes.inc delete mode 100644 packages/xfwm4-themes/xfwm4-themes_4.2.2.bb delete mode 100644 packages/xfwm4/xfwm4.inc diff --git a/packages/libxfce4mcs/libxfce4mcs.inc b/packages/libxfce4mcs/libxfce4mcs.inc deleted file mode 100644 index 19268fc9b3..0000000000 --- a/packages/libxfce4mcs/libxfce4mcs.inc +++ /dev/null @@ -1,19 +0,0 @@ -# libxfce4mcs OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="Settings management library used by most XFce 4 modules" -DEPENDS="libxfce4util" -SECTION = "x11/libs" - -inherit xfce pkgconfig - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs - - install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs - oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} - oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} -} diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb b/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb deleted file mode 100644 index 07d7a95ae1..0000000000 --- a/packages/libxfce4mcs/libxfce4mcs_4.2.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -# libxfce4mcs OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require ${PN}.inc diff --git a/packages/libxfce4util/libxfce4util.inc b/packages/libxfce4util/libxfce4util.inc deleted file mode 100644 index dbe6501e42..0000000000 --- a/packages/libxfce4util/libxfce4util.inc +++ /dev/null @@ -1,31 +0,0 @@ -# libxfce4util OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPL" -DEPENDS = "glib-2.0" - -inherit xfce pkgconfig - -XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ - i18n.h util.h xfce-kiosk.h libxfce4util-config.h \ - xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ - xfce-fileutils.h xfce-rc.h" - -MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util - for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util - done - - 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/libxfce4util/libxfce4util_4.2.2.bb deleted file mode 100644 index bc6443021f..0000000000 --- a/packages/libxfce4util/libxfce4util_4.2.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -# libxfce4util OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require ${PN}.inc -PR = "r1" - diff --git a/packages/libxfcegui4/libxfcegui4.inc b/packages/libxfcegui4/libxfcegui4.inc deleted file mode 100644 index 714e365af4..0000000000 --- a/packages/libxfcegui4/libxfcegui4.inc +++ /dev/null @@ -1,16 +0,0 @@ -# libxfcegui4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "XFCE Widget library and X Window System interaction" -DEPENDS = "libxfce4util dbh libxml2 gtk+" -SECTION = "x11/libs" - -inherit xfce pkgconfig - - -do_stage() { -autotools_stage_all -} - -FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/packages/libxfcegui4/libxfcegui4_4.2.3.bb b/packages/libxfcegui4/libxfcegui4_4.2.3.bb deleted file mode 100644 index 2def53685a..0000000000 --- a/packages/libxfcegui4/libxfcegui4_4.2.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -# libxfcegui4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require ${PN}.inc diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager.inc b/packages/xfce-mcs-manager/xfce-mcs-manager.inc deleted file mode 100644 index c50bf0ca64..0000000000 --- a/packages/xfce-mcs-manager/xfce-mcs-manager.inc +++ /dev/null @@ -1,25 +0,0 @@ -# xfce-mcs-manager OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Settings manager." -DEPENDS="libxfcegui4 libxfce4mcs" -SECTION = "x11" -PR = "r1" - -inherit xfce - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4 - install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager - install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager -} - -# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live -# the standard pkgconfig mangling was confusing us. Mangling is not required -# for this particular .pc, so the following will suffice: - -do_stage_append () { - install -d ${PKG_CONFIG_PATH} - sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_PATH}/xfce-mcs-manager.pc -} diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb deleted file mode 100644 index de5cf2b012..0000000000 --- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -# xfce-mcs-manager OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require ${PN}.inc diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc deleted file mode 100644 index b5b4505e98..0000000000 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc +++ /dev/null @@ -1,12 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "Common XFCE4 configuration plugins." -DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" -SECTION = "x11" - -inherit xfce - -PACKAGES += "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb deleted file mode 100644 index 02ad97e860..0000000000 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -# xfce-mcs-plugins OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require ${PN}.inc diff --git a/packages/xfce-utils/xfce-utils.inc b/packages/xfce-utils/xfce-utils.inc deleted file mode 100644 index 0b191194d7..0000000000 --- a/packages/xfce-utils/xfce-utils.inc +++ /dev/null @@ -1,29 +0,0 @@ -# xfce-utils OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Utilities" -DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" -inherit xfce - -FILES_${PN} += " \ - ${bindir}/* \ - ${datadir}/dbus-1/* \ - ${datadir}/xfce4/AUTHORS \ - ${datadir}/xfce4/BSD \ - ${datadir}/xfce4/COPYING \ - ${datadir}/xfce4/GPL \ - ${datadir}/xfce4/INFO \ - ${datadir}/xfce4/LGPL \ - ${datadir}/xfce4/AUTHORS.html \ - ${datadir}/xfce4/BSD.html \ - ${datadir}/xfce4/COPYING.html \ - ${datadir}/xfce4/GPL.html \ - ${datadir}/xfce4/INFO.html \ - ${datadir}/xfce4/LGPL.html" - -PACKAGES =+ "${PN}-mcs-plugins" -FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" - -# NOTE: This package takes a --with-browser for the default browser -# NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce-utils/xfce-utils_4.2.2.bb b/packages/xfce-utils/xfce-utils_4.2.2.bb deleted file mode 100644 index 57909f2c2d..0000000000 --- a/packages/xfce-utils/xfce-utils_4.2.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -# xfce-utils 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/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/xfce/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc new file mode 100644 index 0000000000..19268fc9b3 --- /dev/null +++ b/packages/xfce/libxfce4mcs.inc @@ -0,0 +1,19 @@ +# libxfce4mcs OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="Settings management library used by most XFce 4 modules" +DEPENDS="libxfce4util" +SECTION = "x11/libs" + +inherit xfce pkgconfig + +do_stage() { + install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs + + install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs + oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR} + oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR} +} diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb new file mode 100644 index 0000000000..07d7a95ae1 --- /dev/null +++ b/packages/xfce/libxfce4mcs_4.4.1.bb @@ -0,0 +1,5 @@ +# libxfce4mcs OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc new file mode 100644 index 0000000000..b30c8f9445 --- /dev/null +++ b/packages/xfce/libxfce4util.inc @@ -0,0 +1,29 @@ +# libxfce4util OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "GPL" +DEPENDS = "glib-2.0" + +inherit xfce pkgconfig + +XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ + i18n.h util.h xfce-kiosk.h libxfce4util-config.h \ + xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ + xfce-fileutils.h xfce-rc.h" + +MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" + +do_stage() { + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util + for file in ${XFCE_HEADERS}; do + install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util + done + + oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} + +} + +FILES_${PN}-dev += " ${datadir}/xfce4/m4" diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb new file mode 100644 index 0000000000..70f5ddac93 --- /dev/null +++ b/packages/xfce/libxfce4util_4.4.1.bb @@ -0,0 +1,5 @@ +# libxfce4util OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc diff --git a/packages/xfce/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc new file mode 100644 index 0000000000..714e365af4 --- /dev/null +++ b/packages/xfce/libxfcegui4.inc @@ -0,0 +1,16 @@ +# libxfcegui4 OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "XFCE Widget library and X Window System interaction" +DEPENDS = "libxfce4util dbh libxml2 gtk+" +SECTION = "x11/libs" + +inherit xfce pkgconfig + + +do_stage() { +autotools_stage_all +} + +FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb new file mode 100644 index 0000000000..2def53685a --- /dev/null +++ b/packages/xfce/libxfcegui4_4.4.1.bb @@ -0,0 +1,5 @@ +# libxfcegui4 OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc 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/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc new file mode 100644 index 0000000000..c50bf0ca64 --- /dev/null +++ b/packages/xfce/xfce-mcs-manager.inc @@ -0,0 +1,25 @@ +# xfce-mcs-manager OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE4 Settings manager." +DEPENDS="libxfcegui4 libxfce4mcs" +SECTION = "x11" +PR = "r1" + +inherit xfce + +do_stage() { + install -d ${STAGING_INCDIR}/xfce4 + install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager + install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager +} + +# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live +# the standard pkgconfig mangling was confusing us. Mangling is not required +# for this particular .pc, so the following will suffice: + +do_stage_append () { + install -d ${PKG_CONFIG_PATH} + sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_PATH}/xfce-mcs-manager.pc +} diff --git a/packages/xfce/xfce-mcs-manager_4.4.1.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb new file mode 100644 index 0000000000..de5cf2b012 --- /dev/null +++ b/packages/xfce/xfce-mcs-manager_4.4.1.bb @@ -0,0 +1,5 @@ +# xfce-mcs-manager OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc diff --git a/packages/xfce/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc new file mode 100644 index 0000000000..b5b4505e98 --- /dev/null +++ b/packages/xfce/xfce-mcs-plugins.inc @@ -0,0 +1,12 @@ +# xfce-mcs-plugins OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "Common XFCE4 configuration plugins." +DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" +SECTION = "x11" + +inherit xfce + +PACKAGES += "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so" diff --git a/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb new file mode 100644 index 0000000000..02ad97e860 --- /dev/null +++ b/packages/xfce/xfce-mcs-plugins_4.4.1.bb @@ -0,0 +1,5 @@ +# xfce-mcs-plugins OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc 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/xfce-utils.inc b/packages/xfce/xfce-utils.inc new file mode 100644 index 0000000000..0b191194d7 --- /dev/null +++ b/packages/xfce/xfce-utils.inc @@ -0,0 +1,29 @@ +# xfce-utils OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE4 Utilities" +DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" +inherit xfce + +FILES_${PN} += " \ + ${bindir}/* \ + ${datadir}/dbus-1/* \ + ${datadir}/xfce4/AUTHORS \ + ${datadir}/xfce4/BSD \ + ${datadir}/xfce4/COPYING \ + ${datadir}/xfce4/GPL \ + ${datadir}/xfce4/INFO \ + ${datadir}/xfce4/LGPL \ + ${datadir}/xfce4/AUTHORS.html \ + ${datadir}/xfce4/BSD.html \ + ${datadir}/xfce4/COPYING.html \ + ${datadir}/xfce4/GPL.html \ + ${datadir}/xfce4/INFO.html \ + ${datadir}/xfce4/LGPL.html" + +PACKAGES =+ "${PN}-mcs-plugins" +FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/" + +# NOTE: This package takes a --with-browser for the default browser +# NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb new file mode 100644 index 0000000000..57909f2c2d --- /dev/null +++ b/packages/xfce/xfce-utils_4.4.1.bb @@ -0,0 +1,6 @@ +# xfce-utils 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/xfce/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc new file mode 100644 index 0000000000..0d102f3bd0 --- /dev/null +++ b/packages/xfce/xfce4-appfinder.inc @@ -0,0 +1,8 @@ +# xfce4-appfinder build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE Application Finder" +SECTION = "x11" +inherit xfce +DEPENDS="libxfcegui4" diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb new file mode 100644 index 0000000000..f7c97970d5 --- /dev/null +++ b/packages/xfce/xfce4-appfinder_4.4.1.bb @@ -0,0 +1,5 @@ +# xfce4-appfinder build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc 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/xfce/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc new file mode 100644 index 0000000000..a923489f32 --- /dev/null +++ b/packages/xfce/xfce4-mixer.inc @@ -0,0 +1,9 @@ +# xfce-mixer-plugin OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE panel mixer plugin" +SECTION = "x11" + +DEPENDS="xfce4-panel" +inherit xfce diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb new file mode 100644 index 0000000000..6dd3c0565b --- /dev/null +++ b/packages/xfce/xfce4-mixer_4.4.1.bb @@ -0,0 +1,5 @@ +# 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 diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc new file mode 100644 index 0000000000..e43807540e --- /dev/null +++ b/packages/xfce/xfce4-panel.inc @@ -0,0 +1,24 @@ +# xfce4-panel OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "XFCE4 Panel" +SECTION = "x11" +DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" + +inherit pkgconfig xfce + +EXTRA_OECONF += " --enable-startup-notification" + + +do_stage() { +autotools_stage_all +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGES += "${PN}-plugins ${PN}-mcs-plugins" +FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*" +FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/" diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb new file mode 100644 index 0000000000..18dce6fa3c --- /dev/null +++ b/packages/xfce/xfce4-panel_4.4.1.bb @@ -0,0 +1,6 @@ +# xfce4-panel 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/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/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc new file mode 100644 index 0000000000..e3e64ef355 --- /dev/null +++ b/packages/xfce/xfdesktop.inc @@ -0,0 +1,14 @@ +# xfdesktop OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="xfce4 Desktop Background Manager" +SECTION = "x11/base" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" + +inherit xfce +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" diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb new file mode 100644 index 0000000000..d7af836791 --- /dev/null +++ b/packages/xfce/xfdesktop_4.4.1.bb @@ -0,0 +1,6 @@ +# xfdesktop 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/xfce/xfprint_4.4.1.bb b/packages/xfce/xfprint_4.4.1.bb new file mode 100644 index 0000000000..7e349ce881 --- /dev/null +++ b/packages/xfce/xfprint_4.4.1.bb @@ -0,0 +1,9 @@ +# xfprint OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE4 Print Manager" +SECTION = "x11/base" + +DEPENDS="libxfcegui4" +inherit xfce diff --git a/packages/xfce/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc new file mode 100644 index 0000000000..c60edc5b83 --- /dev/null +++ b/packages/xfce/xfwm4-themes.inc @@ -0,0 +1,18 @@ +# xfwm4-themes OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE4 Window Manager Themes" +SECTION = "x11/wm" + +inherit xfce + +# No ${PN} for this one +PACKAGES="" + +PACKAGES_DYNAMIC = "xfwm4-theme-*" + +python populate_packages_prepend () { + themedir = bb.data.expand('${datadir}/xfwm4/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb new file mode 100644 index 0000000000..9f67ad2ed9 --- /dev/null +++ b/packages/xfce/xfwm4-themes_4.4.1.bb @@ -0,0 +1,5 @@ +# xfwm4-themes OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +require ${PN}.inc diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc new file mode 100644 index 0000000000..e7e5bc1862 --- /dev/null +++ b/packages/xfce/xfwm4.inc @@ -0,0 +1,31 @@ +# xfwm4 OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="XFCE4 Window Manager" +SECTION = "x11/wm" +inherit xfce + +FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" + +DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +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 () { + themedir = bb.data.expand('${datadir}/themes', d) + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES += " ${PN}-mcs-plugins" + +FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" + diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb new file mode 100644 index 0000000000..2fc47e641e --- /dev/null +++ b/packages/xfce/xfwm4_4.4.1.bb @@ -0,0 +1,6 @@ +# 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-appfinder.inc b/packages/xfce4-goodies/xfce4-appfinder.inc deleted file mode 100644 index 0d102f3bd0..0000000000 --- a/packages/xfce4-goodies/xfce4-appfinder.inc +++ /dev/null @@ -1,8 +0,0 @@ -# xfce4-appfinder build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE Application Finder" -SECTION = "x11" -inherit xfce -DEPENDS="libxfcegui4" diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb b/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb deleted file mode 100644 index f7c97970d5..0000000000 --- a/packages/xfce4-goodies/xfce4-appfinder_4.2.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -# xfce4-appfinder build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require ${PN}.inc diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb deleted file mode 100644 index f7c97970d5..0000000000 --- a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -# xfce4-appfinder build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require ${PN}.inc diff --git a/packages/xfce4-goodies/xfce4-mixer.inc b/packages/xfce4-goodies/xfce4-mixer.inc deleted file mode 100644 index a923489f32..0000000000 --- a/packages/xfce4-goodies/xfce4-mixer.inc +++ /dev/null @@ -1,9 +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) - -DESCRIPTION="XFCE panel mixer plugin" -SECTION = "x11" - -DEPENDS="xfce4-panel" -inherit xfce diff --git a/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb b/packages/xfce4-goodies/xfce4-mixer_4.2.2.bb deleted file mode 100644 index 6dd3c0565b..0000000000 --- a/packages/xfce4-goodies/xfce4-mixer_4.2.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 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 diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc deleted file mode 100644 index e43807540e..0000000000 --- a/packages/xfce4-panel/xfce4-panel.inc +++ /dev/null @@ -1,24 +0,0 @@ -# xfce4-panel OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "XFCE4 Panel" -SECTION = "x11" -DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" - -inherit pkgconfig xfce - -EXTRA_OECONF += " --enable-startup-notification" - - -do_stage() { -autotools_stage_all -} - -do_install() { - oe_runmake DESTDIR=${D} install -} - -PACKAGES += "${PN}-plugins ${PN}-mcs-plugins" -FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*" -FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/" diff --git a/packages/xfce4-panel/xfce4-panel_4.2.2.bb b/packages/xfce4-panel/xfce4-panel_4.2.2.bb deleted file mode 100644 index 18dce6fa3c..0000000000 --- a/packages/xfce4-panel/xfce4-panel_4.2.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -# xfce4-panel 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/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc deleted file mode 100644 index e3e64ef355..0000000000 --- a/packages/xfdesktop/xfdesktop.inc +++ /dev/null @@ -1,14 +0,0 @@ -# xfdesktop OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="xfce4 Desktop Background Manager" -SECTION = "x11/base" -DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" - -inherit xfce -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" diff --git a/packages/xfdesktop/xfdesktop_4.2.2.bb b/packages/xfdesktop/xfdesktop_4.2.2.bb deleted file mode 100644 index d7af836791..0000000000 --- a/packages/xfdesktop/xfdesktop_4.2.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -# xfdesktop 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/xfprint/xfprint_4.2.0.bb b/packages/xfprint/xfprint_4.2.0.bb deleted file mode 100644 index 7e349ce881..0000000000 --- a/packages/xfprint/xfprint_4.2.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -# xfprint OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Print Manager" -SECTION = "x11/base" - -DEPENDS="libxfcegui4" -inherit xfce diff --git a/packages/xfwm4-themes/xfwm4-themes.inc b/packages/xfwm4-themes/xfwm4-themes.inc deleted file mode 100644 index c60edc5b83..0000000000 --- a/packages/xfwm4-themes/xfwm4-themes.inc +++ /dev/null @@ -1,18 +0,0 @@ -# xfwm4-themes OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Window Manager Themes" -SECTION = "x11/wm" - -inherit xfce - -# No ${PN} for this one -PACKAGES="" - -PACKAGES_DYNAMIC = "xfwm4-theme-*" - -python populate_packages_prepend () { - themedir = bb.data.expand('${datadir}/xfwm4/themes', d) - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb deleted file mode 100644 index 9f67ad2ed9..0000000000 --- a/packages/xfwm4-themes/xfwm4-themes_4.2.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -# xfwm4-themes OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -require ${PN}.inc diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc deleted file mode 100644 index e7e5bc1862..0000000000 --- a/packages/xfwm4/xfwm4.inc +++ /dev/null @@ -1,31 +0,0 @@ -# xfwm4 OE build file -# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="XFCE4 Window Manager" -SECTION = "x11/wm" -inherit xfce - -FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" - -DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" -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 () { - themedir = bb.data.expand('${datadir}/themes', d) - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES += " ${PN}-mcs-plugins" - -FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" - -- cgit v1.2.3 From fb7fe0575cd86bab21bf51107eed54c4aab21480 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 10 May 2007 13:48:16 +0000 Subject: minimo_cvs.bb : update to 0.2+SRCDATE taken from poky, added PE = "1" as ipkg thinkgs 0.016>0.02 minimo_0.016+cvs.bb : removed as _cvs is more uptodate. --- packages/mozilla/minimo/minimo.patch | 843 +++++++++++++---------------------- packages/mozilla/minimo_0.016+cvs.bb | 150 ------- packages/mozilla/minimo_cvs.bb | 178 ++++++-- 3 files changed, 456 insertions(+), 715 deletions(-) delete mode 100644 packages/mozilla/minimo_0.016+cvs.bb diff --git a/packages/mozilla/minimo/minimo.patch b/packages/mozilla/minimo/minimo.patch index a1f9291167..8894ee7f45 100644 --- a/packages/mozilla/minimo/minimo.patch +++ b/packages/mozilla/minimo/minimo.patch @@ -1,567 +1,356 @@ Index: mozilla/content/html/content/src/nsFormSubmission.cpp =================================================================== -RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v -retrieving revision 1.46 -diff --context=3 -r1.46 nsFormSubmission.cpp -*** mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46 ---- mozilla/content/html/content/src/nsFormSubmission.cpp 21 Jul 2006 00:27:14 -0000 -*************** -*** 1315,1325 **** - nsresult rv = NS_OK; - - nsCAutoString charset(aCharset); -- // canonical name is passed so that we just have to check against -- // *our* canonical names listed in charsetaliases.properties -- if (charset.EqualsLiteral("ISO-8859-1")) { -- charset.AssignLiteral("windows-1252"); -- } - - // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of - // MS IE/Opera). ---- 1315,1320 ---- +--- mozilla.orig/content/html/content/src/nsFormSubmission.cpp 2005-07-13 18:55:59.000000000 +0200 ++++ mozilla/content/html/content/src/nsFormSubmission.cpp 2007-05-10 12:11:20.000000000 +0200 +@@ -1315,11 +1315,6 @@ + nsresult rv = NS_OK; + + nsCAutoString charset(aCharset); +- // canonical name is passed so that we just have to check against +- // *our* canonical names listed in charsetaliases.properties +- if (charset.EqualsLiteral("ISO-8859-1")) { +- charset.AssignLiteral("windows-1252"); +- } + + // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of + // MS IE/Opera). Index: mozilla/embedding/base/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v -retrieving revision 1.34.8.2 -diff --context=3 -r1.34.8.2 Makefile.in -*** mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2 ---- mozilla/embedding/base/Makefile.in 21 Jul 2006 00:27:14 -0000 -*************** -*** 43,48 **** ---- 43,49 ---- - - MODULE = embed_base - LIBRARY_NAME = embed_base_s -+ EXPORT_LIBRARY = 1 - XPIDL_MODULE = embed_base - - include $(DEPTH)/config/autoconf.mk +--- mozilla.orig/embedding/base/Makefile.in 2006-02-14 06:28:31.000000000 +0100 ++++ mozilla/embedding/base/Makefile.in 2007-05-10 12:11:20.000000000 +0200 +@@ -43,6 +43,7 @@ + + MODULE = embed_base + LIBRARY_NAME = embed_base_s ++EXPORT_LIBRARY = 1 + XPIDL_MODULE = embed_base + + include $(DEPTH)/config/autoconf.mk Index: mozilla/js/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/js/src/Makefile.in,v -retrieving revision 3.95.4.4 -diff --context=3 -r3.95.4.4 Makefile.in -*** mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4 ---- mozilla/js/src/Makefile.in 21 Jul 2006 00:27:14 -0000 -*************** -*** 46,51 **** ---- 46,52 ---- - - MODULE = js - LIBRARY_NAME = mozjs -+ EXPORT_LIBRARY = 1 - LIB_IS_C_ONLY = 1 - GRE_MODULE = 1 - +--- mozilla.orig/js/src/Makefile.in 2006-07-28 00:56:20.000000000 +0200 ++++ mozilla/js/src/Makefile.in 2007-05-10 12:11:21.000000000 +0200 +@@ -46,6 +46,7 @@ + + MODULE = js + LIBRARY_NAME = mozjs ++EXPORT_LIBRARY = 1 + LIB_IS_C_ONLY = 1 + GRE_MODULE = 1 + Index: mozilla/minimo/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/minimo/Makefile.in,v -retrieving revision 1.1.2.2 -diff --context=3 -r1.1.2.2 Makefile.in -*** mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2 ---- mozilla/minimo/Makefile.in 21 Jul 2006 00:27:14 -0000 -*************** -*** 41,46 **** - - include $(DEPTH)/config/autoconf.mk - -! DIRS = config components chrome locales customization base - - include $(topsrcdir)/config/rules.mk ---- 41,46 ---- - - include $(DEPTH)/config/autoconf.mk - -! DIRS = config chrome locales customization base - - include $(topsrcdir)/config/rules.mk +--- mozilla.orig/minimo/Makefile.in 2006-07-24 21:40:53.000000000 +0200 ++++ mozilla/minimo/Makefile.in 2007-05-10 12:13:46.000000000 +0200 +@@ -41,6 +41,6 @@ + + include $(DEPTH)/config/autoconf.mk + +-DIRS = config components chrome locales customization base extensions ++DIRS = config chrome locales customization base extensions + + include $(topsrcdir)/config/rules.mk Index: mozilla/minimo/base/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v -retrieving revision 1.3.2.7 -diff --context=3 -r1.3.2.7 Makefile.in -*** mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7 ---- mozilla/minimo/base/Makefile.in 21 Jul 2006 00:27:14 -0000 -*************** -*** 95,101 **** - - # this should move into the toolkit! - LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ -- CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp - - ifdef WINCE - RCINCLUDE = wince/SplashScreen.rc ---- 95,100 ---- -*************** -*** 139,148 **** - endif - - -- FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps -- FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names -- FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs -- - include $(topsrcdir)/config/static-config.mk - - EXTRA_DEPS += $(STATIC_EXTRA_DEPS) ---- 138,143 ---- -*************** -*** 176,189 **** - # (same as in mozilla/js/src/Makefile.in) - ifdef WINCE - LDFLAGS += -OPT:NOICF - endif - -- export:: -- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . -- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . -- -- -- GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp - - ifdef WINCE - package:: ---- 171,181 ---- - # (same as in mozilla/js/src/Makefile.in) - ifdef WINCE - LDFLAGS += -OPT:NOICF -+ else -+ # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem. -+ LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P - endif - - - ifdef WINCE - package:: +--- mozilla.orig/minimo/base/Makefile.in 2006-08-09 17:42:26.000000000 +0200 ++++ mozilla/minimo/base/Makefile.in 2007-05-10 12:11:21.000000000 +0200 +@@ -96,7 +96,6 @@ + + # this should move into the toolkit! + LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ +-CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp + + ifdef WINCE + RCINCLUDE = wince/SplashScreen.rc +@@ -143,10 +142,6 @@ + endif + + +-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps +-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names +-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs +- + include $(topsrcdir)/config/static-config.mk + + EXTRA_DEPS += $(STATIC_EXTRA_DEPS) +@@ -180,14 +175,11 @@ + # (same as in mozilla/js/src/Makefile.in) + ifdef WINCE + LDFLAGS += -OPT:NOICF ++else ++# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem. ++LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P + endif + +-export:: +- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . +- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . +- +- +-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp + + ifdef WINCE + package:: Index: mozilla/minimo/base/Minimo.cpp =================================================================== -RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v -retrieving revision 1.1.2.11 -diff --context=3 -r1.1.2.11 Minimo.cpp -*** mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11 ---- mozilla/minimo/base/Minimo.cpp 21 Jul 2006 00:27:15 -0000 -*************** -*** 781,789 **** - CreateListenerWindow(); - #endif - -! #ifdef MOZ_WIDGET_GTK2 - gtk_set_locale(); - gtk_init(&argc, &argv); - #endif - - #ifdef HACKY_PRE_LOAD_LIBRARY ---- 781,794 ---- - CreateListenerWindow(); - #endif - -! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) -! #if defined(MOZ_WIDGET_GTK) - gtk_set_locale(); -+ #endif - gtk_init(&argc, &argv); -+ -+ gtk_widget_set_default_visual(gdk_rgb_get_visual()); -+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); - #endif - - #ifdef HACKY_PRE_LOAD_LIBRARY +--- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200 ++++ mozilla/minimo/base/Minimo.cpp 2007-05-10 12:13:21.000000000 +0200 +@@ -813,6 +813,8 @@ + #ifdef MOZ_WIDGET_GTK2 + gtk_set_locale(); + gtk_init(&argc, &argv); ++ gtk_widget_set_default_visual(gdk_rgb_get_visual()); ++ gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); + #endif + + #ifdef HACKY_PRE_LOAD_LIBRARY Index: mozilla/minimo/base/SplashScreen.cpp =================================================================== -RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v -retrieving revision 1.1.2.3 -diff --context=3 -r1.1.2.3 SplashScreen.cpp -*** mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3 ---- mozilla/minimo/base/SplashScreen.cpp 21 Jul 2006 00:27:15 -0000 -*************** -*** 180,188 **** ---- 180,203 ---- - void KillSplashScreen() {} - void GetScreenSize(unsigned long* x, unsigned long* y) - { -+ #ifdef MOZ_WIDGET_GTK2 -+ GdkDisplay* display = gdk_display_get_default(); -+ if (display != NULL) -+ { -+ GdkScreen *screen; -+ screen = gdk_display_get_default_screen(display); -+ *x = gdk_screen_get_width(screen); -+ *y = gdk_screen_get_height(screen); -+ } -+ else -+ { -+ #endif - // we need to figure this out. - *x = 240; - *y = 320; -+ #ifdef MOZ_WIDGET_GTK2 -+ } -+ #endif - } - - -Index: mozilla/minimo/chrome/content/minimo.js -=================================================================== -RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v -retrieving revision 1.9.2.90 -diff --context=3 -r1.9.2.90 minimo.js -*** mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90 ---- mozilla/minimo/chrome/content/minimo.js 21 Jul 2006 00:27:16 -0000 -*************** -*** 1313,1319 **** - 43 const FIND_LINKS = 2; - http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js - */ -! gBrowser.fastFind.find(vQuery,0); - } - } catch (e) { - onErrorHandler(e); ---- 1313,1319 ---- - 43 const FIND_LINKS = 2; - http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js - */ -! gBrowser.fastFind.find(vQuery,0,this.mHasFocus); - } - } catch (e) { - onErrorHandler(e); -*************** -*** 1324,1330 **** - - function DoBrowserFindNext() { - try { -! gBrowser.fastFind.findNext(); - } catch (e) { - onErrorHandler(e); - } ---- 1324,1330 ---- - - function DoBrowserFindNext() { - try { -! gBrowser.fastFind.findNext(this.mHasFocus); - } catch (e) { - onErrorHandler(e); - } +--- mozilla.orig/minimo/base/SplashScreen.cpp 2006-08-21 21:00:24.000000000 +0200 ++++ mozilla/minimo/base/SplashScreen.cpp 2007-05-10 12:11:22.000000000 +0200 +@@ -202,9 +202,24 @@ + void KillSplashScreen() {} + void GetScreenSize(unsigned long* x, unsigned long* y) + { ++#ifdef MOZ_WIDGET_GTK2 ++ GdkDisplay* display = gdk_display_get_default(); ++ if (display != NULL) ++ { ++ GdkScreen *screen; ++ screen = gdk_display_get_default_screen(display); ++ *x = gdk_screen_get_width(screen); ++ *y = gdk_screen_get_height(screen); ++ } ++ else ++ { ++#endif + // we need to figure this out. + *x = 240; + *y = 320; ++#ifdef MOZ_WIDGET_GTK2 ++ } ++#endif + } + + Index: mozilla/minimo/config/linux_package.sh =================================================================== -RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v -retrieving revision 1.8.2.3 -diff --context=3 -r1.8.2.3 linux_package.sh -*** mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3 ---- mozilla/minimo/config/linux_package.sh 21 Jul 2006 00:27:16 -0000 -*************** -*** 29,37 **** - cp -pRL bin/libnssckbi.so minimo - cp -pRL bin/libsmime3.so minimo - cp -pRL bin/libsoftokn3.so minimo -- cp -pRL bin/libsoftokn3.chk minimo - cp -pRL bin/libfreebl3.so minimo -- cp -pRL bin/libfreebl3.chk minimo - cp -pRL bin/libssl3.so minimo - - mkdir -p minimo/chrome ---- 29,35 ---- -*************** -*** 62,69 **** - cp -pRL bin/components/nsHelperAppDlg.js minimo/components - cp -pRL bin/components/nsProgressDialog.js minimo/components - -- cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components -- - mkdir -p minimo/greprefs - cp -pRL bin/greprefs/* minimo/greprefs - ---- 60,65 ---- -*************** -*** 80,86 **** - - echo Linking XPT files. - -! bin/xpt_link minimo/components/all.xpt bin/components/*.xpt - - echo Chewing on chrome - ---- 76,82 ---- - - echo Linking XPT files. - -! host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt - - echo Chewing on chrome - +--- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200 ++++ mozilla/minimo/config/linux_package.sh 2007-05-10 12:11:22.000000000 +0200 +@@ -29,9 +29,7 @@ + cp -pRL bin/libnssckbi.so minimo + cp -pRL bin/libsmime3.so minimo + cp -pRL bin/libsoftokn3.so minimo +-cp -pRL bin/libsoftokn3.chk minimo + cp -pRL bin/libfreebl3.so minimo +-cp -pRL bin/libfreebl3.chk minimo + cp -pRL bin/libssl3.so minimo + + mkdir -p minimo/chrome +@@ -62,8 +60,6 @@ + cp -pRL bin/components/nsHelperAppDlg.js minimo/components + cp -pRL bin/components/nsProgressDialog.js minimo/components + +-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components +- + mkdir -p minimo/greprefs + cp -pRL bin/greprefs/* minimo/greprefs + +@@ -80,7 +76,7 @@ + + echo Linking XPT files. + +-bin/xpt_link minimo/components/all.xpt bin/components/*.xpt ++host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt + + echo Chewing on chrome + Index: mozilla/profile/dirserviceprovider/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v -retrieving revision 1.7 -diff --context=3 -r1.7 Makefile.in -*** mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7 ---- mozilla/profile/dirserviceprovider/src/Makefile.in 21 Jul 2006 00:27:16 -0000 -*************** -*** 44,49 **** ---- 44,50 ---- - - MODULE = profdirserviceprovider - LIBRARY_NAME = profdirserviceprovider_s -+ EXPORT_LIBRARY = 1 - MOZILLA_INTERNAL_API = 1 - - REQUIRES = xpcom \ +--- mozilla.orig/profile/dirserviceprovider/src/Makefile.in 2005-04-06 05:35:21.000000000 +0200 ++++ mozilla/profile/dirserviceprovider/src/Makefile.in 2007-05-10 12:11:23.000000000 +0200 +@@ -44,6 +44,7 @@ + + MODULE = profdirserviceprovider + LIBRARY_NAME = profdirserviceprovider_s ++EXPORT_LIBRARY = 1 + MOZILLA_INTERNAL_API = 1 + + REQUIRES = xpcom \ Index: mozilla/security/coreconf/Linux.mk =================================================================== -RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v -retrieving revision 1.18.18.1 -diff --context=3 -r1.18.18.1 Linux.mk -*** mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1 ---- mozilla/security/coreconf/Linux.mk 21 Jul 2006 00:27:16 -0000 -*************** -*** 117,122 **** ---- 117,126 ---- - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = mips - else -+ ifeq ($(OS_TEST),arm) -+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+ CPU_ARCH = arm -+ else - OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE - CPU_ARCH = x86 - endif -*************** -*** 133,138 **** ---- 137,143 ---- - endif - endif - endif -+ endif - - - LIBC_TAG = _glibc +--- mozilla.orig/security/coreconf/Linux.mk 2006-02-03 23:26:36.000000000 +0100 ++++ mozilla/security/coreconf/Linux.mk 2007-05-10 12:11:23.000000000 +0200 +@@ -117,6 +117,10 @@ + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = mips + else ++ifeq ($(OS_TEST),arm) ++ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++ CPU_ARCH = arm ++else + OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE + CPU_ARCH = x86 + endif +@@ -133,6 +137,7 @@ + endif + endif + endif ++endif + + + LIBC_TAG = _glibc Index: mozilla/security/coreconf/arch.mk =================================================================== -RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v -retrieving revision 1.17.14.2 -diff --context=3 -r1.17.14.2 arch.mk -*** mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2 ---- mozilla/security/coreconf/arch.mk 21 Jul 2006 00:27:16 -0000 -*************** -*** 60,77 **** - 64BIT_TAG= - endif - -! OS_ARCH := $(subst /,_,$(shell uname -s)) - - # - # Attempt to differentiate between sparc and x86 Solaris - # - -! OS_TEST := $(shell uname -m) -! ifeq ($(OS_TEST),i86pc) -! OS_RELEASE := $(shell uname -r)_$(OS_TEST) -! else -! OS_RELEASE := $(shell uname -r) -! endif - - # - # Force the IRIX64 machines to use IRIX. ---- 60,73 ---- - 64BIT_TAG= - endif - -! OS_ARCH := Linux - - # - # Attempt to differentiate between sparc and x86 Solaris - # - -! OS_TEST := arm -! OS_RELEASE := 2.6 - - # - # Force the IRIX64 machines to use IRIX. +--- mozilla.orig/security/coreconf/arch.mk 2006-02-03 23:26:36.000000000 +0100 ++++ mozilla/security/coreconf/arch.mk 2007-05-10 12:11:24.000000000 +0200 +@@ -60,18 +60,14 @@ + 64BIT_TAG= + endif + +-OS_ARCH := $(subst /,_,$(shell uname -s)) ++OS_ARCH := Linux + + # + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) +-ifeq ($(OS_TEST),i86pc) +- OS_RELEASE := $(shell uname -r)_$(OS_TEST) +-else +- OS_RELEASE := $(shell uname -r) +-endif ++OS_TEST := arm ++OS_RELEASE := 2.6 + + # + # Force the IRIX64 machines to use IRIX. Index: mozilla/toolkit/components/build/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v -retrieving revision 1.24.2.10 -diff --context=3 -r1.24.2.10 Makefile.in -*** mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10 ---- mozilla/toolkit/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 112,118 **** - $(NULL) - - SHARED_LIBRARY_LIBS = \ -- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ - $(NULL) - - ifdef MOZ_XPINSTALL ---- 112,117 ---- +--- mozilla.orig/toolkit/components/build/Makefile.in 2006-07-13 22:08:29.000000000 +0200 ++++ mozilla/toolkit/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -112,7 +112,6 @@ + $(NULL) + + SHARED_LIBRARY_LIBS = \ +- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ + $(NULL) + + ifdef MOZ_XPINSTALL Index: mozilla/toolkit/components/startup/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v -retrieving revision 1.7 -diff --context=3 -r1.7 Makefile.in -*** mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7 ---- mozilla/toolkit/components/startup/src/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 43,48 **** ---- 43,49 ---- - - MODULE = toolkitcomps - LIBRARY_NAME = appstartup_s -+ EXPORT_LIBRARY = 1 - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 - +--- mozilla.orig/toolkit/components/startup/src/Makefile.in 2005-07-27 22:42:44.000000000 +0200 ++++ mozilla/toolkit/components/startup/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -43,6 +43,7 @@ + + MODULE = toolkitcomps + LIBRARY_NAME = appstartup_s ++EXPORT_LIBRARY = 1 + FORCE_STATIC_LIB = 1 + LIBXUL_LIBRARY = 1 + Index: mozilla/toolkit/xre/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v -retrieving revision 1.48.2.3 -diff --context=3 -r1.48.2.3 Makefile.in -*** mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3 ---- mozilla/toolkit/xre/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 45,51 **** - - MODULE = xulapp - LIBRARY_NAME = xulapp_s -- EXPORT_LIBRARY = 1 - LIBXUL_LIBRARY = 1 - - REQUIRES = \ ---- 45,50 ---- -*************** -*** 176,