View | Details | Raw Unified | Return to bug 250354
Collapse All | Expand All

(-)avahi/Makefile (-7 / +6 lines)
Lines 3-27 Link Here
3
#   $MCom: ports/net/avahi/Makefile,v 1.30 2011/03/13 17:23:19 kwm Exp $
3
#   $MCom: ports/net/avahi/Makefile,v 1.30 2011/03/13 17:23:19 kwm Exp $
4
4
5
PORTNAME=	avahi
5
PORTNAME=	avahi
6
PORTVERSION=	0.7
6
PORTVERSION=	0.8
7
PORTREVISION?=	1
8
CATEGORIES?=	net dns
7
CATEGORIES?=	net dns
9
8
10
MAINTAINER=	gnome@FreeBSD.org
9
MAINTAINER=	gnome@FreeBSD.org
11
COMMENT=	"meta-port" for the Avahi service discovery suite
10
COMMENT=	"meta-port" for the Avahi service discovery suite
12
11
13
RUN_DEPENDS=	avahi-app>=0.7:net/avahi-app
12
RUN_DEPENDS=	avahi-app>=0.8:net/avahi-app
14
13
15
USES=		metaport
14
USES=		metaport
16
15
17
OPTIONS_DEFINE=	AUTOIPD GTK MONO QT5 PYTHON
16
OPTIONS_DEFINE=	AUTOIPD GTK2 GTK3 MONO QT5 PYTHON
18
OPTIONS_DEFAULT=AUTOIPD GTK
17
OPTIONS_DEFAULT=AUTOIPD GTK3
19
AUTOIPD_DESC=	IPv4LL network address configuration daemon
18
AUTOIPD_DESC=	IPv4LL network address configuration daemon
20
GTK_DESC=	Gtk+ tools and bindings
21
LIBDNS_DESC=	Apple's mDNSResponder compatibility library
19
LIBDNS_DESC=	Apple's mDNSResponder compatibility library
22
20
23
AUTOIPD_RUN_DEPENDS=	avahi-autoipd:net/avahi-autoipd
21
AUTOIPD_RUN_DEPENDS=	avahi-autoipd:net/avahi-autoipd
24
GTK_RUN_DEPENDS=	avahi-discover-standalone:net/avahi-gtk
22
GTK2_RUN_DEPENDS=	avahi-discover-standalone:net/avahi-gtk
23
GTK3_RUN_DEPENDS=	avahi-discover-standalone:net/avahi-gtk3
25
#LIBDNS_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:net/avahi-libdns
24
#LIBDNS_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:net/avahi-libdns
26
MONO_RUN_DEPENDS=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:net/avahi-sharp
25
MONO_RUN_DEPENDS=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:net/avahi-sharp
27
QT5_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-qt5.pc:net/avahi-qt5
26
QT5_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-qt5.pc:net/avahi-qt5
(-)avahi-app/Makefile (-19 / +12 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	avahi
4
PORTNAME=	avahi
5
PORTVERSION=	0.7
5
PORTVERSION=	0.8
6
PORTREVISION?=	3
7
CATEGORIES?=	net dns
6
CATEGORIES?=	net dns
8
MASTER_SITES=	http://www.avahi.org/download/
7
MASTER_SITES=	http://www.avahi.org/download/
9
PKGNAMESUFFIX?=	-app
8
PKGNAMESUFFIX?=	-app
Lines 21-38 Link Here
21
		libdaemon.so:devel/libdaemon \
20
		libdaemon.so:devel/libdaemon \
22
		libdbus-glib-1.so:devel/dbus-glib \
21
		libdbus-glib-1.so:devel/dbus-glib \
23
		libdbus-1.so:devel/dbus \
22
		libdbus-1.so:devel/dbus \
24
		libgdbm.so:databases/gdbm
23
		libgdbm.so:databases/gdbm \
24
		libevent.so:devel/libevent
25
25
26
USERS?=		${PORTNAME}
26
USERS?=		${PORTNAME}
27
GROUPS?=	${USERS}
27
GROUPS?=	${USERS}
28
28
29
USES+=		alias gettext gmake gnome libtool pathfix pkgconfig
29
USES+=		alias gettext gmake gnome libtool pathfix pkgconfig
30
USE_GNOME+=	glib20 intltool introspection
30
USE_GNOME+=	glib20 intltool introspection:build
31
USE_GNOME_SUBR=	yes
31
USE_GNOME_SUBR=	yes
32
USE_LDCONFIG=	yes
32
USE_LDCONFIG=	yes
33
GNU_CONFIGURE=	yes
33
GNU_CONFIGURE=	yes
34
CONFIGURE_ARGS?=--with-distro=freebsd \
34
CONFIGURE_ARGS?=--with-distro=freebsd \
35
		--with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \
35
		--with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \
36
		--enable-introspection=yes \
37
		--disable-static \
36
		--disable-monodoc \
38
		--disable-monodoc \
37
		--disable-doxygen-doc \
39
		--disable-doxygen-doc \
38
		--disable-doxygen-dot \
40
		--disable-doxygen-dot \
Lines 60-66 Link Here
60
CONFIGURE_ARGS+=--disable-autoipd
62
CONFIGURE_ARGS+=--disable-autoipd
61
.endif
63
.endif
62
.if ${AVAHI_SLAVE} == gtk
64
.if ${AVAHI_SLAVE} == gtk
63
CONFIGURE_ARGS+=--enable-gtk
65
# We disable man pages, because bssh.1 is not generated (no xmltoman port)
66
CONFIGURE_ARGS+=--enable-gtk \
67
		--disable-manpages
64
.else
68
.else
65
CONFIGURE_ARGS+=--disable-gtk
69
CONFIGURE_ARGS+=--disable-gtk
66
.endif
70
.endif
Lines 105-124 Link Here
105
		${WRKSRC}/avahi-daemon/Makefile.in
109
		${WRKSRC}/avahi-daemon/Makefile.in
106
	@${REINPLACE_CMD} -e 's|have_inotify=yes|have_inotify=no|' \
110
	@${REINPLACE_CMD} -e 's|have_inotify=yes|have_inotify=no|' \
107
		${WRKSRC}/configure
111
		${WRKSRC}/configure
108
	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
112
	@${REINPLACE_CMD} -e 's|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
109
		${REINPLACE_CMD} -e 's|(LIBINTL)|(INTLLIBS)|g ; \
110
		s|(LIBICONV)|(LTLIBICONV)|g'
111
	@${REINPLACE_CMD} -e 's|%%RC_SUBR%%|/etc/rc.subr| ; \
112
		s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
113
		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
113
		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
114
		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
114
		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
115
	@${REINPLACE_CMD} -e 's|dbus_connection_disconnect|dbus_connection_close|g' \
116
		${WRKSRC}/avahi-client/client.c \
117
		${WRKSRC}/avahi-daemon/dbus-protocol.c
118
	@${REINPLACE_CMD} -e 's|^_||g' \
119
		${WRKSRC}/avahi-ui/*.desktop.in.in
120
	@${REINPLACE_CMD} -e 's|am: install-avahiincludeHEADERS|am:|g' \
121
			${WRKSRC}/avahi-ui/Makefile.in
122
115
123
post-build: avahi-post-build
116
post-build: avahi-post-build
124
117
Lines 139-145 Link Here
139
post-install: avahi-post-install
132
post-install: avahi-post-install
140
133
141
avahi-post-install:
134
avahi-post-install:
142
.if defined(MANPAGES)
135
.if defined(MANPAGES) && ${AVAHI_SLAVE} != gtk
143
.for f in ${MANPAGES}
136
.for f in ${MANPAGES}
144
	${INSTALL_DATA} ${WRKSRC}/man/${f} ${STAGEDIR}${PREFIX}/man/man${f:E}/${f}
137
	${INSTALL_DATA} ${WRKSRC}/man/${f} ${STAGEDIR}${PREFIX}/man/man${f:E}/${f}
145
.endfor
138
.endfor
Lines 154-160 Link Here
154
.endfor
147
.endfor
155
.if ${AVAHI_SLAVE}==no
148
.if ${AVAHI_SLAVE}==no
156
	${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services
149
	${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services
157
	${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
150
	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/org.freedesktop.Avahi.service \
158
		${STAGEDIR}${PREFIX}/share/dbus-1/system-services
151
		${STAGEDIR}${PREFIX}/share/dbus-1/system-services
159
.endif
152
.endif
160
.endif # ! avahi-header
153
.endif # ! avahi-header
(-)avahi-app/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1534080439
1
TIMESTAMP = 1602717130
2
SHA256 (avahi-0.7.tar.gz) = 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
2
SHA256 (avahi-0.8.tar.gz) = 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
3
SIZE (avahi-0.7.tar.gz) = 1333400
3
SIZE (avahi-0.8.tar.gz) = 1591458
(-)avahi-app/files/Makefile.am (-43 lines)
Lines 1-43 Link Here
1
--- Makefile.am.orig	2017-07-10 12:14:59.083371116 +0200
2
+++ Makefile.am	2018-12-22 21:00:37.193294000 +0100
3
@@ -43,6 +43,7 @@
4
 	avahi-gobject.pc.in \
5
 	avahi-qt3.pc.in \
6
 	avahi-qt4.pc.in \
7
+	avahi-qt5.pc.in \
8
 	avahi-sharp.pc.in \
9
 	avahi-ui-sharp.pc.in \
10
 	avahi-compat-libdns_sd.pc.in \
11
@@ -101,7 +102,11 @@
12
 DX_INPUT += \
13
 	$(srcdir)/avahi-qt/qt-watch.h
14
 endif
15
+if HAVE_QT5
16
+DX_INPUT += \
17
+	$(srcdir)/avahi-qt/qt-watch.h
18
 endif
19
+endif
20
 
21
 if HAVE_GLIB
22
 DX_INPUT += \
23
@@ -155,6 +160,8 @@
24
 %.pc: %.pc.in
25
 	$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
26
 	    -e 's,@libdir\@,$(libdir),g' \
27
+	    -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
28
+	    -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
29
 	    -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \
30
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
31
 
32
@@ -214,6 +221,11 @@
33
 if HAVE_QT4
34
 pkgconfig_DATA += avahi-qt4.pc
35
 CLEANFILES += avahi-qt4.pc
36
+endif
37
+
38
+if HAVE_QT5
39
+pkgconfig_DATA += avahi-qt5.pc
40
+CLEANFILES += avahi-qt5.pc
41
 endif
42
 
43
 CLEANFILES += avahi.devhelp
(-)avahi-app/files/acinclude.m4 (-7 lines)
Lines 1-7 Link Here
1
--- acinclude.m4.orig	2017-07-10 12:14:59.083371116 +0200
2
+++ acinclude.m4	2018-12-22 20:56:34.849629000 +0100
3
@@ -1 +1,2 @@
4
-sinclude(common/doxygen.m4)
5
\ No newline at end of file
6
+sinclude(common/doxygen.m4)
7
+sincldue(common/qt5-pie.m4)
(-)avahi-app/files/avahi-qt_Makefile.am (-43 lines)
Lines 1-43 Link Here
1
--- avahi-qt/Makefile.am.orig	2017-07-10 12:14:59.119370306 +0200
2
+++ avahi-qt/Makefile.am	2018-12-22 21:02:56.006641000 +0100
3
@@ -39,7 +39,7 @@
4
 	$(AM_V_GEN)$(MOC_QT3) $^ > $@
5
 
6
 libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
7
-libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
8
+libavahi_qt3_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT3_LIBS)
9
 libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
10
 endif
11
 
12
@@ -61,8 +61,30 @@
13
 	$(AM_V_GEN)$(MOC_QT4) $^ > $@
14
 
15
 libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
16
-libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
17
+libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
18
 libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
19
+endif
20
+
21
+if HAVE_QT5
22
+
23
+avahiqt5includedir=$(includedir)/avahi-qt5
24
+avahiqt5include_HEADERS = \
25
+	qt-watch.h
26
+
27
+lib_LTLIBRARIES += \
28
+	libavahi-qt5.la
29
+
30
+BUILT_SOURCES += qt-watch.moc5
31
+
32
+libavahi_qt5_la_SOURCES = \
33
+	qt-watch.cpp
34
+
35
+qt-watch.moc5: qt-watch.cpp
36
+	$(AM_V_GEN)$(MOC_QT5) $^ > $@
37
+
38
+libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
39
+libavahi_qt5_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT5_LIBS)
40
+libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
41
 endif
42
 
43
 CLEANFILES = $(BUILT_SOURCES)
(-)avahi-app/files/build-db (+49 lines)
Line 0 Link Here
1
#!/usr/bin/env python
2
# -*-python-*-
3
# This file is part of avahi.
4
#
5
# avahi is free software; you can redistribute it and/or modify it
6
# under the terms of the GNU Lesser General Public License as
7
# published by the Free Software Foundation; either version 2 of the
8
# License, or (at your option) any later version.
9
#
10
# avahi is distributed in the hope that it will be useful, but WITHOUT
11
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
12
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
13
# License for more details.
14
#
15
# You should have received a copy of the GNU Lesser General Public
16
# License along with avahi; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
18
# USA.
19
20
try:
21
    import anydbm as dbm
22
except ImportError:
23
    import dbm
24
25
import sys
26
27
if len(sys.argv) > 1:
28
    infn = sys.argv[1]
29
else:
30
    infn = "service-types"
31
32
if len(sys.argv) > 2:
33
    outfn = sys.argv[2]
34
else:
35
    outfn = infn + ".db"
36
37
db = dbm.open(outfn, "n")
38
39
for ln in open(infn, "r"):
40
    ln = ln.strip(" \r\n\t")
41
    
42
    if ln == "" or ln.startswith("#"):
43
        continue
44
45
    t, n = ln.split(":", 1)
46
47
    db[t.strip()] = n.strip()
48
49
db.close()
(-)avahi-app/files/configure.ac (-59 lines)
Lines 1-59 Link Here
1
--- configure.ac.orig	2018-12-22 21:11:52.861640000 +0100
2
+++ configure.ac	2018-12-22 21:11:58.730593000 +0100
3
@@ -34,6 +34,7 @@
4
 AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:5:0])
5
 AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0])
6
 AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0])
7
+AC_SUBST(LIBAVAHI_QT5_VERSION_INFO, [1:2:0])
8
 AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:4:1])
9
 
10
 # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour
11
@@ -526,6 +527,32 @@
12
 AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes")
13
 
14
 #
15
+# Check for Qt 5
16
+#
17
+AC_ARG_ENABLE(qt5,
18
+        AS_HELP_STRING([--disable-qt5],[Disable building of Qt5Core mainloop integration]),
19
+        [case "${enableval}" in
20
+                yes) HAVE_QT5=yes ;;
21
+                no)  HAVE_QT5=no ;;
22
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt5) ;;
23
+        esac],
24
+        [HAVE_QT5=yes])
25
+
26
+if test "x$HAVE_QT5" = "xyes" ; then
27
+        PKG_CHECK_MODULES( QT5, [ Qt5Core >= 5.0.0 ])
28
+        AC_AVAHI_QT_ADD_PIC_IF_NEEDED
29
+        AC_SUBST(QT5_CFLAGS)
30
+        AC_SUBST(QT5_LIBS)
31
+        QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`"
32
+        AC_PATH_PROGS(MOC_QT5, [moc-qt5 moc], no, [$QT5_PREFIX])
33
+        if test "$MOC_QT5" = no; then
34
+            AC_MSG_ERROR([Could not find QT5 moc])
35
+        fi
36
+        AC_SUBST(MOC_QT5)
37
+fi
38
+AM_CONDITIONAL(HAVE_QT5, test "x$HAVE_QT5" = "xyes")
39
+
40
+#
41
 # Check for GTK+ 2.0
42
 #
43
 AC_ARG_ENABLE(gtk,
44
@@ -1158,6 +1185,7 @@
45
     Enable python-dbus:                        ${HAVE_PYTHON_DBUS}
46
     Enable QT3:                                ${HAVE_QT3}
47
     Enable QT4:                                ${HAVE_QT4}
48
+    Enable QT5:                                ${HAVE_QT5}
49
     Enable Mono:                               ${HAVE_MONO}
50
     Enable Monodoc:                            ${HAVE_MONODOC}
51
     Distribution/OS:                           ${with_distro}
52
@@ -1227,6 +1255,7 @@
53
     Building avahi-discover-standalone: ${HAVE_GTK2OR3}
54
     Building libavahi-qt3:              ${HAVE_QT3}
55
     Building libavahi-qt4:              ${HAVE_QT4}
56
+    Building libavahi-qt5:              ${HAVE_QT5}
57
     Building avahi-sharp:               ${HAVE_MONO}
58
     Building avahi-compat-libdns_sd:    ${ENABLE_COMPAT_LIBDNS_SD}
59
     Building avahi-compat-howl:         ${ENABLE_COMPAT_HOWL}
(-)avahi-app/files/org.freedesktop.Avahi.service (-24 lines)
Lines 1-24 Link Here
1
# This file is part of avahi.
2
#
3
# avahi is free software; you can redistribute it and/or modify it
4
# under the terms of the GNU Lesser General Public License as
5
# published by the Free Software Foundation; either version 2 of the
6
# License, or (at your option) any later version.
7
#
8
# avahi is distributed in the hope that it will be useful, but WITHOUT
9
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
10
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
11
# License for more details.
12
#
13
# You should have received a copy of the GNU Lesser General Public
14
# License along with avahi; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
16
# USA.
17
18
[D-BUS Service]
19
Name=org.freedesktop.Avahi
20
#SystemdService=avahi-daemon.service
21
22
# This service should not be bus activated if systemd isn't running,
23
# so that activation won't conflict with the init script startup.
24
Exec=/usr/bin/false
(-)avahi-app/files/patch-avahi-daemon_main.c (-14 lines)
Lines 1-14 Link Here
1
--- avahi-daemon/main.c.orig	2010-11-18 03:00:26 UTC
2
+++ avahi-daemon/main.c
3
@@ -320,6 +320,11 @@ static void update_browse_domains(void) 
4
         return;
5
     }
6
 
7
+    if (!resolv_conf_search_domains) {
8
+	    avahi_server_set_browse_domains(avahi_server, NULL);
9
+	    return;
10
+    }
11
+
12
     l = avahi_string_list_copy(config.server_config.browse_domains);
13
 
14
     for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) {
(-)avahi-app/files/patch-avahi-qt_Makefile.in (-354 / +27 lines)
Lines 1-170 Link Here
1
--- avahi-qt/Makefile.in.orig	2018-12-22 21:39:31.709598000 +0100
1
--- avahi-qt/Makefile.in.orig	2020-02-18 07:03:16 UTC
2
+++ avahi-qt/Makefile.in	2018-12-22 21:41:01.331208000 +0100
2
+++ avahi-qt/Makefile.in
3
@@ -1,7 +1,7 @@
3
@@ -182,7 +182,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
4
-# Makefile.in generated by automake 1.15 from Makefile.am.
5
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
6
 # @configure_input@
7
 
8
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
9
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
10
 
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
@@ -114,6 +114,10 @@
14
 @HAVE_QT4_TRUE@	libavahi-qt4.la
15
 
16
 @HAVE_QT4_TRUE@am__append_4 = qt-watch.moc4
17
+@HAVE_QT5_TRUE@am__append_5 = \
18
+@HAVE_QT5_TRUE@	libavahi-qt5.la
19
+
20
+@HAVE_QT5_TRUE@am__append_6 = qt-watch.moc5
21
 subdir = avahi-qt
22
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
23
 am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
24
@@ -127,13 +131,14 @@
25
 	$(top_srcdir)/common/ltversion.m4 \
26
 	$(top_srcdir)/common/lt~obsolete.m4 \
27
 	$(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
28
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
29
-	$(top_srcdir)/configure.ac
30
+	$(top_srcdir)/common/qt5-pie.m4 $(top_srcdir)/acinclude.m4 \
31
+	$(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
32
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
33
 	$(ACLOCAL_M4)
34
 DIST_COMMON = $(srcdir)/Makefile.am \
35
 	$(am__avahiqt3include_HEADERS_DIST) \
36
-	$(am__avahiqt4include_HEADERS_DIST) $(am__DIST_COMMON)
37
+	$(am__avahiqt4include_HEADERS_DIST) \
38
+	$(am__avahiqt5include_HEADERS_DIST) $(am__DIST_COMMON)
39
 mkinstalldirs = $(install_sh) -d
40
 CONFIG_HEADER = $(top_builddir)/config.h
41
 CONFIG_CLEAN_FILES =
42
@@ -167,12 +172,11 @@
43
   }
44
 am__installdirs = "$(DESTDIR)$(libdir)" \
45
 	"$(DESTDIR)$(avahiqt3includedir)" \
46
-	"$(DESTDIR)$(avahiqt4includedir)"
47
+	"$(DESTDIR)$(avahiqt4includedir)" \
48
+	"$(DESTDIR)$(avahiqt5includedir)"
49
 LTLIBRARIES = $(lib_LTLIBRARIES)
4
 LTLIBRARIES = $(lib_LTLIBRARIES)
50
 am__DEPENDENCIES_1 =
5
 am__DEPENDENCIES_1 =
51
-@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES =  \
6
 @HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES =  \
52
-@HAVE_QT3_TRUE@	../avahi-common/libavahi-common.la \
7
-@HAVE_QT3_TRUE@	../avahi-common/libavahi-common.la \
53
-@HAVE_QT3_TRUE@	$(am__DEPENDENCIES_1)
8
+@HAVE_QT3_TRUE@	-lavahi-common \
54
+@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
9
 @HAVE_QT3_TRUE@	$(am__DEPENDENCIES_1)
55
 am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp
10
 am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp
56
 @HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS =  \
11
 @HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS =  \
57
 @HAVE_QT3_TRUE@	libavahi_qt3_la-qt-watch.lo
12
@@ -198,7 +198,7 @@ libavahi_qt3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX
58
@@ -186,9 +190,7 @@
59
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt3_la_LDFLAGS) \
60
 	$(LDFLAGS) -o $@
13
 	$(LDFLAGS) -o $@
61
 @HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir)
14
 @HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir)
62
-@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES =  \
15
 @HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES =  \
63
-@HAVE_QT4_TRUE@	../avahi-common/libavahi-common.la \
16
-@HAVE_QT4_TRUE@	../avahi-common/libavahi-common.la \
64
-@HAVE_QT4_TRUE@	$(am__DEPENDENCIES_1)
17
+@HAVE_QT4_TRUE@	-lavahi-common \
65
+@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
18
 @HAVE_QT4_TRUE@	$(am__DEPENDENCIES_1)
66
 am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp
19
 am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp
67
 @HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS =  \
20
 @HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS =  \
68
 @HAVE_QT4_TRUE@	libavahi_qt4_la-qt-watch.lo
21
@@ -210,7 +210,7 @@ libavahi_qt4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX
69
@@ -198,6 +200,16 @@
70
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt4_la_LDFLAGS) \
71
 	$(LDFLAGS) -o $@
22
 	$(LDFLAGS) -o $@
72
 @HAVE_QT4_TRUE@am_libavahi_qt4_la_rpath = -rpath $(libdir)
23
 @HAVE_QT4_TRUE@am_libavahi_qt4_la_rpath = -rpath $(libdir)
73
+@HAVE_QT5_TRUE@libavahi_qt5_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
24
 @HAVE_QT5_TRUE@libavahi_qt5_la_DEPENDENCIES =  \
74
+am__libavahi_qt5_la_SOURCES_DIST = qt-watch.cpp
25
-@HAVE_QT5_TRUE@	../avahi-common/libavahi-common.la \
75
+@HAVE_QT5_TRUE@am_libavahi_qt5_la_OBJECTS =  \
26
+@HAVE_QT5_TRUE@	-lavahi-common \
76
+@HAVE_QT5_TRUE@	libavahi_qt5_la-qt-watch.lo
27
 @HAVE_QT5_TRUE@	$(am__DEPENDENCIES_1)
77
+libavahi_qt5_la_OBJECTS = $(am_libavahi_qt5_la_OBJECTS)
28
 am__libavahi_qt5_la_SOURCES_DIST = qt-watch.cpp
78
+libavahi_qt5_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
29
 @HAVE_QT5_TRUE@am_libavahi_qt5_la_OBJECTS =  \
79
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
30
@@ -552,7 +552,7 @@ BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__
80
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt5_la_LDFLAGS) \
81
+	$(LDFLAGS) -o $@
82
+@HAVE_QT5_TRUE@am_libavahi_qt5_la_rpath = -rpath $(libdir)
83
 AM_V_P = $(am__v_P_@AM_V@)
84
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
85
 am__v_P_0 = false
86
@@ -212,7 +224,10 @@
87
 am__v_at_1 = 
88
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
89
 depcomp = $(SHELL) $(top_srcdir)/depcomp
90
-am__depfiles_maybe = depfiles
91
+am__maybe_remake_depfiles = depfiles
92
+am__depfiles_remade = ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo \
93
+	./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo \
94
+	./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
95
 am__mv = mv -f
96
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
97
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
98
@@ -232,9 +247,11 @@
99
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
100
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
101
 am__v_CXXLD_1 = 
102
-SOURCES = $(libavahi_qt3_la_SOURCES) $(libavahi_qt4_la_SOURCES)
103
+SOURCES = $(libavahi_qt3_la_SOURCES) $(libavahi_qt4_la_SOURCES) \
104
+	$(libavahi_qt5_la_SOURCES)
105
 DIST_SOURCES = $(am__libavahi_qt3_la_SOURCES_DIST) \
106
-	$(am__libavahi_qt4_la_SOURCES_DIST)
107
+	$(am__libavahi_qt4_la_SOURCES_DIST) \
108
+	$(am__libavahi_qt5_la_SOURCES_DIST)
109
 am__can_run_installinfo = \
110
   case $$AM_UPDATE_INFO_DIR in \
111
     n|no|NO) false;; \
112
@@ -242,7 +259,9 @@
113
   esac
114
 am__avahiqt3include_HEADERS_DIST = qt-watch.h
115
 am__avahiqt4include_HEADERS_DIST = qt-watch.h
116
-HEADERS = $(avahiqt3include_HEADERS) $(avahiqt4include_HEADERS)
117
+am__avahiqt5include_HEADERS_DIST = qt-watch.h
118
+HEADERS = $(avahiqt3include_HEADERS) $(avahiqt4include_HEADERS) \
119
+	$(avahiqt5include_HEADERS)
120
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
121
 # Read a list of newline-separated strings from the standard input,
122
 # and print each of them once, without duplicates.  Input order is
123
@@ -379,6 +398,7 @@
124
 LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@
125
 LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@
126
 LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@
127
+LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@
128
 LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@
129
 LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@
130
 LIBDAEMON_LIBS = @LIBDAEMON_LIBS@
131
@@ -397,6 +417,7 @@
132
 MKINSTALLDIRS = @MKINSTALLDIRS@
133
 MOC_QT3 = @MOC_QT3@
134
 MOC_QT4 = @MOC_QT4@
135
+MOC_QT5 = @MOC_QT5@
136
 MONODOCER = @MONODOCER@
137
 MONODOC_CFLAGS = @MONODOC_CFLAGS@
138
 MONODOC_DIR = @MONODOC_DIR@
139
@@ -439,6 +460,8 @@
140
 QT3_LIBS = @QT3_LIBS@
141
 QT4_CFLAGS = @QT4_CFLAGS@
142
 QT4_LIBS = @QT4_LIBS@
143
+QT5_CFLAGS = @QT5_CFLAGS@
144
+QT5_LIBS = @QT5_LIBS@
145
 RANLIB = @RANLIB@
146
 SED = @SED@
147
 SET_MAKE = @SET_MAKE@
148
@@ -509,7 +532,6 @@
149
 psdir = @psdir@
150
 pyexecdir = @pyexecdir@
151
 pythondir = @pythondir@
152
-runstatedir = @runstatedir@
153
 sbindir = @sbindir@
154
 sharedstatedir = @sharedstatedir@
155
 srcdir = @srcdir@
156
@@ -520,8 +542,8 @@
157
 top_builddir = @top_builddir@
158
 top_srcdir = @top_srcdir@
159
 AM_CFLAGS = -I$(top_srcdir)
160
-lib_LTLIBRARIES = $(am__append_1) $(am__append_3)
161
-BUILT_SOURCES = $(am__append_2) $(am__append_4)
162
+lib_LTLIBRARIES = $(am__append_1) $(am__append_3) $(am__append_5)
163
+BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__append_6)
164
 @HAVE_QT3_TRUE@avahiqt3includedir = $(includedir)/avahi-qt3
165
 @HAVE_QT3_TRUE@avahiqt3include_HEADERS = \
166
 @HAVE_QT3_TRUE@	qt-watch.h
167
@@ -530,7 +552,7 @@
168
 @HAVE_QT3_TRUE@	qt-watch.cpp
31
 @HAVE_QT3_TRUE@	qt-watch.cpp
169
 
32
 
170
 @HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
33
 @HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
Lines 173-179 Link Here
173
 @HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
36
 @HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
174
 @HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4
37
 @HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4
175
 @HAVE_QT4_TRUE@avahiqt4include_HEADERS = \
38
 @HAVE_QT4_TRUE@avahiqt4include_HEADERS = \
176
@@ -540,8 +562,18 @@
39
@@ -562,7 +562,7 @@ BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__
177
 @HAVE_QT4_TRUE@	qt-watch.cpp
40
 @HAVE_QT4_TRUE@	qt-watch.cpp
178
 
41
 
179
 @HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
42
 @HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
Lines 180-383 Link Here
180
-@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
43
-@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
181
+@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
44
+@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
182
 @HAVE_QT4_TRUE@libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
45
 @HAVE_QT4_TRUE@libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
183
+@HAVE_QT5_TRUE@avahiqt5includedir = $(includedir)/avahi-qt5
46
 @HAVE_QT5_TRUE@avahiqt5includedir = $(includedir)/avahi-qt5
184
+@HAVE_QT5_TRUE@avahiqt5include_HEADERS = \
47
 @HAVE_QT5_TRUE@avahiqt5include_HEADERS = \
185
+@HAVE_QT5_TRUE@	qt-watch.h
48
@@ -572,7 +572,7 @@ BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__
186
+
49
 @HAVE_QT5_TRUE@	qt-watch.cpp
187
+@HAVE_QT5_TRUE@libavahi_qt5_la_SOURCES = \
50
 
188
+@HAVE_QT5_TRUE@	qt-watch.cpp
51
 @HAVE_QT5_TRUE@libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
189
+
52
-@HAVE_QT5_TRUE@libavahi_qt5_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT5_LIBS)
190
+@HAVE_QT5_TRUE@libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
191
+@HAVE_QT5_TRUE@libavahi_qt5_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT5_LIBS)
53
+@HAVE_QT5_TRUE@libavahi_qt5_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT5_LIBS)
192
+@HAVE_QT5_TRUE@libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
54
 @HAVE_QT5_TRUE@libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
193
 CLEANFILES = $(BUILT_SOURCES)
55
 CLEANFILES = $(BUILT_SOURCES)
194
 all: $(BUILT_SOURCES)
56
 all: $(BUILT_SOURCES)
195
 	$(MAKE) $(AM_MAKEFLAGS) all-am
196
@@ -565,8 +597,8 @@
197
 	  *config.status*) \
198
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
199
 	  *) \
200
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
201
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
202
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
203
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
204
 	esac;
205
 
206
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
207
@@ -619,15 +651,25 @@
208
 libavahi-qt4.la: $(libavahi_qt4_la_OBJECTS) $(libavahi_qt4_la_DEPENDENCIES) $(EXTRA_libavahi_qt4_la_DEPENDENCIES) 
209
 	$(AM_V_CXXLD)$(libavahi_qt4_la_LINK) $(am_libavahi_qt4_la_rpath) $(libavahi_qt4_la_OBJECTS) $(libavahi_qt4_la_LIBADD) $(LIBS)
210
 
211
+libavahi-qt5.la: $(libavahi_qt5_la_OBJECTS) $(libavahi_qt5_la_DEPENDENCIES) $(EXTRA_libavahi_qt5_la_DEPENDENCIES) 
212
+	$(AM_V_CXXLD)$(libavahi_qt5_la_LINK) $(am_libavahi_qt5_la_rpath) $(libavahi_qt5_la_OBJECTS) $(libavahi_qt5_la_LIBADD) $(LIBS)
213
+
214
 mostlyclean-compile:
215
 	-rm -f *.$(OBJEXT)
216
 
217
 distclean-compile:
218
 	-rm -f *.tab.c
219
 
220
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo@am__quote@
221
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo@am__quote@
222
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo@am__quote@ # am--include-marker
223
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo@am__quote@ # am--include-marker
224
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo@am__quote@ # am--include-marker
225
 
226
+$(am__depfiles_remade):
227
+	@$(MKDIR_P) $(@D)
228
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
229
+
230
+am--depfiles: $(am__depfiles_remade)
231
+
232
 .cpp.o:
233
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
234
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
235
@@ -663,6 +705,13 @@
236
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
237
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt4_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libavahi_qt4_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp
238
 
239
+libavahi_qt5_la-qt-watch.lo: qt-watch.cpp
240
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libavahi_qt5_la-qt-watch.lo -MD -MP -MF $(DEPDIR)/libavahi_qt5_la-qt-watch.Tpo -c -o libavahi_qt5_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp
241
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libavahi_qt5_la-qt-watch.Tpo $(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
242
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='qt-watch.cpp' object='libavahi_qt5_la-qt-watch.lo' libtool=yes @AMDEPBACKSLASH@
243
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
244
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libavahi_qt5_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp
245
+
246
 mostlyclean-libtool:
247
 	-rm -f *.lo
248
 
249
@@ -710,7 +759,28 @@
250
 	@list='$(avahiqt4include_HEADERS)'; test -n "$(avahiqt4includedir)" || list=; \
251
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
252
 	dir='$(DESTDIR)$(avahiqt4includedir)'; $(am__uninstall_files_from_dir)
253
+install-avahiqt5includeHEADERS: $(avahiqt5include_HEADERS)
254
+	@$(NORMAL_INSTALL)
255
+	@list='$(avahiqt5include_HEADERS)'; test -n "$(avahiqt5includedir)" || list=; \
256
+	if test -n "$$list"; then \
257
+	  echo " $(MKDIR_P) '$(DESTDIR)$(avahiqt5includedir)'"; \
258
+	  $(MKDIR_P) "$(DESTDIR)$(avahiqt5includedir)" || exit 1; \
259
+	fi; \
260
+	for p in $$list; do \
261
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
262
+	  echo "$$d$$p"; \
263
+	done | $(am__base_list) | \
264
+	while read files; do \
265
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(avahiqt5includedir)'"; \
266
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(avahiqt5includedir)" || exit $$?; \
267
+	done
268
 
269
+uninstall-avahiqt5includeHEADERS:
270
+	@$(NORMAL_UNINSTALL)
271
+	@list='$(avahiqt5include_HEADERS)'; test -n "$(avahiqt5includedir)" || list=; \
272
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
273
+	dir='$(DESTDIR)$(avahiqt5includedir)'; $(am__uninstall_files_from_dir)
274
+
275
 ID: $(am__tagged_files)
276
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
277
 tags: tags-am
278
@@ -763,7 +833,10 @@
279
 distclean-tags:
280
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
281
 
282
-distdir: $(DISTFILES)
283
+distdir: $(BUILT_SOURCES)
284
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
285
+
286
+distdir-am: $(DISTFILES)
287
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
288
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
289
 	list='$(DISTFILES)'; \
290
@@ -798,7 +871,7 @@
291
 	$(MAKE) $(AM_MAKEFLAGS) check-am
292
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
293
 installdirs:
294
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahiqt3includedir)" "$(DESTDIR)$(avahiqt4includedir)"; do \
295
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahiqt3includedir)" "$(DESTDIR)$(avahiqt4includedir)" "$(DESTDIR)$(avahiqt5includedir)"; do \
296
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
297
 	done
298
 install: $(BUILT_SOURCES)
299
@@ -840,7 +913,9 @@
300
 	mostlyclean-am
301
 
302
 distclean: distclean-am
303
-	-rm -rf ./$(DEPDIR)
304
+		-rm -f ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo
305
+	-rm -f ./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo
306
+	-rm -f ./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
307
 	-rm -f Makefile
308
 distclean-am: clean-am distclean-compile distclean-generic \
309
 	distclean-tags
310
@@ -858,7 +933,7 @@
311
 info-am:
312
 
313
 install-data-am: install-avahiqt3includeHEADERS \
314
-	install-avahiqt4includeHEADERS
315
+	install-avahiqt4includeHEADERS install-avahiqt5includeHEADERS
316
 
317
 install-dvi: install-dvi-am
318
 
319
@@ -887,7 +962,9 @@
320
 installcheck-am:
321
 
322
 maintainer-clean: maintainer-clean-am
323
-	-rm -rf ./$(DEPDIR)
324
+		-rm -f ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo
325
+	-rm -f ./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo
326
+	-rm -f ./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
327
 	-rm -f Makefile
328
 maintainer-clean-am: distclean-am maintainer-clean-generic
329
 
330
@@ -905,26 +982,29 @@
331
 ps-am:
332
 
333
 uninstall-am: uninstall-avahiqt3includeHEADERS \
334
-	uninstall-avahiqt4includeHEADERS uninstall-libLTLIBRARIES
335
+	uninstall-avahiqt4includeHEADERS \
336
+	uninstall-avahiqt5includeHEADERS uninstall-libLTLIBRARIES
337
 
338
 .MAKE: all check install install-am install-strip
339
 
340
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
341
-	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
342
-	ctags-am distclean distclean-compile distclean-generic \
343
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
344
+	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
345
+	ctags ctags-am distclean distclean-compile distclean-generic \
346
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
347
 	html-am info info-am install install-am \
348
 	install-avahiqt3includeHEADERS install-avahiqt4includeHEADERS \
349
-	install-data install-data-am install-dvi install-dvi-am \
350
-	install-exec install-exec-am install-html install-html-am \
351
-	install-info install-info-am install-libLTLIBRARIES \
352
-	install-man install-pdf install-pdf-am install-ps \
353
-	install-ps-am install-strip installcheck installcheck-am \
354
-	installdirs maintainer-clean maintainer-clean-generic \
355
-	mostlyclean mostlyclean-compile mostlyclean-generic \
356
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
357
-	uninstall-am uninstall-avahiqt3includeHEADERS \
358
-	uninstall-avahiqt4includeHEADERS uninstall-libLTLIBRARIES
359
+	install-avahiqt5includeHEADERS install-data install-data-am \
360
+	install-dvi install-dvi-am install-exec install-exec-am \
361
+	install-html install-html-am install-info install-info-am \
362
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
363
+	install-ps install-ps-am install-strip installcheck \
364
+	installcheck-am installdirs maintainer-clean \
365
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
366
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
367
+	tags tags-am uninstall uninstall-am \
368
+	uninstall-avahiqt3includeHEADERS \
369
+	uninstall-avahiqt4includeHEADERS \
370
+	uninstall-avahiqt5includeHEADERS uninstall-libLTLIBRARIES
371
 
372
 .PRECIOUS: Makefile
373
 
374
@@ -934,6 +1014,9 @@
375
 
376
 @HAVE_QT4_TRUE@qt-watch.moc4: qt-watch.cpp
377
 @HAVE_QT4_TRUE@	$(AM_V_GEN)$(MOC_QT4) $^ > $@
378
+
379
+@HAVE_QT5_TRUE@qt-watch.moc5: qt-watch.cpp
380
+@HAVE_QT5_TRUE@	$(AM_V_GEN)$(MOC_QT5) $^ > $@
381
 
382
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
383
 # Otherwise a system limit (for SysV at least) may be exceeded.
(-)avahi-app/files/patch-avahi-qt_qt-watch.cpp (-48 lines)
Lines 1-48 Link Here
1
--- avahi-qt/qt-watch.cpp.orig	2017-07-10 12:14:59.119370306 +0200
2
+++ avahi-qt/qt-watch.cpp	2018-12-22 20:56:34.850048000 +0100
3
@@ -18,10 +18,10 @@
4
 ***/
5
 
6
 #include <sys/time.h>
7
-#ifdef QT4
8
-#include <Qt/qsocketnotifier.h>
9
-#include <Qt/qobject.h>
10
-#include <Qt/qtimer.h>
11
+#if defined(QT5) || defined(QT4)
12
+#include <QSocketNotifier>
13
+#include <QObject>
14
+#include <QTimer>
15
 #else
16
 #include <qsocketnotifier.h>
17
 #include <qobject.h>
18
@@ -114,7 +114,7 @@
19
     m_callback(callback), m_userdata(userdata)
20
 {
21
     connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout()));
