Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtspeech/files/, dev-qt/qtspeech/
Date: Mon, 11 Mar 2019 06:04:06
Message-Id: 1552284226.c5cba19e6c62c250b3ff6c75ee5c0967457c01d8.kensington@gentoo
1 commit: c5cba19e6c62c250b3ff6c75ee5c0967457c01d8
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 11 06:03:28 2019 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 11 06:03:46 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c5cba19e
7
8 dev-qt/qtspeech: improve patch avoiding build failure with no qtgui
9
10 Bug: https://bugs.gentoo.org/679210
11 Package-Manager: Portage-2.3.51, Repoman-2.3.12
12 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
13
14 ...qtspeech-5.9.4-nogui.patch => qtspeech-5.12.1-nogui.patch} | 11 +++++++++++
15 dev-qt/qtspeech/qtspeech-5.12.9999.ebuild | 2 +-
16 dev-qt/qtspeech/qtspeech-5.13.9999.ebuild | 2 +-
17 dev-qt/qtspeech/qtspeech-5.9999.ebuild | 2 +-
18 4 files changed, 14 insertions(+), 3 deletions(-)
19
20 diff --git a/dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch b/dev-qt/qtspeech/files/qtspeech-5.12.1-nogui.patch
21 similarity index 62%
22 rename from dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch
23 rename to dev-qt/qtspeech/files/qtspeech-5.12.1-nogui.patch
24 index fa5d900a..7d0faa13 100644
25 --- a/dev-qt/qtspeech/files/qtspeech-5.9.4-nogui.patch
26 +++ b/dev-qt/qtspeech/files/qtspeech-5.12.1-nogui.patch
27 @@ -1,4 +1,5 @@
28 Bug: https://bugs.gentoo.org/651012
29 +Bug: https://bugs.gentoo.org/679210
30
31 --- a/src/plugins/tts/speechdispatcher/speechdispatcher.pro
32 +++ b/src/plugins/tts/speechdispatcher/speechdispatcher.pro
33 @@ -10,3 +11,13 @@ Bug: https://bugs.gentoo.org/651012
34
35 CONFIG += link_pkgconfig
36 packagesExist(speech-dispatcher): PKGCONFIG = speech-dispatcher
37 +--- a/src/doc/doc.pro
38 ++++ b/src/doc/doc.pro
39 +@@ -2,6 +2,7 @@
40 +
41 + CONFIG += force_qt
42 + QT += core-private
43 ++QT -= doc
44 +
45 + QMAKE_DOCS = $$PWD/qtspeech.qdocconf
46 +
47
48 diff --git a/dev-qt/qtspeech/qtspeech-5.12.9999.ebuild b/dev-qt/qtspeech/qtspeech-5.12.9999.ebuild
49 index 753b1829..bcec3c2f 100644
50 --- a/dev-qt/qtspeech/qtspeech-5.12.9999.ebuild
51 +++ b/dev-qt/qtspeech/qtspeech-5.12.9999.ebuild
52 @@ -19,4 +19,4 @@ RDEPEND="
53 "
54 DEPEND="${RDEPEND}"
55
56 -PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" )
57 +PATCHES=( "${FILESDIR}/${PN}-5.12.1-nogui.patch" )
58
59 diff --git a/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild b/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild
60 index 753b1829..bcec3c2f 100644
61 --- a/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild
62 +++ b/dev-qt/qtspeech/qtspeech-5.13.9999.ebuild
63 @@ -19,4 +19,4 @@ RDEPEND="
64 "
65 DEPEND="${RDEPEND}"
66
67 -PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" )
68 +PATCHES=( "${FILESDIR}/${PN}-5.12.1-nogui.patch" )
69
70 diff --git a/dev-qt/qtspeech/qtspeech-5.9999.ebuild b/dev-qt/qtspeech/qtspeech-5.9999.ebuild
71 index 753b1829..bcec3c2f 100644
72 --- a/dev-qt/qtspeech/qtspeech-5.9999.ebuild
73 +++ b/dev-qt/qtspeech/qtspeech-5.9999.ebuild
74 @@ -19,4 +19,4 @@ RDEPEND="
75 "
76 DEPEND="${RDEPEND}"
77
78 -PATCHES=( "${FILESDIR}/${PN}-5.9.4-nogui.patch" )
79 +PATCHES=( "${FILESDIR}/${PN}-5.12.1-nogui.patch" )