summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-03 15:56:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:24 +0100
commitc0725452d5d299f4ee7409cf2337ef8b8044fb70 (patch)
treefa97091603b02e5568aae494f8a0fb3a2f28f2bf /meta/recipes-connectivity
parent7bcb1c5819e091e54b1639c75e744700bcb8eb97 (diff)
downloadpoky-c0725452d5d299f4ee7409cf2337ef8b8044fb70.tar.gz
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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb11
-rw-r--r--meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch28
2 files changed, 34 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
index 1b3e918cea..c6f67f1eca 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
@@ -7,14 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7require avahi.inc 7require avahi.inc
8 8
9inherit distro_features_check 9inherit distro_features_check
10ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" 10ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
11 11
12SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch"
12SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" 13SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
13SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" 14SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
14 15
15DEPENDS += "avahi gtk+ libglade" 16DEPENDS += "avahi gtk+3"
16 17
17AVAHI_GTK = "--enable-gtk --disable-gtk3 --disable-pygtk" 18AVAHI_GTK = "--disable-gtk --enable-gtk3 --disable-pygtk"
18 19
19S = "${WORKDIR}/avahi-${PV}" 20S = "${WORKDIR}/avahi-${PV}"
20 21
@@ -27,9 +28,9 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a"
27FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" 28FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
28 29
29FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \ 30FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
30 ${datadir}/avahi/interfaces/avahi-discover* \ 31 ${datadir}/avahi/interfaces/avahi-discover.ui \
31 ${bindir}/avahi-discover-standalone \ 32 ${bindir}/avahi-discover-standalone \
32 ${datadir}/avahi/interfaces/avahi-discover.glade" 33 "
33 34
34do_install_append () { 35do_install_append () {
35 rm ${D}${sysconfdir} -rf 36 rm ${D}${sysconfdir} -rf
diff --git a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
new file mode 100644
index 0000000000..8ccef08dfc
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
@@ -0,0 +1,28 @@
1From a59f13fab31a6e25bb03b2c2bc3aea576f857b6c Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Sun, 12 Jun 2016 18:32:49 +0300
4Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3
5 too
6
7Upstream-Status: Pending
8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9---
10 configure.ac | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/configure.ac b/configure.ac
14index aebb716..48bdf63 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -965,7 +965,7 @@ AC_SUBST(avahi_socket)
18 #
19 # Avahi interfaces dir
20 #
21-if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
22+if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes"; then
23 interfacesdir="${datadir}/${PACKAGE}/interfaces/"
24 AC_SUBST(interfacesdir)
25 fi
26--
272.1.4
28