22
-#ifdef QT4
23
+#if defined(QT5) || defined(QT4)
24
     m_timer.setSingleShot(true);
25
 #endif
26
     update(tv);
27
@@ -125,7 +125,7 @@
28
     m_timer.stop();
29
     if (tv) {
30
     AvahiUsec u = avahi_age(tv)/1000;
31
-#ifdef QT4
32
+#if defined(QT5) || defined(QT4)
33
     m_timer.start( (u>0) ? 0 : -u);
34
 #else
35
     m_timer.start( (u>0) ? 0 : -u,true);
36
@@ -191,8 +191,10 @@
37
     return &qt_poll;
38
 }
39
 
40
-#ifdef QT4
41
+#if defined(QT5)
42
+#include "qt-watch.moc5"
43
+#elif defined(QT4)
44
 #include "qt-watch.moc4"
45
-#else
46
+#elif defined(QT3)
47
 #include "qt-watch.moc3"
48
 #endif
(-)avahi-app/files/patch-common_qt5-pie.m4 (-30 lines)
Lines 1-30 Link Here
1
--- common/qt5-pie.m4.orig	2018-12-22 20:56:34.850352000 +0100
2
+++ common/qt5-pie.m4	2018-12-22 20:56:34.850515000 +0100
3
@@ -0,0 +1,27 @@
4
+AC_DEFUN([AC_AVAHI_QT_ADD_PIC_IF_NEEDED],
5
+[
6
+    AC_LANG_PUSH([C++])
7
+	save_CPPFLAGS="$CPPFLAGS"
8
+	CPPFLAGS="$CPPFLAGS $QT5_CFLAGS"
9
+	AC_MSG_CHECKING([whether Qt works without -fPIC])
10
+	AC_PREPROC_IFELSE(
11
+		[AC_LANG_SOURCE([[#include <QtCore>]])],
12
+		[AC_MSG_RESULT(yes)],
13
+		[
14
+			AC_MSG_RESULT(no)
15
+			AC_MSG_CHECKING([whether Qt works with -fPIC])
16
+			CPPFLAGS="$CPPFLAGS -fPIC"
17
+			AC_PREPROC_IFELSE(
18
+				[AC_LANG_SOURCE([[#include <QtCore>]])],
19
+				[
20
+					AC_MSG_RESULT(yes)
21
+					QT5_CFLAGS="$QT5_CFLAGS -fPIC"
22
+				],
23
+				[
24
+					AC_MSG_RESULT(no)
25
+					AC_MSG_ERROR(Couldn't compile Qt without -fPIC nor with -fPIC)
26
+				])
27
+		])
28
+	CPPFLAGS="$save_CPPFLAGS"
29
+    AC_LANG_POP([C++])
30
+])
(-)avahi-app/files/patch-configure (-324 lines)
Lines 1-324 Link Here
1
--- configure.orig	2018-12-22 21:11:56.328592000 +0100
2
+++ configure	2018-12-22 21:12:12.121977000 +0100
3
@@ -763,6 +763,11 @@
4
 HAVE_GTK_TRUE
5
 GTK20_LIBS
6
 GTK20_CFLAGS
7
+HAVE_QT5_FALSE
8
+HAVE_QT5_TRUE
9
+MOC_QT5
10
+QT5_LIBS
11
+QT5_CFLAGS
12
 HAVE_QT4_FALSE
13
 HAVE_QT4_TRUE
14
 MOC_QT4
15
@@ -948,6 +953,7 @@
16
 LIBAVAHI_COMPAT_HOWL_VERSION_INFO
17
 LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO
18
 LIBAVAHI_UI_VERSION_INFO
19
+LIBAVAHI_QT5_VERSION_INFO
20
 LIBAVAHI_QT4_VERSION_INFO
21
 LIBAVAHI_QT3_VERSION_INFO
22
 LIBAVAHI_GOBJECT_VERSION_INFO
23
@@ -1042,6 +1048,7 @@
24
 enable_introspection
25
 enable_qt3
26
 enable_qt4
27
+enable_qt5
28
 enable_gtk
29
 enable_gtk3
30
 enable_dbus
31
@@ -1105,6 +1112,8 @@
32
 QT3_LIBS
33
 QT4_CFLAGS
34
 QT4_LIBS
35
+QT5_CFLAGS
36
+QT5_LIBS
37
 GTK20_CFLAGS
38
 GTK20_LIBS
39
 GTK30_CFLAGS
40
@@ -1757,6 +1766,7 @@
41
                           Enable introspection for this build
42
   --disable-qt3           Disable building of Qt3 mainloop integration
43
   --disable-qt4           Disable building of Qt4Core mainloop integration
44
+  --disable-qt5           Disable building of Qt5Core mainloop integration
45
   --disable-gtk           Disable use of GTK+ 2
46
   --disable-gtk3          Disable use of GTK+ 3
47
   --disable-dbus          Disable use of D-Bus
48
@@ -1854,6 +1864,8 @@
49
   QT3_LIBS    linker flags for QT3, overriding pkg-config
50
   QT4_CFLAGS  C compiler flags for QT4, overriding pkg-config
51
   QT4_LIBS    linker flags for QT4, overriding pkg-config
52
+  QT5_CFLAGS  C compiler flags for QT5, overriding pkg-config
53
+  QT5_LIBS    linker flags for QT5, overriding pkg-config
54
   GTK20_CFLAGS
55
               C compiler flags for GTK20, overriding pkg-config
56
   GTK20_LIBS  linker flags for GTK20, overriding pkg-config
57
@@ -3597,6 +3609,8 @@
58
 
59
 LIBAVAHI_QT4_VERSION_INFO=1:2:0
60
 
61
+LIBAVAHI_QT5_VERSION_INFO=1:2:0
62
+
63
 LIBAVAHI_UI_VERSION_INFO=1:4:1
64
 
65
 
66
@@ -21586,6 +21600,231 @@
67
 
68
 
69
 #
70
+# Check for Qt 5
71
+#
72
+# Check whether --enable-qt5 was given.
73
+if test "${enable_qt5+set}" = set; then :
74
+  enableval=$enable_qt5; case "${enableval}" in
75
+                yes) HAVE_QT5=yes ;;
76
+                no)  HAVE_QT5=no ;;
77
+                *) as_fn_error $? "bad value ${enableval} for --enable-qt5" "$LINENO" 5 ;;
78
+        esac
79
+else
80
+  HAVE_QT5=yes
81
+fi
82
+
83
+
84
+if test "x$HAVE_QT5" = "xyes" ; then
85
+
86
+pkg_failed=no
87
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5
88
+$as_echo_n "checking for QT5... " >&6; }
89
+
90
+if test -n "$QT5_CFLAGS"; then
91
+    pkg_cv_QT5_CFLAGS="$QT5_CFLAGS"
92
+ elif test -n "$PKG_CONFIG"; then
93
+    if test -n "$PKG_CONFIG" && \
94
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" Qt5Core >= 5.0.0 \""; } >&5
95
+  ($PKG_CONFIG --exists --print-errors " Qt5Core >= 5.0.0 ") 2>&5
96
+  ac_status=$?
97
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
98
+  test $ac_status = 0; }; then
99
+  pkg_cv_QT5_CFLAGS=`$PKG_CONFIG --cflags " Qt5Core >= 5.0.0 " 2>/dev/null`
100
+		      test "x$?" != "x0" && pkg_failed=yes
101
+else
102
+  pkg_failed=yes
103
+fi
104
+ else
105
+    pkg_failed=untried
106
+fi
107
+if test -n "$QT5_LIBS"; then
108
+    pkg_cv_QT5_LIBS="$QT5_LIBS"
109
+ elif test -n "$PKG_CONFIG"; then
110
+    if test -n "$PKG_CONFIG" && \
111
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" Qt5Core >= 5.0.0 \""; } >&5
112
+  ($PKG_CONFIG --exists --print-errors " Qt5Core >= 5.0.0 ") 2>&5
113
+  ac_status=$?
114
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
115
+  test $ac_status = 0; }; then
116
+  pkg_cv_QT5_LIBS=`$PKG_CONFIG --libs " Qt5Core >= 5.0.0 " 2>/dev/null`
117
+		      test "x$?" != "x0" && pkg_failed=yes
118
+else
119
+  pkg_failed=yes
120
+fi
121
+ else
122
+    pkg_failed=untried
123
+fi
124
+
125
+
126
+
127
+if test $pkg_failed = yes; then
128
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
129
+$as_echo "no" >&6; }
130
+
131
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
132
+        _pkg_short_errors_supported=yes
133
+else
134
+        _pkg_short_errors_supported=no
135
+fi
136
+        if test $_pkg_short_errors_supported = yes; then
137
+	        QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " Qt5Core >= 5.0.0 " 2>&1`
138
+        else
139
+	        QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " Qt5Core >= 5.0.0 " 2>&1`
140
+        fi
141
+	# Put the nasty error message in config.log where it belongs
142
+	echo "$QT5_PKG_ERRORS" >&5
143
+
144
+	as_fn_error $? "Package requirements ( Qt5Core >= 5.0.0 ) were not met:
145
+
146
+$QT5_PKG_ERRORS
147
+
148
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
149
+installed software in a non-standard prefix.
150
+
151
+Alternatively, you may set the environment variables QT5_CFLAGS
152
+and QT5_LIBS to avoid the need to call pkg-config.
153
+See the pkg-config man page for more details." "$LINENO" 5
154
+elif test $pkg_failed = untried; then
155
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
156
+$as_echo "no" >&6; }
157
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
158
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
159
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
160
+is in your PATH or set the PKG_CONFIG environment variable to the full
161
+path to pkg-config.
162
+
163
+Alternatively, you may set the environment variables QT5_CFLAGS
164
+and QT5_LIBS to avoid the need to call pkg-config.
165
+See the pkg-config man page for more details.
166
+
167
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
168
+See \`config.log' for more details" "$LINENO" 5; }
169
+else
170
+	QT5_CFLAGS=$pkg_cv_QT5_CFLAGS
171
+	QT5_LIBS=$pkg_cv_QT5_LIBS
172
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
173
+$as_echo "yes" >&6; }
174
+
175
+fi
176
+
177
+
178
+    ac_ext=cpp
179
+ac_cpp='$CXXCPP $CPPFLAGS'
180
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
181
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
182
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
183
+
184
+	save_CPPFLAGS="$CPPFLAGS"
185
+	CPPFLAGS="$CPPFLAGS $QT5_CFLAGS"
186
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt works without -fPIC" >&5
187
+$as_echo_n "checking whether Qt works without -fPIC... " >&6; }
188
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
189
+/* end confdefs.h.  */
190
+#include <QtCore>
191
+_ACEOF
192
+if ac_fn_cxx_try_cpp "$LINENO"; then :
193
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
194
+$as_echo "yes" >&6; }
195
+else
196
+
197
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
198
+$as_echo "no" >&6; }
199
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt works with -fPIC" >&5
200
+$as_echo_n "checking whether Qt works with -fPIC... " >&6; }
201
+			CPPFLAGS="$CPPFLAGS -fPIC"
202
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
203
+/* end confdefs.h.  */
204
+#include <QtCore>
205
+_ACEOF
206
+if ac_fn_cxx_try_cpp "$LINENO"; then :
207
+
208
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
209
+$as_echo "yes" >&6; }
210
+					QT5_CFLAGS="$QT5_CFLAGS -fPIC"
211
+
212
+else
213
+
214
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
215
+$as_echo "no" >&6; }
216
+					as_fn_error $? "Couldn't compile Qt without -fPIC nor with -fPIC" "$LINENO" 5
217
+
218
+fi
219
+rm -f conftest.err conftest.i conftest.$ac_ext
220
+
221
+fi
222
+rm -f conftest.err conftest.i conftest.$ac_ext
223
+	CPPFLAGS="$save_CPPFLAGS"
224
+    ac_ext=c
225
+ac_cpp='$CPP $CPPFLAGS'
226
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
227
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
228
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
229
+
230
+
231
+
232
+
233
+        QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`"
234
+        for ac_prog in moc-qt5 moc
235
+do
236
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
237
+set dummy $ac_prog; ac_word=$2
238
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
239
+$as_echo_n "checking for $ac_word... " >&6; }
240
+if ${ac_cv_path_MOC_QT5+:} false; then :
241
+  $as_echo_n "(cached) " >&6
242
+else
243
+  case $MOC_QT5 in
244
+  [\\/]* | ?:[\\/]*)
245
+  ac_cv_path_MOC_QT5="$MOC_QT5" # Let the user override the test with a path.
246
+  ;;
247
+  *)
248
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
249
+for as_dir in $QT5_PREFIX
250
+do
251
+  IFS=$as_save_IFS
252
+  test -z "$as_dir" && as_dir=.
253
+    for ac_exec_ext in '' $ac_executable_extensions; do
254
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
255
+    ac_cv_path_MOC_QT5="$as_dir/$ac_word$ac_exec_ext"
256
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
257
+    break 2
258
+  fi
259
+done
260
+  done
261
+IFS=$as_save_IFS
262
+
263
+  ;;
264
+esac
265
+fi
266
+MOC_QT5=$ac_cv_path_MOC_QT5
267
+if test -n "$MOC_QT5"; then
268
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC_QT5" >&5
269
+$as_echo "$MOC_QT5" >&6; }
270
+else
271
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
272
+$as_echo "no" >&6; }
273
+fi
274
+
275
+
276
+  test -n "$MOC_QT5" && break
277
+done
278
+test -n "$MOC_QT5" || MOC_QT5="no"
279
+
280
+        if test "$MOC_QT5" = no; then
281
+            as_fn_error $? "Could not find QT5 moc" "$LINENO" 5
282
+        fi
283
+
284
+fi
285
+ if test "x$HAVE_QT5" = "xyes"; then
286
+  HAVE_QT5_TRUE=
287
+  HAVE_QT5_FALSE='#'
288
+else
289
+  HAVE_QT5_TRUE='#'
290
+  HAVE_QT5_FALSE=
291
+fi
292
+
293
+
294
+#
295
 # Check for GTK+ 2.0
