sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add avahi-qt5 which links against Qt5.

Browse source 
Patches where obtained from avahi upstream.

Reported by:	adridg@ (qt4 removal)
Obtained from:	avahi upstream
This commit is contained in:
Koop Mast 2018-12-22 21:22:56 +00:00
parent 772047379c
commit 60d9982cea
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=488134
15 changed files with 969 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/Makefile
View file

@ -44,6 +44,7 @@
SUBDIR += avahi-header
SUBDIR += avahi-libdns
SUBDIR += avahi-qt4
SUBDIR += avahi-qt5
SUBDIR += avahi-sharp
SUBDIR += axa
SUBDIR += babeld

9
net/avahi-app/Makefile
View file

@ -26,7 +26,7 @@ LIB_DEPENDS?= libexpat.so:textproc/expat2 \
USERS?= ${PORTNAME}
GROUPS?= ${USERS}
USES+= alias gettext gmake libtool pathfix pkgconfig
USES+= alias gettext gmake gnome libtool pathfix pkgconfig
USE_GNOME+= glib20 intltool introspection
USE_GNOME_SUBR= yes
USE_LDCONFIG= yes
@ -85,6 +85,13 @@ CONFIGURE_ARGS+=--enable-qt4 \
.else
CONFIGURE_ARGS+=--disable-qt4
.endif
.if ${AVAHI_SLAVE} == qt5
CONFIGURE_ARGS+=--enable-qt5 \
--disable-expat \
--disable-gdbm
.else
CONFIGURE_ARGS+=--disable-qt5
.endif
.if ${AVAHI_SLAVE} == sharp
CONFIGURE_ARGS+=--enable-mono
.else

43
net/avahi-app/files/Makefile.am Normal file
View file

@ -0,0 +1,43 @@
--- Makefile.am.orig 2017-07-10 12:14:59.083371116 +0200
+++ Makefile.am 2018-12-22 21:00:37.193294000 +0100
@@ -43,6 +43,7 @@
avahi-gobject.pc.in \
avahi-qt3.pc.in \
avahi-qt4.pc.in \
+ avahi-qt5.pc.in \
avahi-sharp.pc.in \
avahi-ui-sharp.pc.in \
avahi-compat-libdns_sd.pc.in \
@@ -101,7 +102,11 @@
DX_INPUT += \
$(srcdir)/avahi-qt/qt-watch.h
endif
+if HAVE_QT5
+DX_INPUT += \
+ $(srcdir)/avahi-qt/qt-watch.h
endif
+endif
if HAVE_GLIB
DX_INPUT += \
@@ -155,6 +160,8 @@
%.pc: %.pc.in
$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
-e 's,@libdir\@,$(libdir),g' \
+ -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
+ -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
-e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
@@ -214,6 +221,11 @@
if HAVE_QT4
pkgconfig_DATA += avahi-qt4.pc
CLEANFILES += avahi-qt4.pc
+endif
+
+if HAVE_QT5
+pkgconfig_DATA += avahi-qt5.pc
+CLEANFILES += avahi-qt5.pc
endif
CLEANFILES += avahi.devhelp

7
net/avahi-app/files/acinclude.m4 Normal file
View file

@ -0,0 +1,7 @@
--- acinclude.m4.orig 2017-07-10 12:14:59.083371116 +0200
+++ acinclude.m4 2018-12-22 20:56:34.849629000 +0100
@@ -1 +1,2 @@
-sinclude(common/doxygen.m4)
\ No newline at end of file
+sinclude(common/doxygen.m4)
+sincldue(common/qt5-pie.m4)

43
net/avahi-app/files/avahi-qt_Makefile.am Normal file
View file

@ -0,0 +1,43 @@
--- avahi-qt/Makefile.am.orig 2017-07-10 12:14:59.119370306 +0200
+++ avahi-qt/Makefile.am 2018-12-22 21:02:56.006641000 +0100
@@ -39,7 +39,7 @@
$(AM_V_GEN)$(MOC_QT3) $^ > $@
libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
-libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
+libavahi_qt3_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT3_LIBS)
libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
endif
@@ -61,8 +61,30 @@
$(AM_V_GEN)$(MOC_QT4) $^ > $@
libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
-libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
+libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
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) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
+libavahi_qt5_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT5_LIBS)
+libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
endif
CLEANFILES = $(BUILT_SOURCES)

