sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

avahi-ui: Build with Gtk+3 

Add patch to install GtkBuilder ui files for GTK+3.

(From OE-Core rev: 054ea20b05ab8131d6438835669758f69dee3263)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen 2016-05-03 15:56:28 +03:00 committed by Richard Purdie
parent 7bcb1c5819
commit c0725452d5
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
View File

@ -7,14 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
require avahi.inc
inherit distro_features_check
ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch"
SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
DEPENDS += "avahi gtk+ libglade"
DEPENDS += "avahi gtk+3"
AVAHI_GTK = "--enable-gtk --disable-gtk3 --disable-pygtk"
AVAHI_GTK = "--disable-gtk --enable-gtk3 --disable-pygtk"
S = "${WORKDIR}/avahi-${PV}"
@ -27,9 +28,9 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a"
FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
${datadir}/avahi/interfaces/avahi-discover* \
${datadir}/avahi/interfaces/avahi-discover.ui \
${bindir}/avahi-discover-standalone \
${datadir}/avahi/interfaces/avahi-discover.glade"
"
do_install_append () {
rm ${D}${sysconfdir} -rf

28
meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch Normal file
View File

@ -0,0 +1,28 @@
From a59f13fab31a6e25bb03b2c2bc3aea576f857b6c Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Sun, 12 Jun 2016 18:32:49 +0300
Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3
too
Upstream-Status: Pending
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index aebb716..48bdf63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -965,7 +965,7 @@ AC_SUBST(avahi_socket)
#
# Avahi interfaces dir
#
-if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
+if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes"; then
interfacesdir="${datadir}/${PACKAGE}/interfaces/"
AC_SUBST(interfacesdir)
fi
--
2.1.4