296
 #
297
 # Check whether --enable-gtk was given.
298
@@ -25878,6 +26117,10 @@
299
   as_fn_error $? "conditional \"HAVE_QT4\" was never defined.
300
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
301
 fi
302
+if test -z "${HAVE_QT5_TRUE}" && test -z "${HAVE_QT5_FALSE}"; then
303
+  as_fn_error $? "conditional \"HAVE_QT5\" was never defined.
304
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
305
+fi
306
 if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then
307
   as_fn_error $? "conditional \"HAVE_GTK\" was never defined.
308
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
309
@@ -28556,6 +28799,7 @@
310
     Enable python-dbus:                        ${HAVE_PYTHON_DBUS}
311
     Enable QT3:                                ${HAVE_QT3}
312
     Enable QT4:                                ${HAVE_QT4}
313
+    Enable QT5:                                ${HAVE_QT5}
314
     Enable Mono:                               ${HAVE_MONO}
315
     Enable Monodoc:                            ${HAVE_MONODOC}
316
     Distribution/OS:                           ${with_distro}
317
@@ -28625,6 +28869,7 @@
318
     Building avahi-discover-standalone: ${HAVE_GTK2OR3}
319
     Building libavahi-qt3:              ${HAVE_QT3}
320
     Building libavahi-qt4:              ${HAVE_QT4}