59
net/avahi-app/files/configure.ac Normal file
View file

@ -0,0 +1,59 @@
--- configure.ac.orig 2018-12-22 21:11:52.861640000 +0100
+++ configure.ac 2018-12-22 21:11:58.730593000 +0100
@@ -34,6 +34,7 @@
AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:5: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
@@ -526,6 +527,32 @@
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_AVAHI_QT_ADD_PIC_IF_NEEDED
+ 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,
@@ -1158,6 +1185,7 @@
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}
@@ -1227,6 +1255,7 @@
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}

14
net/avahi-app/files/patch-avahi-qt5.pc.in Normal file
View file

@ -0,0 +1,14 @@
--- avahi-qt5.pc.in.orig 2018-12-22 20:56:34.850121000 +0100
+++ avahi-qt5.pc.in 2018-12-22 20:56:34.850280000 +0100
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=@libdir@
+includedir=${prefix}/include
+
+Name: avahi-qt5
+Description: Avahi Multicast DNS Responder (QT5 Support)
+Version: @PACKAGE_VERSION@
+Requires: Qt5Core >= 5.0.0
+Libs: -L${libdir} -lavahi-qt5
+Cflags: -D_REENTRANT -I${includedir}

367
net/avahi-app/files/patch-avahi-qt_Makefile.in
View file

