From 6d8ffd9e3515afdb9166d2779319cd33ea7e198b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 25 Sep 2008 16:12:21 +0000 Subject: xfce: remove pkgconfig hacks and switch to autotools.bbclass, tweak packaging --- classes/xfce.bbclass | 6 ++++++ packages/xfce/exo_0.3.2.bb | 2 +- packages/xfce/libxfce4mcs.inc | 4 ++-- packages/xfce/libxfce4mcs_4.4.1.bb | 2 +- packages/xfce/libxfce4util.inc | 4 ++-- packages/xfce/libxfce4util_4.4.1.bb | 2 +- packages/xfce/libxfcegui4.inc | 4 ++-- packages/xfce/libxfcegui4_4.4.1.bb | 2 +- packages/xfce/xfce-mcs-manager.inc | 15 +++------------ packages/xfce/xfce-mcs-manager_4.4.1.bb | 2 +- packages/xfce/xfce-mcs-plugins.inc | 2 +- packages/xfce/xfce-mcs-plugins_4.4.1.bb | 2 +- packages/xfce/xfce-utils.inc | 2 +- packages/xfce/xfce-utils_4.4.1.bb | 2 +- packages/xfce/xfce4-appfinder.inc | 2 +- packages/xfce/xfce4-appfinder_4.4.1.bb | 2 +- packages/xfce/xfce4-dev-tools.inc | 2 +- packages/xfce/xfce4-mixer.inc | 2 +- packages/xfce/xfce4-mixer_4.4.1.bb | 2 +- packages/xfce/xfce4-panel.inc | 4 ++-- packages/xfce/xfce4-panel_4.4.1.bb | 2 +- packages/xfce/xfdesktop.inc | 2 +- packages/xfce/xfdesktop_4.4.1.bb | 2 +- packages/xfce/xfprint_4.4.1.bb | 2 +- packages/xfce/xfwm4-themes.inc | 2 +- packages/xfce/xfwm4-themes_4.4.1.bb | 2 +- packages/xfce/xfwm4.inc | 2 +- packages/xfce/xfwm4_4.4.1.bb | 2 +- 28 files changed, 39 insertions(+), 42 deletions(-) diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index ecc00825bc..c6ccc5fd2c 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -12,9 +12,15 @@ SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.bz2" inherit autotools +AUTOTOOLS_STAGE_PKGCONFIG = "1" + EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/" # FIXME: Put icons in their own package too? FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" FILES_${PN}-doc += "${datadir}/xfce4/doc" + +FILES_${PN}-dev += "${libdir}/xfce4/*/*.la" +FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug" + diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb index 6bf0e1292f..b48eeba645 100644 --- a/packages/xfce/exo_0.3.2.bb +++ b/packages/xfce/exo_0.3.2.bb @@ -1,7 +1,7 @@ DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native" -inherit pkgconfig xfce +inherit xfce SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2" diff --git a/packages/xfce/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc index 19268fc9b3..6ecbc8db58 100644 --- a/packages/xfce/libxfce4mcs.inc +++ b/packages/xfce/libxfce4mcs.inc @@ -1,12 +1,12 @@ # libxfce4mcs OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="Settings management library used by most XFce 4 modules" DEPENDS="libxfce4util" SECTION = "x11/libs" -inherit xfce pkgconfig +inherit xfce do_stage() { install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb index 07d7a95ae1..8e2d522962 100644 --- a/packages/xfce/libxfce4mcs_4.4.1.bb +++ b/packages/xfce/libxfce4mcs_4.4.1.bb @@ -1,5 +1,5 @@ # libxfce4mcs OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc index d5dd6d6565..ee7b886f20 100644 --- a/packages/xfce/libxfce4util.inc +++ b/packages/xfce/libxfce4util.inc @@ -1,13 +1,13 @@ # libxfce4util OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION = "Basic utility library for Xfce4" SECTION = "x11/libs" LICENSE = "GPL" DEPENDS = "glib-2.0 xfce4-dev-tools" -inherit xfce pkgconfig +inherit xfce MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb index 70f5ddac93..a53a83e861 100644 --- a/packages/xfce/libxfce4util_4.4.1.bb +++ b/packages/xfce/libxfce4util_4.4.1.bb @@ -1,5 +1,5 @@ # libxfce4util OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc index 714e365af4..1b7703abf9 100644 --- a/packages/xfce/libxfcegui4.inc +++ b/packages/xfce/libxfcegui4.inc @@ -1,12 +1,12 @@ # libxfcegui4 OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION = "XFCE Widget library and X Window System interaction" DEPENDS = "libxfce4util dbh libxml2 gtk+" SECTION = "x11/libs" -inherit xfce pkgconfig +inherit xfce do_stage() { diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb index 2def53685a..a36897f822 100644 --- a/packages/xfce/libxfcegui4_4.4.1.bb +++ b/packages/xfce/libxfcegui4_4.4.1.bb @@ -1,5 +1,5 @@ # libxfcegui4 OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc index d90e82081e..7a421a4086 100644 --- a/packages/xfce/xfce-mcs-manager.inc +++ b/packages/xfce/xfce-mcs-manager.inc @@ -1,25 +1,16 @@ # xfce-mcs-manager OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Settings manager." DEPENDS="libxfcegui4 libxfce4mcs intltool-native" SECTION = "x11" -PR = "r1" +PR = "r2" 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 + autotools_stage_all } -# 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_DIR} - sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/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 index de5cf2b012..76e0452ad8 100644 --- a/packages/xfce/xfce-mcs-manager_4.4.1.bb +++ b/packages/xfce/xfce-mcs-manager_4.4.1.bb @@ -1,5 +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) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc index b5b4505e98..80037841fa 100644 --- a/packages/xfce/xfce-mcs-plugins.inc +++ b/packages/xfce/xfce-mcs-plugins.inc @@ -1,6 +1,6 @@ # xfce-mcs-plugins OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION = "Common XFCE4 configuration plugins." DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" diff --git a/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb index 02ad97e860..bd41458757 100644 --- a/packages/xfce/xfce-mcs-plugins_4.4.1.bb +++ b/packages/xfce/xfce-mcs-plugins_4.4.1.bb @@ -1,5 +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) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce-utils.inc b/packages/xfce/xfce-utils.inc index 0b191194d7..d681fd7adb 100644 --- a/packages/xfce/xfce-utils.inc +++ b/packages/xfce/xfce-utils.inc @@ -1,6 +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) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Utilities" DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb index 57909f2c2d..fd41a609c2 100644 --- a/packages/xfce/xfce-utils_4.4.1.bb +++ b/packages/xfce/xfce-utils_4.4.1.bb @@ -1,6 +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) +# Released under the MIT license (see COPYING.MIT) PR = "r1" require ${PN}.inc diff --git a/packages/xfce/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc index 0d102f3bd0..ddfa3e1e4e 100644 --- a/packages/xfce/xfce4-appfinder.inc +++ b/packages/xfce/xfce4-appfinder.inc @@ -1,6 +1,6 @@ # xfce4-appfinder build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE Application Finder" SECTION = "x11" diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb index f7c97970d5..471122ea02 100644 --- a/packages/xfce/xfce4-appfinder_4.4.1.bb +++ b/packages/xfce/xfce4-appfinder_4.4.1.bb @@ -1,5 +1,5 @@ # xfce4-appfinder build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc index 03f64e39e5..2116b1d414 100644 --- a/packages/xfce/xfce4-dev-tools.inc +++ b/packages/xfce/xfce4-dev-tools.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Xfce4 development tools" SECTION = "x11/libs" LICENSE = "GPL" -inherit xfce pkgconfig +inherit xfce do_stage() { install -d ${STAGING_DATADIR}/aclocal diff --git a/packages/xfce/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc index a923489f32..4d3faed14c 100644 --- a/packages/xfce/xfce4-mixer.inc +++ b/packages/xfce/xfce4-mixer.inc @@ -1,6 +1,6 @@ # xfce-mixer-plugin OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE panel mixer plugin" SECTION = "x11" diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb index 6dd3c0565b..13ba0f32e3 100644 --- a/packages/xfce/xfce4-mixer_4.4.1.bb +++ b/packages/xfce/xfce4-mixer_4.4.1.bb @@ -1,5 +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) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc index 6ad71fcf82..be7092ab9e 100644 --- a/packages/xfce/xfce4-panel.inc +++ b/packages/xfce/xfce4-panel.inc @@ -1,12 +1,12 @@ # xfce4-panel OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION = "XFCE4 Panel" SECTION = "x11" DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" -inherit pkgconfig xfce +inherit xfce EXTRA_OECONF += " --enable-startup-notification" diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb index ae2abba28d..99194027c8 100644 --- a/packages/xfce/xfce4-panel_4.4.1.bb +++ b/packages/xfce/xfce4-panel_4.4.1.bb @@ -1,6 +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) +# Released under the MIT license (see COPYING.MIT) PR="r2" require ${PN}.inc diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc index bd5bb7223c..35c5ff5954 100644 --- a/packages/xfce/xfdesktop.inc +++ b/packages/xfce/xfdesktop.inc @@ -1,6 +1,6 @@ # xfdesktop OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb index 9c84150180..fcc2f89991 100644 --- a/packages/xfce/xfdesktop_4.4.1.bb +++ b/packages/xfce/xfdesktop_4.4.1.bb @@ -1,6 +1,6 @@ # xfdesktop OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) PR = "r2" require ${PN}.inc diff --git a/packages/xfce/xfprint_4.4.1.bb b/packages/xfce/xfprint_4.4.1.bb index 7e349ce881..19bfa0dde3 100644 --- a/packages/xfce/xfprint_4.4.1.bb +++ b/packages/xfce/xfprint_4.4.1.bb @@ -1,6 +1,6 @@ # xfprint OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Print Manager" SECTION = "x11/base" diff --git a/packages/xfce/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc index c60edc5b83..63c5ab0296 100644 --- a/packages/xfce/xfwm4-themes.inc +++ b/packages/xfce/xfwm4-themes.inc @@ -1,6 +1,6 @@ # xfwm4-themes OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Window Manager Themes" SECTION = "x11/wm" diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb index 9f67ad2ed9..c7f45d2b09 100644 --- a/packages/xfce/xfwm4-themes_4.4.1.bb +++ b/packages/xfce/xfwm4-themes_4.4.1.bb @@ -1,5 +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) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc index e443a841ae..211853aa18 100644 --- a/packages/xfce/xfwm4.inc +++ b/packages/xfce/xfwm4.inc @@ -1,6 +1,6 @@ # xfwm4 OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Window Manager" SECTION = "x11/wm" diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb index 2fc47e641e..a2bdf3557e 100644 --- a/packages/xfce/xfwm4_4.4.1.bb +++ b/packages/xfce/xfwm4_4.4.1.bb @@ -1,6 +1,6 @@ # xfwm4 OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) PR="r1" require ${PN}.inc -- cgit 1.2.3-korg