321
+    Building libavahi-qt5:              ${HAVE_QT5}
322
     Building avahi-sharp:               ${HAVE_MONO}
323
     Building avahi-compat-libdns_sd:    ${ENABLE_COMPAT_LIBDNS_SD}
324
     Building avahi-compat-howl:         ${ENABLE_COMPAT_HOWL}
(-)avahi-app/pkg-plist (-8 / +7 lines)
Lines 66-95 Link Here
66
include/avahi-gobject/ga-record-browser.h
66
include/avahi-gobject/ga-record-browser.h
67
include/avahi-gobject/ga-service-browser.h
67
include/avahi-gobject/ga-service-browser.h
68
include/avahi-gobject/ga-service-resolver.h
68
include/avahi-gobject/ga-service-resolver.h
69
include/avahi-libevent/libevent-watch.h
69
lib/avahi/.keep
70
lib/avahi/.keep
70
lib/girepository-1.0/Avahi-0.6.typelib
71
lib/girepository-1.0/Avahi-0.6.typelib
71
lib/girepository-1.0/AvahiCore-0.6.typelib
72
lib/girepository-1.0/AvahiCore-0.6.typelib
72
lib/libavahi-client.a
73
lib/libavahi-client.so
73
lib/libavahi-client.so
74
lib/libavahi-client.so.3
74
lib/libavahi-client.so.3
75
lib/libavahi-client.so.3.2.9
75
lib/libavahi-client.so.3.2.9
76
lib/libavahi-common.a
77
lib/libavahi-common.so
76
lib/libavahi-common.so
78
lib/libavahi-common.so.3
77
lib/libavahi-common.so.3
79
lib/libavahi-common.so.3.5.3
78
lib/libavahi-common.so.3.5.4
80
lib/libavahi-core.a
81
lib/libavahi-core.so
79
lib/libavahi-core.so
82
lib/libavahi-core.so.7
80
lib/libavahi-core.so.7
83
lib/libavahi-core.so.7.0.2
81
lib/libavahi-core.so.7.1.0
84
lib/libavahi-glib.a
85
lib/libavahi-glib.so
82
lib/libavahi-glib.so
86
lib/libavahi-glib.so.1
83
lib/libavahi-glib.so.1
87
lib/libavahi-glib.so.1.0.2
84
lib/libavahi-glib.so.1.0.2
88
lib/libavahi-gobject.a
89
lib/libavahi-gobject.so
85
lib/libavahi-gobject.so
90
lib/libavahi-gobject.so.0
86
lib/libavahi-gobject.so.0
91
lib/libavahi-gobject.so.0.0.5
87
lib/libavahi-gobject.so.0.0.5
92
lib/libhowl.a
88
lib/libavahi-libevent.so
89
lib/libavahi-libevent.so.1
90
lib/libavahi-libevent.so.1.0.0
93
lib/libhowl.so
91
lib/libhowl.so
94
lib/libhowl.so.0
92
lib/libhowl.so.0
95
lib/libhowl.so.0.0.0
93
lib/libhowl.so.0.0.0
Lines 98-103 Link Here
98
libdata/pkgconfig/avahi-core.pc
96
libdata/pkgconfig/avahi-core.pc
99
libdata/pkgconfig/avahi-glib.pc
97
libdata/pkgconfig/avahi-glib.pc
100
libdata/pkgconfig/avahi-gobject.pc
98
libdata/pkgconfig/avahi-gobject.pc
99
libdata/pkgconfig/avahi-libevent.pc
101
man/man1/avahi-browse-domains.1.gz
100
man/man1/avahi-browse-domains.1.gz
102
man/man1/avahi-browse.1.gz
101
man/man1/avahi-browse.1.gz
103
man/man1/avahi-publish-address.1.gz
102
man/man1/avahi-publish-address.1.gz
(-)avahi-autoipd/Makefile (-1 / +2 lines)
Lines 9-15 Link Here
9
MAINTAINER=	gnome@FreeBSD.org
9
MAINTAINER=	gnome@FreeBSD.org
10
COMMENT=	IPv4LL network address configuration daemon
10
COMMENT=	IPv4LL network address configuration daemon
11
11
12
LIB_DEPENDS=	libavahi-common.so:net/avahi-app
12
LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
13
		libdaemon.so:devel/libdaemon
