| 1 |
commit: a154469e90074c7c027acc6ec75b000d24e6fdf1 |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 29 01:47:01 2020 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 29 01:50:02 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a154469e |
| 7 |
|
| 8 |
dev-qt/qtwebengine: [5.15] refactor configure options |
| 9 |
|
| 10 |
The options should now be more robust, and depend less on automagic. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
| 13 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 19 ++++++++----------- |
| 16 |
1 file changed, 8 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 19 |
index 69228a43..e6a01a7d 100644 |
| 20 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 21 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 22 |
@@ -89,10 +89,6 @@ src_prepare() { |
| 23 |
# bug 620444 - ensure local headers are used |
| 24 |
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
| 25 |
|
| 26 |
- # Disable 'qtpdf' for now to fix build. |
| 27 |
- sed -i -e 's|qtConfig(build-qtpdf)|false|g' \ |
| 28 |
- src/src.pro || die |
| 29 |
- |
| 30 |
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri |
| 31 |
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri |
| 32 |
|
| 33 |
@@ -109,14 +105,15 @@ src_configure() { |
| 34 |
|
| 35 |
local myqmakeargs=( |
| 36 |
-- |
| 37 |
- -opus |
| 38 |
+ -no-build-qtpdf |
| 39 |
-printing-and-pdf |
| 40 |
- -webp |
| 41 |
- $(usex alsa '-alsa' '') |
| 42 |
- $(usex bindist '' '-proprietary-codecs') |
| 43 |
- $(usex pulseaudio '-pulseaudio' '') |
| 44 |
- $(usex system-ffmpeg '-ffmpeg' '') |
| 45 |
- $(usex system-icu '-webengine-icu' '') |
| 46 |
+ -system-opus |
| 47 |
+ -system-webp |
| 48 |
+ $(usex alsa '-alsa' '-no-alsa') |
| 49 |
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') |
| 50 |
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') |
| 51 |
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') |
| 52 |
+ $(usex system-icu '-webengine-icu' '-no-webengine-icu') |
| 53 |
) |
| 54 |
qt5-build_src_configure |
| 55 |
} |
Archives