[oe] [meta-xfce][PATCH] Fixed libxfce4ui recipe - updated depends, set SRCREV to 4.10.0 tag, added missing inherit and pre-config task.

stephen.arnold42 stephen.arnold42 at gmail.com
Sun Mar 16 22:48:59 UTC 2014


---
 .../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb   | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 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..b17ebc1 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -2,23 +2,28 @@ 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 \
     file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
-    file://0002-configure.ac.in-remove-optional-gtk3-support.patch \
 "
-SRCREV = "530b72f50fcbd8cb4b970fcc97be0321bf78183e"
-PV = "4.10.0+git${SRCPV}"
+
+SRCREV = "cf85eac7804e09b24f3e8fb4165f60b1c9f8cf49"
+PV = "4.10.0"
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+
+EXTRA_OECONF += "--enable-maintainer-mode --disable-debug --with-vendor-info=Poky"
 
-do_configure_prepend() {
-       NOCONFIGURE=yes ./autogen.sh
+do_patch_extra() {
+    sed -i /GTK3/d ${S}/configure.ac.in
+    NOCONFIGURE=yes ./autogen.sh
 }
 
 FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
@@ -27,3 +32,5 @@ FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \
 PACKAGES += "${PN}-glade"
 FILES_${PN}-glade = "${libdir}/glade3 \
                      ${datadir}/glade3"
+
+addtask do_patch_extra before do_configure after do_patch
-- 
1.8.5.3




More information about the Openembedded-devel mailing list