13
14
14
USERS=		avahi-autoipd
15
USERS=		avahi-autoipd
15
GROUPS=		${USERS}
16
GROUPS=		${USERS}
(-)avahi-gtk/Makefile (-12 / +8 lines)
Lines 1-7 Link Here
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTREVISION=	1
4
PORTREVISION=	0
5
CATEGORIES=	net
5
CATEGORIES=	net
6
PKGNAMESUFFIX=	-gtk
6
PKGNAMESUFFIX=	-gtk
7
7
Lines 11-17 Link Here
11
LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
11
LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
12
		libfontconfig.so:x11-fonts/fontconfig \
12
		libfontconfig.so:x11-fonts/fontconfig \
13
		libfreetype.so:print/freetype2 \
13
		libfreetype.so:print/freetype2 \
14
		libgdbm.so:databases/gdbm
14
		libgdbm.so:databases/gdbm \
15
		libharfbuzz.so:print/harfbuzz
15
RUN_DEPENDS=	avahi-header>=0.6:net/avahi-header
16
RUN_DEPENDS=	avahi-header>=0.6:net/avahi-header
16
17
17
MASTERDIR=	${.CURDIR}/../avahi-app
18
MASTERDIR=	${.CURDIR}/../avahi-app
Lines 23-47 Link Here
23
AVAHI_SLAVE=	gtk
24
AVAHI_SLAVE=	gtk
24
AVAHI_PKGCONFIG=avahi-ui.pc
25
AVAHI_PKGCONFIG=avahi-ui.pc
25
26
26
MANPAGES=	bssh.1
27
USE_GNOME+=	atk cairo gdkpixbuf2 gtk20 pango
27
28
28
USE_GNOME+=	cairo gdkpixbuf2 libglade2
29
30
do-build:
29
do-build:
31
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-common
30
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-common
32
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-client
31
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-client
33
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-glib
32
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-glib
34
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-ui
33
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-ui
34
	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-discover-standalone
