1 |
commit: 6fb2e5c74e72cc5399db9af4399fea79694cdb6f |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 6 13:54:09 2018 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 6 13:54:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6fb2e5c7 |
7 |
|
8 |
dev-qt/qtmultimedia: avoid adding unrequested CFLAGS |
9 |
|
10 |
Bug: https://bugs.gentoo.org/646756 |
11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
12 |
|
13 |
dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild | 5 ++++- |
14 |
dev-qt/qtmultimedia/qtmultimedia-5.10.9999.ebuild | 5 ++++- |
15 |
dev-qt/qtmultimedia/qtmultimedia-5.11.9999.ebuild | 3 +++ |
16 |
dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild | 5 ++++- |
17 |
dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 5 ++++- |
18 |
5 files changed, 19 insertions(+), 4 deletions(-) |
19 |
|
20 |
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild |
21 |
index d0626551..df0cf92c 100644 |
22 |
--- a/dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild |
23 |
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.10.0.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2017 Gentoo Foundation |
26 |
+# Copyright 1999-2018 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
EAPI=6 |
30 |
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND} |
31 |
" |
32 |
|
33 |
src_prepare() { |
34 |
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
35 |
+ src/multimedia/multimedia.pro || die |
36 |
+ |
37 |
qt_use_disable_config openal openal \ |
38 |
src/imports/imports.pro |
39 |
|
40 |
|
41 |
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.10.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.10.9999.ebuild |
42 |
index d0626551..df0cf92c 100644 |
43 |
--- a/dev-qt/qtmultimedia/qtmultimedia-5.10.9999.ebuild |
44 |
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.10.9999.ebuild |
45 |
@@ -1,4 +1,4 @@ |
46 |
-# Copyright 1999-2017 Gentoo Foundation |
47 |
+# Copyright 1999-2018 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
|
50 |
EAPI=6 |
51 |
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND} |
52 |
" |
53 |
|
54 |
src_prepare() { |
55 |
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
56 |
+ src/multimedia/multimedia.pro || die |
57 |
+ |
58 |
qt_use_disable_config openal openal \ |
59 |
src/imports/imports.pro |
60 |
|
61 |
|
62 |
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.9999.ebuild |
63 |
index a3c48dc0..df0cf92c 100644 |
64 |
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.9999.ebuild |
65 |
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.9999.ebuild |
66 |
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND} |
67 |
" |
68 |
|
69 |
src_prepare() { |
70 |
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
71 |
+ src/multimedia/multimedia.pro || die |
72 |
+ |
73 |
qt_use_disable_config openal openal \ |
74 |
src/imports/imports.pro |
75 |
|
76 |
|
77 |
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild |
78 |
index d0626551..df0cf92c 100644 |
79 |
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild |
80 |
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild |
81 |
@@ -1,4 +1,4 @@ |
82 |
-# Copyright 1999-2017 Gentoo Foundation |
83 |
+# Copyright 1999-2018 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
|
86 |
EAPI=6 |
87 |
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND} |
88 |
" |
89 |
|
90 |
src_prepare() { |
91 |
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
92 |
+ src/multimedia/multimedia.pro || die |
93 |
+ |
94 |
qt_use_disable_config openal openal \ |
95 |
src/imports/imports.pro |
96 |
|
97 |
|
98 |
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild |
99 |
index d0626551..df0cf92c 100644 |
100 |
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild |
101 |
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild |
102 |
@@ -1,4 +1,4 @@ |
103 |
-# Copyright 1999-2017 Gentoo Foundation |
104 |
+# Copyright 1999-2018 Gentoo Foundation |
105 |
# Distributed under the terms of the GNU General Public License v2 |
106 |
|
107 |
EAPI=6 |
108 |
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND} |
109 |
" |
110 |
|
111 |
src_prepare() { |
112 |
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \ |
113 |
+ src/multimedia/multimedia.pro || die |
114 |
+ |
115 |
qt_use_disable_config openal openal \ |
116 |
src/imports/imports.pro |