diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-03 15:56:28 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 17:52:25 +0100 |
| commit | 054ea20b05ab8131d6438835669758f69dee3263 (patch) | |
| tree | 88579bcb30cfd3ad8f44143d9ee8d74ad08d9524 /meta/recipes-connectivity/avahi | |
| parent | c9f8545a49bfa6d0f8facab995d36bc5e33600a3 (diff) | |
| download | openembedded-core-054ea20b05ab8131d6438835669758f69dee3263.tar.gz openembedded-core-054ea20b05ab8131d6438835669758f69dee3263.tar.bz2 openembedded-core-054ea20b05ab8131d6438835669758f69dee3263.zip | |
avahi-ui: Build with Gtk+3
Add patch to install GtkBuilder ui files for GTK+3.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/avahi')
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 11 | ||||
| -rw-r--r-- | meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch | 28 |
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 \ 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 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 @@ +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 + |