35
35
36
post-build:
36
do-install:
37
	@(cd ${WRKSRC}/avahi-discover-standalone && \
37
	@(cd ${WRKSRC}/avahi-discover-standalone; ${MAKE_CMD} ${MAKE_ARGS} install-binPROGRAMS install-interfacesDATA)
38
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
38
	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-binPROGRAMS install-desktopDATA install-exec-local)
39
39
40
post-install:
40
post-install:
41
	@(cd ${WRKSRC}/avahi-discover-standalone && \
42
		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
43
	${LN} -sf bssh.1 ${STAGEDIR}${MANPREFIX}/man/man1/bvnc.1
44
	${LN} -sf bssh.1 ${STAGEDIR}${MANPREFIX}/man/man1/bshell.1
45
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui.so.0
41
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui.so.0
46
42
47
.include "${MASTERDIR}/Makefile"
43
.include "${MASTERDIR}/Makefile"
(-)avahi-gtk/pkg-plist (-4 lines)
Lines 2-15 Link Here
2
bin/bshell
2
bin/bshell
3
bin/bssh
3
bin/bssh
4
bin/bvnc
4
bin/bvnc
5
lib/libavahi-ui.a
6
lib/libavahi-ui.so
5
lib/libavahi-ui.so
7
lib/libavahi-ui.so.0
6
lib/libavahi-ui.so.0
8
lib/libavahi-ui.so.0.1.4
7
lib/libavahi-ui.so.0.1.4
9
libdata/pkgconfig/avahi-ui.pc
8
libdata/pkgconfig/avahi-ui.pc
10
man/man1/bshell.1.gz
11
man/man1/bssh.1.gz
12
man/man1/bvnc.1.gz
13
share/applications/bssh.desktop
9
share/applications/bssh.desktop
14
share/applications/bvnc.desktop
10
share/applications/bvnc.desktop
15
%%DATADIR%%/interfaces/avahi-discover.ui
11
%%DATADIR%%/interfaces/avahi-discover.ui
(-)avahi-gtk3/Makefile (-3 / +7 lines)
Lines 1-7 Link Here
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTREVISION=	1
4
PORTREVISION=	0
5
CATEGORIES=	net
5
CATEGORIES=	net
6
PKGNAMESUFFIX=	-gtk3
6
PKGNAMESUFFIX=	-gtk3
7
7
Lines 9-16 Link Here
9
COMMENT=	Gtk+ 3 library to the Avahi mDNS system
9
COMMENT=	Gtk+ 3 library to the Avahi mDNS system
10
10
11
LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
11
LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
12
		libgdbm.so:databases/gdbm
12
		libgdbm.so:databases/gdbm \
13
RUN_DEPENDS=	avahi-header>=0.7:net/avahi-header
13
		libharfbuzz.so:print/harfbuzz
14
RUN_DEPENDS=	avahi-header>=0.8:net/avahi-header
14
15
15
MASTERDIR=	${.CURDIR}/../avahi-app
16
MASTERDIR=	${.CURDIR}/../avahi-app
16
BUILD_WRKSRC=	${WRKSRC}/avahi-ui
17
BUILD_WRKSRC=	${WRKSRC}/avahi-ui
Lines 32-35 Link Here
32
do-install:
33
do-install:
33
	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
34
	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
34
35
36
post-install:
37
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui-gtk3.so
38
35
.include "${MASTERDIR}/Makefile"
39
.include "${MASTERDIR}/Makefile"
(-)avahi-gtk3/pkg-plist (-1 lines)
Lines 1-4 Link Here
1
lib/libavahi-ui-gtk3.a
2
lib/libavahi-ui-gtk3.so
1
lib/libavahi-ui-gtk3.so
3
lib/libavahi-ui-gtk3.so.0
2
lib/libavahi-ui-gtk3.so.0
4
lib/libavahi-ui-gtk3.so.0.1.4
3
lib/libavahi-ui-gtk3.so.0.1.4
(-)avahi-libdns/pkg-plist (-1 lines)
Lines 1-5 Link Here
1
include/avahi-compat-libdns_sd/dns_sd.h
1
include/avahi-compat-libdns_sd/dns_sd.h
2
lib/libdns_sd.a
3
lib/libdns_sd.so
2
lib/libdns_sd.so
4
lib/libdns_sd.so.1
3
lib/libdns_sd.so.1
5
lib/libdns_sd.so.1.0.0
4
lib/libdns_sd.so.1.0.0
(-)avahi-qt5/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# Created by: Michael Johnson <ahze@FreeBSD.org
1
# Created by: Michael Johnson <ahze@FreeBSD.org
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTREVISION=	2
4
PORTREVISION=	0
5
CATEGORIES=	net
5
CATEGORIES=	net
6
PKGNAMESUFFIX=	-qt5
6
PKGNAMESUFFIX=	-qt5
7
7
(-)avahi-qt5/pkg-plist (-1 lines)
Lines 1-5 Link Here
1
include/avahi-qt5/qt-watch.h
1
include/avahi-qt5/qt-watch.h
2
lib/libavahi-qt5.a
3
lib/libavahi-qt5.so
2
lib/libavahi-qt5.so
4
lib/libavahi-qt5.so.1
3
lib/libavahi-qt5.so.1
5
lib/libavahi-qt5.so.1.0.2
4
lib/libavahi-qt5.so.1.0.2
(-)py-avahi/Makefile (-17 / +16 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
#   $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
3
#   $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
4
4
5
PORTREVISION=	1
5
PORTREVISION=	0
6
CATEGORIES=	net gnome python
6
CATEGORIES=	net gnome python
7
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
7
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMESUFFIX=	# empty
8
PKGNAMESUFFIX=	# empty
Lines 10-24 Link Here
10
MAINTAINER=	gnome@FreeBSD.org
10
MAINTAINER=	gnome@FreeBSD.org
11
COMMENT=	Python interface to the Avahi mDNS system
11
COMMENT=	Python interface to the Avahi mDNS system
12
12
13
DEPRECATED=	Uses deprecated version of python
14
EXPIRATION_DATE=	2020-11-15
15
16
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
13
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
17
		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
14
		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
18
LIB_DEPENDS=	libavahi-client.so:net/avahi-app
15
LIB_DEPENDS=	libavahi-client.so:net/avahi-app
19
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
16
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
20
		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} \
17
		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} \
