[oe-commits] stephen.arnold42 : recipes-xfce/libxfce4ui: depends and autotools fixes

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: b306212c8919a8638d5e97acfd6262bcbd3401ed
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b306212c8919a8638d5e97acfd6262bcbd3401ed

Author: stephen.arnold42 <stephen.arnold42 at gmail.com>
Date:   Mon Mar 17 21:34:44 2014 -0700

recipes-xfce/libxfce4ui: depends and autotools fixes

Note: this patch (v3) obseletes previous versions

libxfce4ui_4.10.0.bb: Upstream changes required autotools and gettext (intl)
fixes, as well as moving the autogen stuff to a separate task.  Full depends
were also added (2 were converted to PACKAGECONFIG options) along with a
vendor config option.

Signed-off-by: Stephen Arnold <stephen.arnold42 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index cc63a9f..1e141c4 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -2,9 +2,9 @@ SUMMARY = "Xfce4 Widget library and X Window System interaction"
 SECTION = "x11/libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
-DEPENDS = "gtk+ intltool libxfce4util startup-notification xfconf glade3"
+DEPENDS = "perl-native glib-2.0 gtk+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice"
 
-inherit xfce
+inherit autotools gettext xfce
 
 SRC_URI = " \
     git://git.xfce.org/xfce/libxfce4ui;protocol=git \
@@ -15,9 +15,13 @@ SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e"
 PV = "4.10.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
+EXTRA_OECONF += "--enable-maintainer-mode --disable-debug  --with-vendor-info=${DISTRO}"
 
-do_configure_prepend() {
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+
+do_src_prepare() {
        NOCONFIGURE=yes ./autogen.sh
 }
 
@@ -27,3 +31,5 @@ FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \
 PACKAGES += "${PN}-glade"
 FILES_${PN}-glade = "${libdir}/glade3 \
                      ${datadir}/glade3"
+
+addtask do_src_prepare before do_configure after do_patch