diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-21 05:08:44 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-21 05:20:43 +0200 |
commit | 99a05593b06f88a0ad3ffe4ef308a2d3c495fa12 (patch) | |
tree | 6ff8a67c5a68ce3c7dc1de80944ff2cd9d72e4d9 /dev-qt/qtwebengine | |
parent | profiles: Mask Qt 5.11.0_beta4 for breaking consumers (diff) | |
download | gentoo-99a05593b06f88a0ad3ffe4ef308a2d3c495fa12.tar.gz gentoo-99a05593b06f88a0ad3ffe4ef308a2d3c495fa12.tar.bz2 gentoo-99a05593b06f88a0ad3ffe4ef308a2d3c495fa12.zip |
dev-qt: Add Qt 5.11.0_beta4, masked
Package-Manager: Portage-2.3.31, Repoman-2.3.9
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch | 102 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild | 128 |
3 files changed, 231 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index ef4d12003937..9a35a3521bae 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,3 +1,4 @@ +DIST qtwebengine-everywhere-src-5.11.0-beta4.tar.xz 233777616 BLAKE2B 7d96784f26e7b7d9423c10d9377b2466812140573cdc12a4c6839b4308fdf6f9a525833f94d26aabfbe124e7bdd474705bcfa5d4f4db7f3cd9408a82ba151182 SHA512 f91406ac4a9eccd84a01abd1aa07a12ad61a73f2a8acdbe925687df75016f9c1bdf038e65fa5c962f1f681ba13bf2f1833574611a03cfdca9b6b292511c77294 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a DIST qtwebengine-opensource-src-5.9.4.tar.xz 217337248 BLAKE2B 8a8c55dc08b06b07822fd53c780c1b7898516c8a7d021711f4ad5409630a131a90b1916c21d4e83e43dac773c4c73b4a1045baf96ed3c1d39f2d3d4c35c4a8c0 SHA512 c576e81cd9d202a4614c3eedd008bc41bd6212cd4d06e639469b843726be427f9e7a9551b3e604cbfee90f8dde22afb5bcd4905818ca65234e198078971d6ac9 DIST qtwebengine-opensource-src-5.9.5.tar.xz 216767300 BLAKE2B 9c05c808d18ed27833b48deaab1c0a6d12a7fa17288a522a8aa04c9b06746e9d69ba06467297369353979844e94efad354a124e28dae94d3128e853a8218e6d7 SHA512 74aa2a36ba5a56d0870f5269f93b54c036fccabf60d906b5b0f0db38afb8582d8794be4025ecea28e4c5b8c4c9beda345e3c2b2155e77bbedfe688308009de2a diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch new file mode 100644 index 000000000000..e5e3831236fe --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch @@ -0,0 +1,102 @@ +--- a/src/3tdparty/chromium/third_party/icu/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn +@@ -1153,6 +1153,8 @@ + "measunit.h", + "measure.h", + "msgfmt.h", ++ "nounit.h", ++ "numberformatter.h", + "numfmt.h", + "numsys.h", + "plurfmt.h", +@@ -1180,11 +1182,11 @@ + "tzrule.h", + "tztrans.h", + "ucal.h", +- "ucoleitr.h", + "ucol.h", ++ "ucoleitr.h", + "ucsdet.h", +- "udateintervalformat.h", + "udat.h", ++ "udateintervalformat.h", + "udatpg.h", + "ufieldpositer.h", + "uformattable.h", +@@ -1197,6 +1199,7 @@ + "upluralrules.h", + "uregex.h", + "uregion.h", ++ "ureldatefmt.h", + "usearch.h", + "uspoof.h", + "utmscale.h", +@@ -1216,13 +1219,16 @@ + "appendable.h", + "brkiter.h", + "bytestream.h", +- "bytestriebuilder.h", + "bytestrie.h", ++ "bytestriebuilder.h", + "caniter.h", ++ "casemap.h", ++ "char16ptr.h", + "chariter.h", + "dbbi.h", + "docmain.h", + "dtintrv.h", ++ "edits.h", + "enumset.h", + "errorcode.h", + "filteredbrk.h", +@@ -1245,23 +1251,26 @@ + "rep.h", + "resbund.h", + "schriter.h", ++ "simpleformatter.h", + "std_string.h", + "strenum.h", ++ "stringoptions.h", + "stringpiece.h", + "stringtriebuilder.h", + "symtable.h", + "ubidi.h", ++ "ubiditransform.h", + "ubrk.h", + "ucasemap.h", + "ucat.h", + "uchar.h", +- "ucharstriebuilder.h", + "ucharstrie.h", ++ "ucharstriebuilder.h", + "uchriter.h", + "uclean.h", ++ "ucnv.h", + "ucnv_cb.h", + "ucnv_err.h", +- "ucnv.h", + "ucnvsel.h", + "uconfig.h", + "ucurr.h", +@@ -1280,8 +1289,8 @@ + "unimatch.h", + "uniset.h", + "unistr.h", +- "unorm2.h", + "unorm.h", ++ "unorm2.h", + "uobject.h", + "urename.h", + "urep.h", +@@ -1294,10 +1303,10 @@ + "ustring.h", + "ustringtrie.h", + "utext.h", ++ "utf.h", + "utf16.h", + "utf32.h", + "utf8.h", +- "utf.h", + "utf_old.h", + "utrace.h", + "utypes.h", diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild new file mode 100644 index 000000000000..32064b192b08 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta4.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit multiprocessing pax-utils python-any-r1 qt5-build + +DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" + +RDEPEND=" + app-arch/snappy:= + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV} + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtprintsupport-${PV} + ~dev-qt/qtwebchannel-${PV}[qml] + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2[icu] + dev-libs/libxslt + dev-libs/protobuf:= + dev-libs/re2:= + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + media-libs/libjpeg-turbo:= + media-libs/libpng:0= + >=media-libs/libvpx-1.5:=[svc] + media-libs/libwebp:= + media-libs/mesa + media-libs/opus + net-libs/libsrtp:0= + sys-apps/dbus + sys-apps/pciutils + sys-libs/libcap + sys-libs/zlib[minizip] + virtual/libudev + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + alsa? ( media-libs/alsa-lib ) + geolocation? ( ~dev-qt/qtpositioning-${PV} ) + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( media-video/ffmpeg:0= ) + system-icu? ( dev-libs/icu:= ) + widgets? ( + ~dev-qt/qtdeclarative-${PV}[widgets] + ~dev-qt/qtwidgets-${PV} + ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=app-arch/gzip-1.7 + dev-util/gperf + dev-util/ninja + dev-util/re2c + sys-devel/bison + pax_kernel? ( sys-apps/elfix ) +" + +src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) + use system-icu && has_version ">=dev-libs/icu-59" && \ + PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch" ) + + # bug 620444 - ensure local headers are used + find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die + + qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri + + qt_use_disable_mod geolocation positioning \ + mkspecs/features/configure.prf \ + src/core/core_chromium.pri \ + src/core/core_common.pri + + qt_use_disable_mod widgets widgets src/src.pro + + qt5-build_src_prepare +} + +src_configure() { + export NINJA_PATH=/usr/bin/ninja + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + + local myqmakeargs=( + -- + -opus + -printing-and-pdf + -webp + $(usex alsa '-alsa' '') + $(usex bindist '' '-proprietary-codecs') + $(usex pulseaudio '-pulseaudio' '') + $(usex system-ffmpeg '-ffmpeg' '') + $(usex system-icu '-webengine-icu' '') + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # bug 601472 + if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then + die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" + fi + + pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess +} |