From d4e5b33047e467494f4a0343f18fcab2ebf18f79 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 28 May 2015 00:34:58 +0200 Subject: libxfce4ui: build gtk3 libs and pack gtk2/gtk3 libs in separate packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the solution provided still allows gtk3 free images (tested on image including packagegroup-xfce-extended) but there will be updates/new recipes for xfce4 requiring gtk3 part of libxfce4ui e.g xfce4-pulseaudio-plugin (replacement for deprecated xfce4-mixer due to missing mixer API in gstreamer-1.0) / parole / xfce4-power-manager. Signed-off-by: Andreas Müller --- meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb') diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb index 36f42d3f94..26d21c1f0b 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb @@ -2,13 +2,12 @@ SUMMARY = "Xfce4 Widget library and X Window System interaction" SECTION = "x11/libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "perl-native glib-2.0 gtk+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice" +DEPENDS = "perl-native glib-2.0 gtk+ gtk+3 intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice" inherit xfce autotools gettext gtk-doc SRC_URI += " \ file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ - file://0002-configure.ac-remove-optional-gtk3-support.patch \ " SRC_URI[md5sum] = "ea9fad7d059fe8f531fe8db42dabb5a9" SRC_URI[sha256sum] = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43" @@ -19,6 +18,10 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" +PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3" +FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2.so.*" +FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" + FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \ ${datadir}/glade3/catalogs/*.in" -- cgit 1.2.3-korg