commit: c5cba19e6c62c250b3ff6c75ee5c0967457c01d8 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Mon Mar 11 06:03:28 2019 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Mon Mar 11 06:03:46 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c5cba19e
dev-qt/qtspeech: improve patch avoiding build failure with no qtgui Bug: https://bugs.gentoo.org/679210 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> ...qtspeech-5.9.4-nogui.patch => qtspeech-5.12.1-nogui.patch} | 11 +++++++++++ dev-qt/qtspeech/qtspeech-5.12.9999.ebuild | 2 +- dev-qt/qtspeech/qtspeech-5.13.9999.ebuild | 2 +- dev-qt/qtspeech/qtspeech-5.9999.ebuild | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch b/dev-qt/qtspeech/files/qtspeech-5.12.1-nogui.patch similarity index 62% rename from dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch rename to dev-qt/qtspeech/files/qtspeech-5.12.1-nogui.patch index fa5d900a..7d0faa13 100644 --- a/dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch +++ b/dev-qt/qtspeech/files/qtspeech-5.12.1-nogui.patch @@ -1,4 +1,5 @@ Bug: https://bugs.gentoo.org/651012 +Bug: https://bugs.gentoo.org/679210 --- a/src/plugins/tts/speechdispatcher/speechdispatcher.pro +++ b/src/plugins/tts/speechdispatcher/speechdispatcher.pro @@ -10,3 +11,13 @@ Bug: https://bugs.gentoo.org/651012 CONFIG += link_pkgconfig packagesExist(speech-dispatcher): PKGCONFIG = speech-dispatcher +--- a/src/doc/doc.pro ++++ b/src/doc/doc.pro +@@ -2,6 +2,7 @@ + + CONFIG += force_qt + QT += core-private ++QT -= doc + + QMAKE_DOCS = $$PWD/qtspeech.qdocconf + diff --git a/dev-qt/qtspeech/qtspeech-5.12.9999.ebuild b/dev-qt/qtspeech/qtspeech-5.12.9999.ebuild index 753b1829..bcec3c2f 100644 --- a/dev-qt/qtspeech/qtspeech-5.12.9999.ebuild +++ b/dev-qt/qtspeech/qtspeech-5.12.9999.ebuild @@ -19,4 +19,4 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.12.1-nogui.patch" ) diff --git a/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild b/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild index 753b1829..bcec3c2f 100644 --- a/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild +++ b/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild @@ -19,4 +19,4 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.12.1-nogui.patch" ) diff --git a/dev-qt/qtspeech/qtspeech-5.9999.ebuild b/dev-qt/qtspeech/qtspeech-5.9999.ebuild index 753b1829..bcec3c2f 100644 --- a/dev-qt/qtspeech/qtspeech-5.9999.ebuild +++ b/dev-qt/qtspeech/qtspeech-5.9999.ebuild @@ -19,4 +19,4 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.12.1-nogui.patch" )
