diff --git a/0006-fix-QT3-build.patch b/0006-fix-QT3-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..6f846f6f5173916b205693eab24b8c04bcc5df4f --- /dev/null +++ b/0006-fix-QT3-build.patch @@ -0,0 +1,29 @@ +From 66a684b988052664669158819fc123469b714f50 Mon Sep 17 00:00:00 2001 +From: Rex Dieter +Date: Tue, 17 Nov 2020 16:42:00 -0600 +Subject: [PATCH 16/16] fix QT3 build + +recent commit d1e71b320d96d0f213ecb0885c8313039a09f693 adding QT5 +support added a new conditional +but failed to actually set the define. This commit adds that to +allow successful build when enabling QT3 support +--- + avahi-qt/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/avahi-qt/Makefile.am b/avahi-qt/Makefile.am +index 09ce7ca..b404810 100644 +--- a/avahi-qt/Makefile.am ++++ b/avahi-qt/Makefile.am +@@ -41,7 +41,7 @@ libavahi_qt3_la_SOURCES = \ + qt-watch.moc3: qt-watch.cpp + $(AM_V_GEN)$(MOC_QT3) $^ > $@ + +-libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS) ++libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) -DQT3 $(VISIBILITY_HIDDEN_CFLAGS) + libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS) + libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO) + endif +-- +2.28.0 + diff --git a/avahi.spec b/avahi.spec index 38db5c729f0a2b683d634e978ec65d5271e37ef4..e53f1c95311c4670d80692482cdec73571f0f29c 100644 --- a/avahi.spec +++ b/avahi.spec @@ -3,7 +3,7 @@ Name: avahi Version: 0.8 -Release: 21 +Release: 22 Summary: Avahi is a local network service discovery License: LGPL-2.1-or-later AND LGPL-2.0-or-later AND BSD-2-Clause-Views AND MIT URL: https://avahi.org @@ -16,6 +16,7 @@ Patch2: 0002-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK.patc Patch3: 0003-fix-requires-in-pc-file.patch Patch4: 0004-fix-bytestring-decoding-for-proper-display.patch Patch5: 0005-avahi_dns_packet_consume_uint32-fix-potential-undefi.patch +Patch6: 0006-fix-QT3-build.patch Patch6001: backport-CVE-2021-3468.patch Patch6002: backport-CVE-2021-36217.patch @@ -541,6 +542,9 @@ fi %{_mandir}/man?/* %changelog +* Mon Jan 6 2025 Jian Peng - 0.8-22 +- modifies the `Makefile.am` of the `avahi-qt` module + * Sun Aug 11 2024 Funda Wang - 0.8-21 - fix wrongly splitted tools and ui-tools - cleanup spec