@ -1,22 +1,170 @@
--- avahi-qt/Makefile.in.orig 2017-09-15 01:20:16 UTC
+++ avahi-qt/Makefile.in
@@ -117,7 +117,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
--- avahi-qt/Makefile.in.orig 2018-12-22 21:39:31.709598000 +0100
+++ avahi-qt/Makefile.in 2018-12-22 21:41:01.331208000 +0100
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -114,6 +114,10 @@
@HAVE_QT4_TRUE@ libavahi-qt4.la
@HAVE_QT4_TRUE@am__append_4 = qt-watch.moc4
+@HAVE_QT5_TRUE@am__append_5 = \
+@HAVE_QT5_TRUE@ libavahi-qt5.la
+
+@HAVE_QT5_TRUE@am__append_6 = qt-watch.moc5
subdir = avahi-qt
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
@@ -127,13 +131,14 @@
$(top_srcdir)/common/ltversion.m4 \
$(top_srcdir)/common/lt~obsolete.m4 \
$(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/common/qt5-pie.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am \
$(am__avahiqt3include_HEADERS_DIST) \
- $(am__avahiqt4include_HEADERS_DIST) $(am__DIST_COMMON)
+ $(am__avahiqt4include_HEADERS_DIST) \
+ $(am__avahiqt5include_HEADERS_DIST) $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -167,12 +172,11 @@
}
am__installdirs = "$(DESTDIR)$(libdir)" \
"$(DESTDIR)$(avahiqt3includedir)" \
- "$(DESTDIR)$(avahiqt4includedir)"
+ "$(DESTDIR)$(avahiqt4includedir)" \
+ "$(DESTDIR)$(avahiqt5includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = \
-@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = \
-@HAVE_QT3_TRUE@ ../avahi-common/libavahi-common.la \
@HAVE_QT3_TRUE@ $(am__DEPENDENCIES_1)
-@HAVE_QT3_TRUE@ $(am__DEPENDENCIES_1)
+@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp
@HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS = \
@@ -132,7 +131,6 @@ libavahi_qt3_la_LINK = $(LIBTOOL) $(AM_V
@HAVE_QT3_TRUE@ libavahi_qt3_la-qt-watch.lo
@@ -186,9 +190,7 @@
$(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt3_la_LDFLAGS) \
$(LDFLAGS) -o $@
@HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir)
@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = \
-@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = \
-@HAVE_QT4_TRUE@ ../avahi-common/libavahi-common.la \
@HAVE_QT4_TRUE@ $(am__DEPENDENCIES_1)
-@HAVE_QT4_TRUE@ $(am__DEPENDENCIES_1)
+@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp
@HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS = \
@@ -433,7 +431,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap
@HAVE_QT4_TRUE@ libavahi_qt4_la-qt-watch.lo
@@ -198,6 +200,16 @@
$(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt4_la_LDFLAGS) \
$(LDFLAGS) -o $@
@HAVE_QT4_TRUE@am_libavahi_qt4_la_rpath = -rpath $(libdir)
+@HAVE_QT5_TRUE@libavahi_qt5_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__libavahi_qt5_la_SOURCES_DIST = qt-watch.cpp
+@HAVE_QT5_TRUE@am_libavahi_qt5_la_OBJECTS = \
+@HAVE_QT5_TRUE@ libavahi_qt5_la-qt-watch.lo
+libavahi_qt5_la_OBJECTS = $(am_libavahi_qt5_la_OBJECTS)
+libavahi_qt5_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt5_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
+@HAVE_QT5_TRUE@am_libavahi_qt5_la_rpath = -rpath $(libdir)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -212,7 +224,10 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo \
+ ./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo \
+ ./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -232,9 +247,11 @@
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
-SOURCES = $(libavahi_qt3_la_SOURCES) $(libavahi_qt4_la_SOURCES)
+SOURCES = $(libavahi_qt3_la_SOURCES) $(libavahi_qt4_la_SOURCES) \
+ $(libavahi_qt5_la_SOURCES)
DIST_SOURCES = $(am__libavahi_qt3_la_SOURCES_DIST) \
- $(am__libavahi_qt4_la_SOURCES_DIST)
+ $(am__libavahi_qt4_la_SOURCES_DIST) \
+ $(am__libavahi_qt5_la_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -242,7 +259,9 @@
esac
am__avahiqt3include_HEADERS_DIST = qt-watch.h
am__avahiqt4include_HEADERS_DIST = qt-watch.h
-HEADERS = $(avahiqt3include_HEADERS) $(avahiqt4include_HEADERS)
+am__avahiqt5include_HEADERS_DIST = qt-watch.h
+HEADERS = $(avahiqt3include_HEADERS) $(avahiqt4include_HEADERS) \
+ $(avahiqt5include_HEADERS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -379,6 +398,7 @@
LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@
LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@
LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@
+LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@
LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@
LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@
LIBDAEMON_LIBS = @LIBDAEMON_LIBS@
@@ -397,6 +417,7 @@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOC_QT3 = @MOC_QT3@
MOC_QT4 = @MOC_QT4@
+MOC_QT5 = @MOC_QT5@
MONODOCER = @MONODOCER@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_DIR = @MONODOC_DIR@
@@ -439,6 +460,8 @@
QT3_LIBS = @QT3_LIBS@
QT4_CFLAGS = @QT4_CFLAGS@
QT4_LIBS = @QT4_LIBS@
+QT5_CFLAGS = @QT5_CFLAGS@
+QT5_LIBS = @QT5_LIBS@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -509,7 +532,6 @@
psdir = @psdir@
pyexecdir = @pyexecdir@
pythondir = @pythondir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -520,8 +542,8 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CFLAGS = -I$(top_srcdir)
-lib_LTLIBRARIES = $(am__append_1) $(am__append_3)
-BUILT_SOURCES = $(am__append_2) $(am__append_4)
+lib_LTLIBRARIES = $(am__append_1) $(am__append_3) $(am__append_5)
+BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__append_6)
@HAVE_QT3_TRUE@avahiqt3includedir = $(includedir)/avahi-qt3
@HAVE_QT3_TRUE@avahiqt3include_HEADERS = \
@HAVE_QT3_TRUE@ qt-watch.h
@@ -530,7 +552,7 @@
@HAVE_QT3_TRUE@ qt-watch.cpp
@HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
@ -25,12 +173,211 @@
@HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
@HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4
@HAVE_QT4_TRUE@avahiqt4include_HEADERS = \
@@ -443,7 +441,7 @@ BUILT_SOURCES = $(am__append_2) $(am__ap
@@ -540,8 +562,18 @@
@HAVE_QT4_TRUE@ qt-watch.cpp
@HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
-@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
+@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
@HAVE_QT4_TRUE@libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
+@HAVE_QT5_TRUE@avahiqt5includedir = $(includedir)/avahi-qt5
+@HAVE_QT5_TRUE@avahiqt5include_HEADERS = \
+@HAVE_QT5_TRUE@ qt-watch.h
+
+@HAVE_QT5_TRUE@libavahi_qt5_la_SOURCES = \
+@HAVE_QT5_TRUE@ qt-watch.cpp
+
+@HAVE_QT5_TRUE@libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
+@HAVE_QT5_TRUE@libavahi_qt5_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT5_LIBS)
+@HAVE_QT5_TRUE@libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
CLEANFILES = $(BUILT_SOURCES)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -565,8 +597,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -619,15 +651,25 @@
libavahi-qt4.la: $(libavahi_qt4_la_OBJECTS) $(libavahi_qt4_la_DEPENDENCIES) $(EXTRA_libavahi_qt4_la_DEPENDENCIES)
$(AM_V_CXXLD)$(libavahi_qt4_la_LINK) $(am_libavahi_qt4_la_rpath) $(libavahi_qt4_la_OBJECTS) $(libavahi_qt4_la_LIBADD) $(LIBS)
+libavahi-qt5.la: $(libavahi_qt5_la_OBJECTS) $(libavahi_qt5_la_DEPENDENCIES) $(EXTRA_libavahi_qt5_la_DEPENDENCIES)
+ $(AM_V_CXXLD)$(libavahi_qt5_la_LINK) $(am_libavahi_qt5_la_rpath) $(libavahi_qt5_la_OBJECTS) $(libavahi_qt5_la_LIBADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo@am__quote@ # am--include-marker
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -663,6 +705,13 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@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
+libavahi_qt5_la-qt-watch.lo: qt-watch.cpp
+@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
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libavahi_qt5_la-qt-watch.Tpo $(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qt-watch.cpp' object='libavahi_qt5_la-qt-watch.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@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
+
mostlyclean-libtool:
-rm -f *.lo
@@ -710,7 +759,28 @@
@list='$(avahiqt4include_HEADERS)'; test -n "$(avahiqt4includedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(avahiqt4includedir)'; $(am__uninstall_files_from_dir)
+install-avahiqt5includeHEADERS: $(avahiqt5include_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(avahiqt5include_HEADERS)'; test -n "$(avahiqt5includedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(avahiqt5includedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(avahiqt5includedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(avahiqt5includedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(avahiqt5includedir)" || exit $$?; \
+ done
+uninstall-avahiqt5includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(avahiqt5include_HEADERS)'; test -n "$(avahiqt5includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(avahiqt5includedir)'; $(am__uninstall_files_from_dir)
+
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
@@ -763,7 +833,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -798,7 +871,7 @@
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahiqt3includedir)" "$(DESTDIR)$(avahiqt4includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahiqt3includedir)" "$(DESTDIR)$(avahiqt4includedir)" "$(DESTDIR)$(avahiqt5includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -840,7 +913,9 @@
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo
+ -rm -f ./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo
+ -rm -f ./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -858,7 +933,7 @@
info-am:
install-data-am: install-avahiqt3includeHEADERS \
- install-avahiqt4includeHEADERS
+ install-avahiqt4includeHEADERS install-avahiqt5includeHEADERS
install-dvi: install-dvi-am
@@ -887,7 +962,9 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo
+ -rm -f ./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo
+ -rm -f ./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -905,26 +982,29 @@
ps-am:
uninstall-am: uninstall-avahiqt3includeHEADERS \
- uninstall-avahiqt4includeHEADERS uninstall-libLTLIBRARIES
+ uninstall-avahiqt4includeHEADERS \
+ uninstall-avahiqt5includeHEADERS uninstall-libLTLIBRARIES
.MAKE: all check install install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+ clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am \
install-avahiqt3includeHEADERS install-avahiqt4includeHEADERS \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-libLTLIBRARIES \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
- uninstall-am uninstall-avahiqt3includeHEADERS \
- uninstall-avahiqt4includeHEADERS uninstall-libLTLIBRARIES
+ install-avahiqt5includeHEADERS install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am \
+ uninstall-avahiqt3includeHEADERS \
+ uninstall-avahiqt4includeHEADERS \
+ uninstall-avahiqt5includeHEADERS uninstall-libLTLIBRARIES
.PRECIOUS: Makefile
@@ -934,6 +1014,9 @@
@HAVE_QT4_TRUE@qt-watch.moc4: qt-watch.cpp
@HAVE_QT4_TRUE@ $(AM_V_GEN)$(MOC_QT4) $^ > $@
+
+@HAVE_QT5_TRUE@qt-watch.moc5: qt-watch.cpp
+@HAVE_QT5_TRUE@ $(AM_V_GEN)$(MOC_QT5) $^ > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

48
net/avahi-app/files/patch-avahi-qt_qt-watch.cpp Normal file
View file

@ -0,0 +1,48 @@
--- avahi-qt/qt-watch.cpp.orig 2017-07-10 12:14:59.119370306 +0200
+++ avahi-qt/qt-watch.cpp 2018-12-22 20:56:34.850048000 +0100
@@ -18,10 +18,10 @@
***/
#include <sys/time.h>
-#ifdef QT4
-#include <Qt/qsocketnotifier.h>
-#include <Qt/qobject.h>
-#include <Qt/qtimer.h>
+#if defined(QT5) || defined(QT4)
+#include <QSocketNotifier>
+#include <QObject>
+#include <QTimer>
#else
#include <qsocketnotifier.h>
#include <qobject.h>
@@ -114,7 +114,7 @@
m_callback(callback), m_userdata(userdata)
{
connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout()));
-#ifdef QT4
+#if defined(QT5) || defined(QT4)
m_timer.setSingleShot(true);
#endif
update(tv);
@@ -125,7 +125,7 @@
m_timer.stop();
if (tv) {
AvahiUsec u = avahi_age(tv)/1000;
-#ifdef QT4
+#if defined(QT5) || defined(QT4)
m_timer.start( (u>0) ? 0 : -u);
#else
m_timer.start( (u>0) ? 0 : -u,true);
@@ -191,8 +191,10 @@
return &qt_poll;
}
-#ifdef QT4
+#if defined(QT5)
+#include "qt-watch.moc5"
+#elif defined(QT4)
#include "qt-watch.moc4"
-#else
+#elif defined(QT3)
#include "qt-watch.moc3"
#endif

30
net/avahi-app/files/patch-common_qt5-pie.m4 Normal file
View file

@ -0,0 +1,30 @@
--- common/qt5-pie.m4.orig 2018-12-22 20:56:34.850352000 +0100
+++ common/qt5-pie.m4 2018-12-22 20:56:34.850515000 +0100
@@ -0,0 +1,27 @@
+AC_DEFUN([AC_AVAHI_QT_ADD_PIC_IF_NEEDED],
+[
+ AC_LANG_PUSH([C++])
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $QT5_CFLAGS"
+ AC_MSG_CHECKING([whether Qt works without -fPIC])
+ AC_PREPROC_IFELSE(
+ [AC_LANG_SOURCE([[#include <QtCore>]])],
+ [AC_MSG_RESULT(yes)],
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([whether Qt works with -fPIC])
+ CPPFLAGS="$CPPFLAGS -fPIC"
+ AC_PREPROC_IFELSE(
+ [AC_LANG_SOURCE([[#include <QtCore>]])],
+ [
+ AC_MSG_RESULT(yes)
+ QT5_CFLAGS="$QT5_CFLAGS -fPIC"
+ ],
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(Couldn't compile Qt without -fPIC nor with -fPIC)
+ ])
+ ])
+ CPPFLAGS="$save_CPPFLAGS"
+ AC_LANG_POP([C++])
+])

342
net/avahi-app/files/patch-configure
View file

@ -1,18 +1,324 @@
--- configure.orig 2012-02-14 22:36:33 UTC
+++ configure
@@ -16895,6 +16895,7 @@ $as_echo_n "checking whether to check fo
check_inconsistencies=yes
case "${host_cpu}-${host_os}" in
*-darwin*) check_inconsistencies=no ;;
+ *-freebsd*) check_inconsistencies=no ;;
esac
if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -18460,6 +18461,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
+#include <sys/socket.h>
int
main ()
{
--- configure.orig 2018-12-22 21:11:56.328592000 +0100
+++ configure 2018-12-22 21:12:12.121977000 +0100
@@ -763,6 +763,11 @@
HAVE_GTK_TRUE
GTK20_LIBS
GTK20_CFLAGS
+HAVE_QT5_FALSE
+HAVE_QT5_TRUE
+MOC_QT5
+QT5_LIBS
+QT5_CFLAGS
HAVE_QT4_FALSE
HAVE_QT4_TRUE
MOC_QT4
@@ -948,6 +953,7 @@
LIBAVAHI_COMPAT_HOWL_VERSION_INFO
LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO
LIBAVAHI_UI_VERSION_INFO
+LIBAVAHI_QT5_VERSION_INFO
LIBAVAHI_QT4_VERSION_INFO
LIBAVAHI_QT3_VERSION_INFO
LIBAVAHI_GOBJECT_VERSION_INFO
@@ -1042,6 +1048,7 @@
enable_introspection
enable_qt3
enable_qt4
+enable_qt5
enable_gtk
enable_gtk3
enable_dbus
@@ -1105,6 +1112,8 @@
QT3_LIBS
QT4_CFLAGS
QT4_LIBS
+QT5_CFLAGS
+QT5_LIBS
GTK20_CFLAGS
GTK20_LIBS
GTK30_CFLAGS
@@ -1757,6 +1766,7 @@
Enable introspection for this build
--disable-qt3 Disable building of Qt3 mainloop integration
--disable-qt4 Disable building of Qt4Core mainloop integration
+ --disable-qt5 Disable building of Qt5Core mainloop integration
--disable-gtk Disable use of GTK+ 2
--disable-gtk3 Disable use of GTK+ 3
--disable-dbus Disable use of D-Bus
@@ -1854,6 +1864,8 @@
QT3_LIBS linker flags for QT3, overriding pkg-config
QT4_CFLAGS C compiler flags for QT4, overriding pkg-config
QT4_LIBS linker flags for QT4, overriding pkg-config
+ QT5_CFLAGS C compiler flags for QT5, overriding pkg-config
+ QT5_LIBS linker flags for QT5, overriding pkg-config
GTK20_CFLAGS
C compiler flags for GTK20, overriding pkg-config
GTK20_LIBS linker flags for GTK20, overriding pkg-config
@@ -3597,6 +3609,8 @@
LIBAVAHI_QT4_VERSION_INFO=1:2:0
+LIBAVAHI_QT5_VERSION_INFO=1:2:0
+
LIBAVAHI_UI_VERSION_INFO=1:4:1
@@ -21586,6 +21600,231 @@
#
+# Check for Qt 5
+#
+# Check whether --enable-qt5 was given.
+if test "${enable_qt5+set}" = set; then :
+ enableval=$enable_qt5; case "${enableval}" in
+ yes) HAVE_QT5=yes ;;
+ no) HAVE_QT5=no ;;
+ *) as_fn_error $? "bad value ${enableval} for --enable-qt5" "$LINENO" 5 ;;
+ esac
+else
+ HAVE_QT5=yes
+fi
+
+
+if test "x$HAVE_QT5" = "xyes" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5
+$as_echo_n "checking for QT5... " >&6; }
+
+if test -n "$QT5_CFLAGS"; then
+ pkg_cv_QT5_CFLAGS="$QT5_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" Qt5Core >= 5.0.0 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " Qt5Core >= 5.0.0 ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QT5_CFLAGS=`$PKG_CONFIG --cflags " Qt5Core >= 5.0.0 " 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$QT5_LIBS"; then
+ pkg_cv_QT5_LIBS="$QT5_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" Qt5Core >= 5.0.0 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " Qt5Core >= 5.0.0 ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QT5_LIBS=`$PKG_CONFIG --libs " Qt5Core >= 5.0.0 " 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " Qt5Core >= 5.0.0 " 2>&1`
+ else
+ QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " Qt5Core >= 5.0.0 " 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$QT5_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements ( Qt5Core >= 5.0.0 ) were not met:
+
+$QT5_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables QT5_CFLAGS
+and QT5_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables QT5_CFLAGS
+and QT5_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ QT5_CFLAGS=$pkg_cv_QT5_CFLAGS
+ QT5_LIBS=$pkg_cv_QT5_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $QT5_CFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt works without -fPIC" >&5
+$as_echo_n "checking whether Qt works without -fPIC... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <QtCore>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt works with -fPIC" >&5
+$as_echo_n "checking whether Qt works with -fPIC... " >&6; }
+ CPPFLAGS="$CPPFLAGS -fPIC"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <QtCore>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ QT5_CFLAGS="$QT5_CFLAGS -fPIC"
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "Couldn't compile Qt without -fPIC nor with -fPIC" "$LINENO" 5
+
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+ CPPFLAGS="$save_CPPFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`"
+ for ac_prog in moc-qt5 moc
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MOC_QT5+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MOC_QT5 in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MOC_QT5="$MOC_QT5" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $QT5_PREFIX
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MOC_QT5="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+MOC_QT5=$ac_cv_path_MOC_QT5
+if test -n "$MOC_QT5"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC_QT5" >&5
+$as_echo "$MOC_QT5" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$MOC_QT5" && break
+done
+test -n "$MOC_QT5" || MOC_QT5="no"
+
+ if test "$MOC_QT5" = no; then
+ as_fn_error $? "Could not find QT5 moc" "$LINENO" 5
+ fi
+
+fi
+ if test "x$HAVE_QT5" = "xyes"; then
+ HAVE_QT5_TRUE=
+ HAVE_QT5_FALSE='#'
+else
+ HAVE_QT5_TRUE='#'
+ HAVE_QT5_FALSE=
+fi
+
+
+#
# Check for GTK+ 2.0
#
# Check whether --enable-gtk was given.
@@ -25878,6 +26117,10 @@
as_fn_error $? "conditional \"HAVE_QT4\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_QT5_TRUE}" && test -z "${HAVE_QT5_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_QT5\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then
as_fn_error $? "conditional \"HAVE_GTK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28556,6 +28799,7 @@
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}
@@ -28625,6 +28869,7 @@
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}

24
net/avahi-qt5/Makefile Normal file
View file

@ -0,0 +1,24 @@
# Created by: Michael Johnson <ahze@FreeBSD.org
# $FreeBSD$
PORTREVISION= 0
CATEGORIES= net
PKGNAMESUFFIX= -qt5
MAINTAINER= gnome@FreeBSD.org
COMMENT= Qt 5 bindings to the Avahi mDNS system
LIB_DEPENDS= libavahi-common.so:net/avahi-app
MASTERDIR= ${.CURDIR}/../avahi-app
BUILD_WRKSRC= ${WRKSRC}/avahi-qt
INSTALL_WRKSRC= ${BUILD_WRKSRC}
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
AVAHI_SLAVE= qt5
USES= qt:5
USE_QT= core buildtools_build
AVAHI_PKGCONFIG=avahi-qt5.pc
.include "${MASTERDIR}/Makefile"

3
net/avahi-qt5/pkg-descr Normal file
View file

@ -0,0 +1,3 @@
Qt 4 bindings to the avahi mDNS service discovery system.
WWW: http://www.avahi.org/

6
net/avahi-qt5/pkg-plist Normal file
View file

@ -0,0 +1,6 @@
include/avahi-qt5/qt-watch.h
lib/libavahi-qt5.a
lib/libavahi-qt5.so
lib/libavahi-qt5.so.1
lib/libavahi-qt5.so.1.0.2
libdata/pkgconfig/avahi-qt5.pc

3
net/avahi/Makefile
View file

@ -14,7 +14,7 @@ RUN_DEPENDS= avahi-app>=0.7:net/avahi-app
USES= metaport
OPTIONS_DEFINE= AUTOIPD GTK MONO QT4 PYTHON
OPTIONS_DEFINE= AUTOIPD GTK MONO QT4 QT5 PYTHON
OPTIONS_DEFAULT=AUTOIPD GTK
AUTOIPD_DESC= IPv4LL network address configuration daemon
GTK_DESC= Gtk+ tools and bindings
@ -25,6 +25,7 @@ GTK_RUN_DEPENDS= avahi-discover-standalone:net/avahi-gtk
#LIBDNS_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:net/avahi-libdns
MONO_RUN_DEPENDS= ${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:net/avahi-sharp
QT4_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:net/avahi-qt4
QT5_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/avahi-qt5.pc:net/avahi-qt5
PYTHON_RUN_DEPENDS= avahi-bookmarks:net/py-avahi
.include <bsd.port.mk>