| 1 |
commit: c07a5bbe41a3df3edfe45c161686839c124d10c7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 29 08:41:11 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 2 00:40:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c07a5bbe |
| 7 |
|
| 8 |
dev-qt/qtwebengine: Relax minimum dev-qt/* version (set to 5.15.2) |
| 9 |
|
| 10 |
Also sync with qtwebengine-5.15.2 ppc64 changes in Gentoo ebuild repo. |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-qt/qtwebengine/Manifest | 2 +- |
| 16 |
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 43 ++++++++++++++++--------- |
| 17 |
2 files changed, 29 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest |
| 20 |
index 817d5c10..e93d7c47 100644 |
| 21 |
--- a/dev-qt/qtwebengine/Manifest |
| 22 |
+++ b/dev-qt/qtwebengine/Manifest |
| 23 |
@@ -1 +1 @@ |
| 24 |
-DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b |
| 25 |
+DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc |
| 26 |
|
| 27 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 28 |
index e50ee0c8..01d4c802 100644 |
| 29 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 30 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
| 31 |
@@ -4,12 +4,13 @@ |
| 32 |
EAPI=7 |
| 33 |
|
| 34 |
PYTHON_COMPAT=( python2_7 ) |
| 35 |
+QTMIN=5.15.2 |
| 36 |
inherit multiprocessing python-any-r1 qt5-build |
| 37 |
|
| 38 |
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
| 39 |
|
| 40 |
# patchset based on https://github.com/chromium-ppc64le releases |
| 41 |
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )" |
| 42 |
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )" |
| 43 |
|
| 44 |
if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 45 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
| 46 |
@@ -23,17 +24,17 @@ RDEPEND=" |
| 47 |
dev-libs/glib:2 |
| 48 |
dev-libs/nspr |
| 49 |
dev-libs/nss |
| 50 |
- ~dev-qt/qtcore-${PV} |
| 51 |
- ~dev-qt/qtdeclarative-${PV} |
| 52 |
- ~dev-qt/qtgui-${PV} |
| 53 |
- ~dev-qt/qtnetwork-${PV} |
| 54 |
- ~dev-qt/qtprintsupport-${PV} |
| 55 |
- ~dev-qt/qtwebchannel-${PV}[qml] |
| 56 |
dev-libs/expat |
| 57 |
dev-libs/libevent:= |
| 58 |
dev-libs/libxml2[icu] |
| 59 |
dev-libs/libxslt |
| 60 |
dev-libs/re2:= |
| 61 |
+ >=dev-qt/qtcore-${QTMIN}:5 |
| 62 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
| 63 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
| 64 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
| 65 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
| 66 |
+ >=dev-qt/qtwebchannel-${QTMIN}:5[qml] |
| 67 |
media-libs/fontconfig |
| 68 |
media-libs/freetype |
| 69 |
media-libs/harfbuzz:= |
| 70 |
@@ -61,15 +62,15 @@ RDEPEND=" |
| 71 |
x11-libs/libXScrnSaver |
| 72 |
x11-libs/libXtst |
| 73 |
alsa? ( media-libs/alsa-lib ) |
| 74 |
- designer? ( ~dev-qt/designer-${PV} ) |
| 75 |
- geolocation? ( ~dev-qt/qtpositioning-${PV} ) |
| 76 |
+ designer? ( >=dev-qt/designer-${QTMIN}:5 ) |
| 77 |
+ geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 ) |
| 78 |
kerberos? ( virtual/krb5 ) |
| 79 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 80 |
system-ffmpeg? ( media-video/ffmpeg:0= ) |
| 81 |
system-icu? ( >=dev-libs/icu-60.2:= ) |
| 82 |
widgets? ( |
| 83 |
- ~dev-qt/qtdeclarative-${PV}[widgets] |
| 84 |
- ~dev-qt/qtwidgets-${PV} |
| 85 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] |
| 86 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
| 87 |
) |
| 88 |
" |
| 89 |
DEPEND="${RDEPEND} |
| 90 |
@@ -85,10 +86,6 @@ DEPEND="${RDEPEND} |
| 91 |
PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446 |
| 92 |
|
| 93 |
src_prepare() { |
| 94 |
- if use ppc64; then |
| 95 |
- eapply "${WORKDIR}/${PN}-ppc64" |
| 96 |
- fi |
| 97 |
- |
| 98 |
if ! use jumbo-build; then |
| 99 |
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
| 100 |
src/buildtools/config/common.pri || die |
| 101 |
@@ -123,6 +120,22 @@ src_prepare() { |
| 102 |
qt_use_disable_mod widgets widgets src/src.pro |
| 103 |
|
| 104 |
qt5-build_src_prepare |
| 105 |
+ |
| 106 |
+ # we need to generate ppc64 stuff because upstream does not ship it yet |
| 107 |
+ if use ppc64; then |
| 108 |
+ einfo "Patching for ppc64le and generating build files" |
| 109 |
+ eapply "${WORKDIR}/${PN}-ppc64" |
| 110 |
+ pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die |
| 111 |
+ mkdir -vp source/config/linux/ppc64 || die |
| 112 |
+ mkdir -p source/libvpx/test || die |
| 113 |
+ touch source/libvpx/test/test.mk || die |
| 114 |
+ # generate_gni.sh runs git at the end of process, prevent it. |
| 115 |
+ git() { : ; } |
| 116 |
+ export -f git |
| 117 |
+ ./generate_gni.sh || die |
| 118 |
+ unset git |
| 119 |
+ popd >/dev/null || die |
| 120 |
+ fi |
| 121 |
} |
| 122 |
|
| 123 |
src_configure() { |
Archives