21
		avahi-gtk>=0.7:net/avahi-gtk
18
		avahi-gtk3>=0.7:net/avahi-gtk3
22
19
23
MASTERDIR=	${.CURDIR}/../avahi-app
20
MASTERDIR=	${.CURDIR}/../avahi-app
24
BUILD_WRKSRC=	${WRKSRC}/avahi-python
21
BUILD_WRKSRC=	${WRKSRC}/avahi-python
Lines 29-53 Link Here
29
AVAHI_SLAVE=	python
26
AVAHI_SLAVE=	python
30
27
31
USE_GNOME=	pygobject3 gtk30
28
USE_GNOME=	pygobject3 gtk30
32
USES=		python:2.7
29
USES=		python:3.5+
33
USE_PYTHON=	flavors
30
USE_PYTHON=	flavors py3kplist
34
MANPAGES=	avahi-bookmarks.1 avahi-discover.1
31
MANPAGES=	avahi-bookmarks.1
35
32
33
# See https://github.com/lathiat/avahi/issues/277
34
post-extract:
35
	${CP} ${FILESDIR}/build-db ${WRKSRC}/service-type-database
36
36
post-patch:
37
post-patch:
37
	@${REINPLACE_CMD} -e 's|@pkglibdir@|${DATADIR}|' \
