Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
Date: Sun, 07 Feb 2021 13:43:04
Message-Id: 1612705362.cc0a474c200facc581ddffb33b3652c1ca85375e.asturm@gentoo
1 commit: cc0a474c200facc581ddffb33b3652c1ca85375e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 7 13:05:38 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 7 13:42:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0a474c
7
8 dev-qt/qtwebengine: Drop 5.15.2_p20210126 snapshot
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-qt/qtwebengine/Manifest | 1 -
14 .../qtwebengine-5.15.2_p20210126.ebuild | 183 ---------------------
15 2 files changed, 184 deletions(-)
16
17 diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
18 index 928d6ee9870..8e7d67bb1e8 100644
19 --- a/dev-qt/qtwebengine/Manifest
20 +++ b/dev-qt/qtwebengine/Manifest
21 @@ -1,4 +1,3 @@
22 DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
23 -DIST qtwebengine-5.15.2_p20210126.tar.xz 316160016 BLAKE2B 8de7b37585a040673d200de3149bfb878cd3d6d71e5b5343960022b1ca111364b2d351b1ca4cf760d9de46d4b247f2a7638c5d217210ad3f1d416b703d70d4a9 SHA512 448ca09609150756c64b05dd48178445fda7eb935e8cfa4bb30a1cc520de50939e5e85c2b6a60cff40147849a7b19b48a15d1eb923aeca969779482060c44a77
24 DIST qtwebengine-5.15.2_p20210205.tar.xz 317422912 BLAKE2B a5cdbea0347db21b7fb981a358ad6419ea9cebef98f3d8fef3618b9010164986257cb87caef6a09648e463c3b864ce28e0591a2a783b8b5727b69d85b4b3289c SHA512 8e8b4918f7c3232aafd9f2d13655501e0d03d90514ef3a0b8319df1c8792aeaf7800f370cee15634c708ee14f86ef831749556cb6710578d03c3c2e468149be0
25 DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
26
27 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild
28 deleted file mode 100644
29 index c064f099c1a..00000000000
30 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild
31 +++ /dev/null
32 @@ -1,183 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -PYTHON_COMPAT=( python2_7 )
39 -QTVER=$(ver_cut 1-3)
40 -inherit multiprocessing python-any-r1 qt5-build
41 -
42 -DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
43 -
44 -if [[ ${QT5_BUILD_TYPE} == release ]]; then
45 -# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
46 - if [[ ${PV} == ${QTVER}_p* ]]; then
47 - SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
48 - S="${WORKDIR}/${P}"
49 - fi
50 -fi
51 -
52 -# patchset based on https://github.com/chromium-ppc64le releases
53 -SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
54 -
55 -IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +system-icu widgets"
56 -REQUIRED_USE="designer? ( widgets )"
57 -
58 -RDEPEND="
59 - app-arch/snappy:=
60 - dev-libs/glib:2
61 - dev-libs/nspr
62 - dev-libs/nss
63 - dev-libs/expat
64 - dev-libs/libevent:=
65 - dev-libs/libxml2[icu]
66 - dev-libs/libxslt
67 - dev-libs/re2:=
68 - ~dev-qt/qtcore-${QTVER}
69 - ~dev-qt/qtdeclarative-${QTVER}
70 - ~dev-qt/qtgui-${QTVER}
71 - ~dev-qt/qtnetwork-${QTVER}
72 - ~dev-qt/qtprintsupport-${QTVER}
73 - ~dev-qt/qtwebchannel-${QTVER}[qml]
74 - media-libs/fontconfig
75 - media-libs/freetype
76 - media-libs/harfbuzz:=
77 - media-libs/lcms:2
78 - media-libs/libjpeg-turbo:=
79 - media-libs/libpng:0=
80 - >=media-libs/libvpx-1.5:=[svc(+)]
81 - media-libs/libwebp:=
82 - media-libs/mesa[egl,X(+)]
83 - media-libs/opus
84 - sys-apps/dbus
85 - sys-apps/pciutils
86 - sys-libs/zlib[minizip]
87 - virtual/libudev
88 - x11-libs/libdrm
89 - x11-libs/libX11
90 - x11-libs/libXcomposite
91 - x11-libs/libXcursor
92 - x11-libs/libXdamage
93 - x11-libs/libXext
94 - x11-libs/libXfixes
95 - x11-libs/libXi
96 - x11-libs/libXrandr
97 - x11-libs/libXrender
98 - x11-libs/libXScrnSaver
99 - x11-libs/libXtst
100 - alsa? ( media-libs/alsa-lib )
101 - designer? ( ~dev-qt/designer-${QTVER} )
102 - geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
103 - kerberos? ( virtual/krb5 )
104 - pulseaudio? ( media-sound/pulseaudio:= )
105 - system-ffmpeg? ( media-video/ffmpeg:0= )
106 - system-icu? ( >=dev-libs/icu-60.2:= )
107 - widgets? (
108 - ~dev-qt/qtdeclarative-${QTVER}[widgets]
109 - ~dev-qt/qtwidgets-${QTVER}
110 - )
111 -"
112 -DEPEND="${RDEPEND}
113 - ${PYTHON_DEPS}
114 - >=app-arch/gzip-1.7
115 - dev-util/gperf
116 - dev-util/ninja
117 - dev-util/re2c
118 - net-libs/nodejs
119 - sys-devel/bison
120 -"
121 -
122 -PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
123 -
124 -src_prepare() {
125 - if [[ ${PV} == ${QTVER}_p* ]]; then
126 - # This is made from git, and for some reason will fail w/o .git directories.
127 - mkdir -p .git src/3rdparty/chromium/.git || die
128 -
129 - # We need to make sure this integrates well into Qt 5.15.2 installation.
130 - # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
131 - sed -e "/^MODULE_VERSION/s/5.*/${QTMIN}/" -i .qmake.conf || die
132 - fi
133 -
134 - # QTBUG-88657 - jumbo-build is broken
135 - #if ! use jumbo-build; then
136 - sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
137 - src/buildtools/config/common.pri || die
138 - #fi
139 -
140 - # bug 630834 - pass appropriate options to ninja when building GN
141 - sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
142 - -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
143 -
144 - # bug 620444 - ensure local headers are used
145 - find "${S}" -type f -name "*.pr[fio]" | \
146 - xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
147 -
148 - if use system-icu; then
149 - # Sanity check to ensure that bundled copy of ICU is not used.
150 - # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
151 - # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
152 - # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
153 - # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
154 - # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
155 - local file
156 - while read file; do
157 - echo "#error This file should not be used!" > "${file}" || die
158 - done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
159 - fi
160 -
161 - qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
162 - qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
163 -
164 - qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
165 -
166 - qt_use_disable_mod widgets widgets src/src.pro
167 -
168 - qt5-build_src_prepare
169 -
170 - # we need to generate ppc64 stuff because upstream does not ship it yet
171 - if use ppc64; then
172 - einfo "Patching for ppc64le and generating build files"
173 - eapply "${WORKDIR}/${PN}-ppc64"
174 - pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
175 - mkdir -vp source/config/linux/ppc64 || die
176 - mkdir -p source/libvpx/test || die
177 - touch source/libvpx/test/test.mk || die
178 - # generate_gni.sh runs git at the end of process, prevent it.
179 - git() { : ; }
180 - export -f git
181 - ./generate_gni.sh || die
182 - unset git
183 - popd >/dev/null || die
184 - fi
185 -}
186 -
187 -src_configure() {
188 - export NINJA_PATH=/usr/bin/ninja
189 - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
190 -
191 - local myqmakeargs=(
192 - --
193 - -no-build-qtpdf
194 - -printing-and-pdf
195 - -system-opus
196 - -system-webp
197 - $(usex alsa '-alsa' '-no-alsa')
198 - $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
199 - $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
200 - $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
201 - $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
202 - $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
203 - $(usex system-icu '-webengine-icu' '-no-webengine-icu')
204 - )
205 - qt5-build_src_configure
206 -}
207 -
208 -src_install() {
209 - qt5-build_src_install
210 -
211 - # bug 601472
212 - if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
213 - die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
214 - fi
215 -}