Attachment #386968 for bug #525884




libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
endif

if HAVE_QT5

avahiqt5includedir=$(includedir)/avahi-qt5
avahiqt5include_HEADERS = \
	qt-watch.h

lib_LTLIBRARIES += \
	libavahi-qt5.la

BUILT_SOURCES += qt-watch.moc5

libavahi_qt5_la_SOURCES = \
	qt-watch.cpp

qt-watch.moc5: qt-watch.cpp
	$(AM_V_GEN)$(MOC_QT5) $^ > $@

libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
libavahi_qt5_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT5_LIBS)
libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
endif

CLEANFILES = $(BUILT_SOURCES)




***/

#include <sys/time.h>
#if defined(QT5) || defined(QT4)
#include <QSocketNotifier>
#include <QObject>
#include <QTimer>
#else
#include <qsocketnotifier.h>
#include <qobject.h>

    m_callback(callback), m_userdata(userdata)
{
    connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout()));
#if defined(QT5) || defined(QT4)
    m_timer.setSingleShot(true);
#endif
    update(tv);

    m_timer.stop();
    if (tv) {
    AvahiUsec u = avahi_age(tv)/1000;
#if defined(QT5) || defined(QT4)
    m_timer.start( (u>0) ? 0 : -u);
#else
    m_timer.start( (u>0) ? 0 : -u,true);

    return &qt_poll;
}

#if defined(QT5)
#include "qt-watch.moc5"
#elif defined(QT4)
#include "qt-watch.moc4"
#elif defined(QT3)
#include "qt-watch.moc3"
#endif

Line 0 Link Here

(-)avahi-0.6.31/avahi-qt5.pc.in (+11 lines)
	1	prefix=@prefix@
	2	exec_prefix=${prefix}
	3	libdir=@libdir@
	4	includedir=${prefix}/include
	5
	6	Name: avahi-qt5
	7	Description: Avahi Multicast DNS Responder (QT5 Support)
	8	Version: @PACKAGE_VERSION@
	9	Requires.private: Qt5Core >= 5.0.0
	10	Libs: -L${libdir} -lavahi-qt5
	11	Cflags: -D_REENTRANT -I${includedir}




AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:4:0])
AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0])
AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0])
AC_SUBST(LIBAVAHI_QT5_VERSION_INFO, [1:2:0])
AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:4:1])

# Do not touch these, since they we took this version-info from upstream HOWL/Bonjour

AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes")

#
# Check for Qt 5
#
AC_ARG_ENABLE(qt5,
        AS_HELP_STRING([--disable-qt5],[Disable building of Qt5Core mainloop integration]),
        [case "${enableval}" in
                yes) HAVE_QT5=yes ;;
                no)  HAVE_QT5=no ;;
                *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt5) ;;
        esac],
        [HAVE_QT5=yes])