38
	@${REINPLACE_CMD} -e 's|@pkglibdatadir@|${DATADIR}|' \
38
		${WRKSRC}/avahi-python/avahi/ServiceTypeDatabase.py.in
39
		${WRKSRC}/avahi-python/avahi/ServiceTypeDatabase.py.in
39
40
40
pre-build:
41
do-build:
41
	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
42
	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}
42
		Makefile ${MAKE_ARGS} clean
43
	@${DO_MAKE_BUILD} -C ${WRKSRC}/service-type-database
43
44
44
post-build:
45
do-install:
45
	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
46
	@(cd ${BUILD_WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} install-strip)
46
		${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET}
47
	@(cd ${WRKSRC}/service-type-database; ${MAKE_CMD} ${MAKE_ARGS} install)
47
48
48
post-install:
49
post-install:
49
	@cd ${WRKSRC}/service-type-database && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
50
		${MAKE_FLAGS} Makefile ${MAKE_ARGS} install
51
	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
50
	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
52
		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
51
		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
53
	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
52
	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
(-)py-avahi/pkg-plist (-6 lines)
Lines 1-8 Link Here
1
bin/avahi-bookmarks
1
bin/avahi-bookmarks
2
bin/avahi-discover
2
bin/avahi-discover
3
lib/avahi/service-types.db
3
lib/avahi/service-types.db
4
@comment Installed by avahi-app
5
@comment %%DATADIR%%/service-types
6
%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.py
4
%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.py
7
%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyc
5
%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyc
8
%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyo
6
%%PYTHON_SITELIBDIR%%/avahi/ServiceTypeDatabase.pyo
Lines 9-17 Link Here
9
%%PYTHON_SITELIBDIR%%/avahi/__init__.py
7
%%PYTHON_SITELIBDIR%%/avahi/__init__.py
10
%%PYTHON_SITELIBDIR%%/avahi/__init__.pyc
8
%%PYTHON_SITELIBDIR%%/avahi/__init__.pyc
11
%%PYTHON_SITELIBDIR%%/avahi/__init__.pyo
9
%%PYTHON_SITELIBDIR%%/avahi/__init__.pyo
12
%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.py
13
%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.pyc
14
%%PYTHON_SITELIBDIR%%/avahi_discover/__init__.pyo
15
man/man1/avahi-bookmarks.1.gz
10
man/man1/avahi-bookmarks.1.gz
16
man/man1/avahi-discover.1.gz
17
share/applications/avahi-discover.desktop
11
share/applications/avahi-discover.desktop

Return to bug 250354