commit: f97f8e63b790fb4507a613a6ca5d0c35392fe243 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 11 22:26:56 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 11 22:31:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97f8e63
net-dns/avahi: Don't call moc directly Closes: https://bugs.gentoo.org/587830 Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-dns/avahi/avahi-0.6.32-r2.ebuild | 5 ++++- net-dns/avahi/avahi-0.7.ebuild | 5 ++++- net-dns/avahi/files/avahi-0.6.32-mocqt4.patch | 12 ++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/net-dns/avahi/avahi-0.6.32-r2.ebuild b/net-dns/avahi/avahi-0.6.32-r2.ebuild index 92aba59f400..876f83bcf2d 100644 --- a/net-dns/avahi/avahi-0.6.32-r2.ebuild +++ b/net-dns/avahi/avahi-0.6.32-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -112,6 +112,9 @@ src_prepare() { # Update the init scripts for the new openrc, bug #594622 epatch "${FILESDIR}"/${PN}-0.6.32-openrc-0.21.7-fix-init-scripts.patch + # Don't pick up wrong moc based on qtchooser default, bug #587830 + epatch "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch + # Bug #525832 epatch_user diff --git a/net-dns/avahi/avahi-0.7.ebuild b/net-dns/avahi/avahi-0.7.ebuild index d77bb4af9a0..bfb9882d472 100644 --- a/net-dns/avahi/avahi-0.7.ebuild +++ b/net-dns/avahi/avahi-0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -96,6 +96,9 @@ src_prepare() { -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ doxygen_to_devhelp.xsl || die + # Don't pick up wrong moc based on qtchooser default, bug #587830 + eapply "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch + eapply_user # Prevent .pyc files in DESTDIR diff --git a/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch b/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch new file mode 100644 index 00000000000..bba25e97163 --- /dev/null +++ b/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch @@ -0,0 +1,12 @@ +--- a/configure.ac 2018-01-11 23:00:47.503309612 +0100 ++++ b/configure.ac 2018-01-11 23:10:04.373295395 +0100 +@@ -516,8 +516,7 @@ + PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ]) + AC_SUBST(QT4_CFLAGS) + AC_SUBST(QT4_LIBS) +- QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin" +- AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [$QT4_PREFIX]) ++ MOC_QT4="`$PKG_CONFIG --variable=moc_location QtCore`" + if test "$MOC_QT4" = no; then + AC_MSG_ERROR([Could not find QT4 moc]) + fi