if test "x$HAVE_QT5" = "xyes" ; then
        PKG_CHECK_MODULES( QT5, [ Qt5Core >= 5.0.0 ])
        AC_SUBST(QT5_CFLAGS)
        AC_SUBST(QT5_LIBS)
	    QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`"
        AC_PATH_PROGS(MOC_QT5, [moc-qt5 moc], no, [$QT5_PREFIX])
        if test "$MOC_QT5" = no; then
            AC_MSG_ERROR([Could not find QT5 moc])
        fi
        AC_SUBST(MOC_QT5)
fi
AM_CONDITIONAL(HAVE_QT5, test "x$HAVE_QT5" = "xyes")

#
# Check for GTK+ 2.0
#
AC_ARG_ENABLE(gtk,

    Enable python-dbus:                        ${HAVE_PYTHON_DBUS}
    Enable QT3:                                ${HAVE_QT3}
    Enable QT4:                                ${HAVE_QT4}
    Enable QT5:                                ${HAVE_QT5}
    Enable Mono:                               ${HAVE_MONO}
    Enable Monodoc:                            ${HAVE_MONODOC}
    Distribution/OS:                           ${with_distro}

    Building avahi-discover-standalone: ${HAVE_GTK2OR3}
    Building libavahi-qt3:              ${HAVE_QT3}
    Building libavahi-qt4:              ${HAVE_QT4}
    Building libavahi-qt5:              ${HAVE_QT5}
    Building avahi-sharp:               ${HAVE_MONO}
    Building avahi-compat-libdns_sd:    ${ENABLE_COMPAT_LIBDNS_SD}
    Building avahi-compat-howl:         ${ENABLE_COMPAT_HOWL}

Lines 43-48 EXTRA_DIST = \ Link Here

(-)avahi-0.6.31/Makefile.am (+10 lines)
43	avahi-gobject.pc.in \	43	avahi-gobject.pc.in \
44	avahi-qt3.pc.in \	44	avahi-qt3.pc.in \
45	avahi-qt4.pc.in \	45	avahi-qt4.pc.in \
		46	avahi-qt5.pc.in \
46	avahi-sharp.pc.in \	47	avahi-sharp.pc.in \
47	avahi-ui-sharp.pc.in \	48	avahi-ui-sharp.pc.in \
48	avahi-compat-libdns_sd.pc.in \	49	avahi-compat-libdns_sd.pc.in \
Lines 101-106 if HAVE_QT4 Link Here
101	DX_INPUT += \	102	DX_INPUT += \
102	$(srcdir)/avahi-qt/qt-watch.h	103	$(srcdir)/avahi-qt/qt-watch.h
103	endif	104	endif
		105	if HAVE_QT5
		106	DX_INPUT += \
		107	$(srcdir)/avahi-qt/qt-watch.h
		108	endif
104	endif	109	endif
105		110
106	if HAVE_GLIB	111	if HAVE_GLIB
Lines 216-221 pkgconfig_DATA += avahi-qt4.pc Link Here
216	CLEANFILES += avahi-qt4.pc	221	CLEANFILES += avahi-qt4.pc
217	endif	222	endif
218		223
		224	if HAVE_QT5
		225	pkgconfig_DATA += avahi-qt5.pc
		226	CLEANFILES += avahi-qt5.pc
		227	endif
		228
219	CLEANFILES += avahi.devhelp	229	CLEANFILES += avahi.devhelp
220		230
221	avahi.devhelp: doxygen-run	231	avahi.devhelp: doxygen-run

Return to bug 525884

Lines 34-39 AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1: Link Here

(-)avahi-0.6.31/configure.ac (+28 lines)
34	AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:4:0])	34	AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:4:0])
35	AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0])	35	AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0])
36	AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0])	36	AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0])
		37	AC_SUBST(LIBAVAHI_QT5_VERSION_INFO, [1:2:0])
37	AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:4:1])	38	AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:4:1])
38		39
39	# Do not touch these, since they we took this version-info from upstream HOWL/Bonjour	40	# Do not touch these, since they we took this version-info from upstream HOWL/Bonjour
Lines 525-530 fi Link Here
525	AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes")	526	AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes")
526		527
527	#	528	#
		529	# Check for Qt 5
		530	#
		531	AC_ARG_ENABLE(qt5,
		532	AS_HELP_STRING([--disable-qt5],[Disable building of Qt5Core mainloop integration]),
		533	[case "${enableval}" in
		534	yes) HAVE_QT5=yes ;;
		535	no) HAVE_QT5=no ;;
		536	*) AC_MSG_ERROR(bad value ${enableval} for --enable-qt5) ;;
		537	esac],
		538	[HAVE_QT5=yes])
		539
		540	if test "x$HAVE_QT5" = "xyes" ; then
		541	PKG_CHECK_MODULES( QT5, [ Qt5Core >= 5.0.0 ])
		542	AC_SUBST(QT5_CFLAGS)
		543	AC_SUBST(QT5_LIBS)
		544	QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`"
		545	AC_PATH_PROGS(MOC_QT5, [moc-qt5 moc], no, [$QT5_PREFIX])
		546	if test "$MOC_QT5" = no; then
		547	AC_MSG_ERROR([Could not find QT5 moc])
		548	fi
		549	AC_SUBST(MOC_QT5)
		550	fi
		551	AM_CONDITIONAL(HAVE_QT5, test "x$HAVE_QT5" = "xyes")
		552
		553	#
