diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/libxfce4mcs/libxfce4mcs_4.2.0.bb | 19 | ||||
-rw-r--r-- | packages/libxfce4util/libxfce4util.inc | 21 | ||||
-rw-r--r-- | packages/libxfce4util/libxfce4util_4.2.0.bb | 34 | ||||
-rw-r--r-- | packages/libxfce4util/libxfce4util_4.2.2.bb | 8 | ||||
-rw-r--r-- | packages/libxfcegui4/libxfcegui4.inc | 19 | ||||
-rw-r--r-- | packages/libxfcegui4/libxfcegui4_4.2.0.bb | 53 | ||||
-rw-r--r-- | packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb | 24 | ||||
-rw-r--r-- | packages/xfce-mcs-plugins/xfce-mcs-plugins.inc | 9 | ||||
-rw-r--r-- | packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb | 7 | ||||
-rw-r--r-- | packages/xfce-utils/xfce-utils_4.2.0.bb | 25 | ||||
-rw-r--r-- | packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb | 8 | ||||
-rw-r--r-- | packages/xfce4-goodies/xfce4-mixer_4.2.0.bb | 9 | ||||
-rw-r--r-- | packages/xfce4-panel/xfce4-panel.inc | 16 | ||||
-rw-r--r-- | packages/xfce4-panel/xfce4-panel_4.2.0.bb | 25 |
14 files changed, 35 insertions, 242 deletions
diff --git a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb b/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb deleted file mode 100644 index ff4dae1c8e..0000000000 --- a/packages/libxfce4mcs/libxfce4mcs_4.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "x11/libs" -# 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" - -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/libxfce4util/libxfce4util.inc b/packages/libxfce4util/libxfce4util.inc index fcd5b74ad8..dbe6501e42 100644 --- a/packages/libxfce4util/libxfce4util.inc +++ b/packages/libxfce4util/libxfce4util.inc @@ -7,16 +7,6 @@ SECTION = "x11/libs" LICENSE = "GPL" DEPENDS = "glib-2.0" -# | checking whether putenv() implementation is broken... configure: error: cannot run test program while cross compiling -BROKEN = "1" - -# Fixed on i386/i486/i586/i686 - needs to be confirmed on other platforms - -BROKEN_i386="0" -BROKEN_i486="0" -BROKEN_i586="0" -BROKEN_i686="0" - inherit xfce pkgconfig XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ @@ -24,11 +14,18 @@ XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.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}/xfce4/libxfce4util + install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/xfce4/libxfce4util + 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.0.bb b/packages/libxfce4util/libxfce4util_4.2.0.bb deleted file mode 100644 index fcd5b74ad8..0000000000 --- a/packages/libxfce4util/libxfce4util_4.2.0.bb +++ /dev/null @@ -1,34 +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" - -# | checking whether putenv() implementation is broken... configure: error: cannot run test program while cross compiling -BROKEN = "1" - -# Fixed on i386/i486/i586/i686 - needs to be confirmed on other platforms - -BROKEN_i386="0" -BROKEN_i486="0" -BROKEN_i586="0" -BROKEN_i686="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" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/xfce4/libxfce4util - for file in ${XFCE_HEADERS}; do - install -m 644 libxfce4util/$file ${STAGING_INCDIR}/xfce4/libxfce4util - done - - oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR} -} diff --git a/packages/libxfce4util/libxfce4util_4.2.2.bb b/packages/libxfce4util/libxfce4util_4.2.2.bb index 0fbc5321bb..e89d2cfa97 100644 --- a/packages/libxfce4util/libxfce4util_4.2.2.bb +++ b/packages/libxfce4util/libxfce4util_4.2.2.bb @@ -3,11 +3,5 @@ # Released under the MIT license (see packages/COPYING) include ${PN}.inc +PR = "r1" -MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" -FILES_${PN}-dev += " ${datadir}/xfce4/m4" - -do_stage() { - install -d ${STAGING_DATADIR}/aclocal/ - install -m 0644 ${MACROS} ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/libxfcegui4/libxfcegui4.inc b/packages/libxfcegui4/libxfcegui4.inc index 36a125b747..882cf3a55b 100644 --- a/packages/libxfcegui4/libxfcegui4.inc +++ b/packages/libxfcegui4/libxfcegui4.inc @@ -2,15 +2,12 @@ # 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+" +DESCRIPTION = "XFCE Widget library and X Window System interaction" +DEPENDS = "libxfce4util dbh libxml2 gtk+" SECTION = "x11/libs" inherit xfce pkgconfig -FILES_${PN} += "/usr/lib/xfce4/modules/* /usr/share/xfce4/mime/ \ - /usr/share/icons/hicolor/" - XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ gtk_style.h netk-util.h xfce_aboutdialog.h \ gtktoxevent.h netk-window-action-menu.h xfce_clock.h \ @@ -29,17 +26,17 @@ XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ MODULE_HEADERS="combo.h constants.h mime.h mime_icons.h" do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfcegui4 - install -d ${STAGING_INCDIR}/xfce4/xfce4-modules - install -d ${STAGING_LIBDIR}/xfce4/modules + install -d ${STAGING_INCDIR}/libxfcegui4 + install -d ${STAGING_INCDIR}/xfce4-modules + install -d ${STAGING_LIBDIR}/modules for file in ${XFCE_HEADERS}; do - install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/xfce4/libxfcegui4 + install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/libxfcegui4 done for file in ${MODULE_HEADERS}; do install -m 644 xfce4-modules/headers/$file \ - ${STAGING_INCDIR}/xfce4/xfce4-modules + ${STAGING_INCDIR}/xfce4-modules done oe_libinstall -C libxfcegui4 -so libxfcegui4 ${STAGING_LIBDIR} @@ -51,3 +48,5 @@ do_stage() { oe_libinstall -C xfce4-modules/mime-applications -so libxfce4_mime \ ${STAGING_LIBDIR}/xfce4/modules } + +FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor" diff --git a/packages/libxfcegui4/libxfcegui4_4.2.0.bb b/packages/libxfcegui4/libxfcegui4_4.2.0.bb deleted file mode 100644 index 4eb5d8a781..0000000000 --- a/packages/libxfcegui4/libxfcegui4_4.2.0.bb +++ /dev/null @@ -1,53 +0,0 @@ -SECTION = "x11/libs" -# 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+" - -inherit xfce pkgconfig - -FILES_${PN} += "/usr/lib/xfce4/modules/* /usr/share/xfce4/mime/ \ - /usr/share/icons/hicolor/" - -XFCE_HEADERS= "dialogs.h netk-trayicon.h xfce-icontheme.h \ - gtk_style.h netk-util.h xfce_aboutdialog.h \ - gtktoxevent.h netk-window-action-menu.h xfce_clock.h \ - icons.h netk-window-menu.h xfce_decorbutton.h \ - libnetk.h netk-window.h xfce_decortoggle.h \ - libxfcegui4-config.h netk-workspace.h xfce_framebox.h \ - libxfcegui4.h preview_filesel.h xfce_iconbutton.h \ - netk-application.h session-client.h xfce_marshal.h \ - netk-class-group.h xfce-appmenuitem.h xfce_menubutton.h \ - netk-enum-types.h xfce-colorbutton.h xfce_movehandler.h \ - netk-marshal.h xfce-exec.h xfce_scaled_image.h \ - netk-pager.h xfce-filechooser.h xfce_systemtray.h \ - netk-screen.h xfce-gdk-extensions.h xfce_togglebutton.h \ - netk-tasklist.h xfce-gtk-extensions.h xinerama.h" - -MODULE_HEADERS="combo.h constants.h mime.h mime_icons.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/libxfcegui4 - install -d ${STAGING_INCDIR}/xfce4/xfce4-modules - install -d ${STAGING_LIBDIR}/xfce4/modules - - for file in ${XFCE_HEADERS}; do - install -m 644 libxfcegui4/$file ${STAGING_INCDIR}/xfce4/libxfcegui4 - done - - for file in ${MODULE_HEADERS}; do - install -m 644 xfce4-modules/headers/$file \ - ${STAGING_INCDIR}/xfce4/xfce4-modules - done - - oe_libinstall -C libxfcegui4 -so libxfcegui4 ${STAGING_LIBDIR} - - oe_libinstall -C xfce4-modules/mime-icons -so libxfce4_mime_icons \ - ${STAGING_LIBDIR}/xfce4/modules - oe_libinstall -C xfce4-modules/combo -so libxfce4_combo \ - ${STAGING_LIBDIR}/xfce4/modules - oe_libinstall -C xfce4-modules/mime-applications -so libxfce4_mime \ - ${STAGING_LIBDIR}/xfce4/modules -} diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb deleted file mode 100644 index 521d47697e..0000000000 --- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.0.bb +++ /dev/null @@ -1,24 +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" - -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} - install -m 0644 ${S}/xfce-mcs-manager/xfce-mcs-manager.pc ${PKG_CONFIG_PATH}/xfce-mcs-manager.pc -} diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc index 14dfe175ea..b5b4505e98 100644 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc +++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins.inc @@ -2,8 +2,11 @@ # 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" +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.0.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb deleted file mode 100644 index 92046c0b81..0000000000 --- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.0.bb +++ /dev/null @@ -1,7 +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+" -inherit xfce diff --git a/packages/xfce-utils/xfce-utils_4.2.0.bb b/packages/xfce-utils/xfce-utils_4.2.0.bb deleted file mode 100644 index 8498cbf088..0000000000 --- a/packages/xfce-utils/xfce-utils_4.2.0.bb +++ /dev/null @@ -1,25 +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) - -PR="r1" - -DESCRIPTION="XFCE4 Utilities" -DEPENDS="x11 libxfcegui4 xfce-mcs-manager" -inherit xfce - -FILES_${PN} += " /usr/share/xfce4/AUTHORS \ - /usr/share/xfce4/BSD \ - /usr/share/xfce4/COPYING \ - /usr/share/xfce4/GPL \ - /usr/share/xfce4/INFO \ - /usr/share/xfce4/LGPL \ - /usr/share/xfce4/AUTHORS.html \ - /usr/share/xfce4/BSD.html \ - /usr/share/xfce4/COPYING.html \ - /usr/share/xfce4/GPL.html \ - /usr/share/xfce4/INFO.html \ - /usr/share/xfce4/LGPL.html" - -# NOTE: This package takes a --with-browser for the default browser -# NOTE: Works with gdm also gtkhtml diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb b/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb deleted file mode 100644 index 0d102f3bd0..0000000000 --- a/packages/xfce4-goodies/xfce4-appfinder_4.2.0.bb +++ /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-mixer_4.2.0.bb b/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb deleted file mode 100644 index a923489f32..0000000000 --- a/packages/xfce4-goodies/xfce4-mixer_4.2.0.bb +++ /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-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc index 4950da6f68..30473eea06 100644 --- a/packages/xfce4-panel/xfce4-panel.inc +++ b/packages/xfce4-panel/xfce4-panel.inc @@ -2,17 +2,14 @@ # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) -DESCRIPTION="XFCE4 Panel" +DESCRIPTION = "XFCE4 Panel" SECTION = "x11" -DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" +DEPENDS = "startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" + inherit pkgconfig xfce EXTRA_OECONF += " --enable-startup-notification" -do_install() { - oe_runmake DESTDIR=${D} install -} - HEADERS="controls.h global.h icons.h main.h panel.h item.h \ item_dialog.h plugins.h xfce_support.h xfce.h" @@ -23,3 +20,10 @@ do_stage() { install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file done } + +do_install() { + oe_runmake DESTDIR=${D} install +} + +PACKAGES += "${PN}-plugins" +FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*" diff --git a/packages/xfce4-panel/xfce4-panel_4.2.0.bb b/packages/xfce4-panel/xfce4-panel_4.2.0.bb deleted file mode 100644 index 4950da6f68..0000000000 --- a/packages/xfce4-panel/xfce4-panel_4.2.0.bb +++ /dev/null @@ -1,25 +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 x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" -inherit pkgconfig xfce - -EXTRA_OECONF += " --enable-startup-notification" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -HEADERS="controls.h global.h icons.h main.h panel.h item.h \ - item_dialog.h plugins.h xfce_support.h xfce.h" - -do_stage() { - install -d ${STAGING_INCDIR}/xfce4/panel - - for file in ${HEADERS}; do - install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file - done -} |