528	# Check for GTK+ 2.0	554	# Check for GTK+ 2.0
529	#	555	#
530	AC_ARG_ENABLE(gtk,	556	AC_ARG_ENABLE(gtk,
Lines 1157-1162 echo " Link Here
1157	Enable python-dbus: ${HAVE_PYTHON_DBUS}	1183	Enable python-dbus: ${HAVE_PYTHON_DBUS}
1158	Enable QT3: ${HAVE_QT3}	1184	Enable QT3: ${HAVE_QT3}
1159	Enable QT4: ${HAVE_QT4}	1185	Enable QT4: ${HAVE_QT4}
		1186	Enable QT5: ${HAVE_QT5}
1160	Enable Mono: ${HAVE_MONO}	1187	Enable Mono: ${HAVE_MONO}
1161	Enable Monodoc: ${HAVE_MONODOC}	1188	Enable Monodoc: ${HAVE_MONODOC}
1162	Distribution/OS: ${with_distro}	1189	Distribution/OS: ${with_distro}
Lines 1226-1231 echo "\ Link Here
1226	Building avahi-discover-standalone: ${HAVE_GTK2OR3}	1253	Building avahi-discover-standalone: ${HAVE_GTK2OR3}
1227	Building libavahi-qt3: ${HAVE_QT3}	1254	Building libavahi-qt3: ${HAVE_QT3}
1228	Building libavahi-qt4: ${HAVE_QT4}	1255	Building libavahi-qt4: ${HAVE_QT4}
		1256	Building libavahi-qt5: ${HAVE_QT5}
1229	Building avahi-sharp: ${HAVE_MONO}	1257	Building avahi-sharp: ${HAVE_MONO}
1230	Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD}	1258	Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD}
1231	Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL}	1259	Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL}

Lines 65-68 libavahi_qt4_la_LIBADD = $(AM_LDADD) ../ Link Here

(-)avahi-0.6.31/avahi-qt/Makefile.am (+22 lines)
65	libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)	65	libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
66	endif	66	endif
67		67
		68	if HAVE_QT5
		69
		70	avahiqt5includedir=$(includedir)/avahi-qt5
		71	avahiqt5include_HEADERS = \
		72	qt-watch.h
		73
		74	lib_LTLIBRARIES += \
		75	libavahi-qt5.la
		76
		77	BUILT_SOURCES += qt-watch.moc5
		78
		79	libavahi_qt5_la_SOURCES = \
		80	qt-watch.cpp
		81
		82	qt-watch.moc5: qt-watch.cpp
		83	$(AM_V_GEN)$(MOC_QT5) $^ > $@
		84
		85	libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
		86	libavahi_qt5_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT5_LIBS)
		87	libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
		88	endif
		89
68	CLEANFILES = $(BUILT_SOURCES)	90	CLEANFILES = $(BUILT_SOURCES)

Lines 18-27 Link Here

(-)avahi-0.6.31/avahi-qt/qt-watch.cpp (-8 / +10 lines)
18	***/	18	***/
19		19
20	#include <sys/time.h>	20	#include <sys/time.h>
21	#ifdef QT4	21	#if defined(QT5) \|\| defined(QT4)
22	#include <Qt/qsocketnotifier.h>	22	#include <QSocketNotifier>
23	#include <Qt/qobject.h>	23	#include <QObject>
24	#include <Qt/qtimer.h>	24	#include <QTimer>
25	#else	25	#else
26	#include <qsocketnotifier.h>	26	#include <qsocketnotifier.h>
27	#include <qobject.h>	27	#include <qobject.h>
Lines 114-120 AvahiTimeout::AvahiTimeout(const struct Link Here
114	m_callback(callback), m_userdata(userdata)	114	m_callback(callback), m_userdata(userdata)
115	{	115	{
116	connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout()));	116	connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout()));
117	#ifdef QT4	117	#if defined(QT5) \|\| defined(QT4)
118	m_timer.setSingleShot(true);	118	m_timer.setSingleShot(true);
119	#endif	119	#endif
120	update(tv);	120	update(tv);
Lines 125-131 void AvahiTimeout::update(const struct t Link Here
125	m_timer.stop();	125	m_timer.stop();
126	if (tv) {	126	if (tv) {
127	AvahiUsec u = avahi_age(tv)/1000;	127	AvahiUsec u = avahi_age(tv)/1000;
128	#ifdef QT4	128	#if defined(QT5) \|\| defined(QT4)
129	m_timer.start( (u>0) ? 0 : -u);	129	m_timer.start( (u>0) ? 0 : -u);
130	#else	130	#else
131	m_timer.start( (u>0) ? 0 : -u,true);	131	m_timer.start( (u>0) ? 0 : -u,true);
Lines 191-198 const AvahiPoll* avahi_qt_poll_get(void) Link Here
191	return &qt_poll;	191	return &qt_poll;
192	}	192	}
193		193
194	#ifdef QT4	194	#if defined(QT5)
		195	#include "qt-watch.moc5"
		196	#elif defined(QT4)
195	#include "qt-watch.moc4"	197	#include "qt-watch.moc4"
196	#else	198	#elif defined(QT3)
197	#include "qt-watch.moc3"	199	#include "qt-watch.moc3"
198	#endif	200	#endif