1 |
commit: 745dc079e719f85197ed8ae4dd59c6851217e94b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 16 18:45:06 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 17 21:14:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=745dc079 |
7 |
|
8 |
dev-qt/qtwebengine: Drop 5.15.2_p20210406 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-qt/qtwebengine/Manifest | 1 - |
14 |
.../qtwebengine-5.15.2_p20210406.ebuild | 190 --------------------- |
15 |
2 files changed, 191 deletions(-) |
16 |
|
17 |
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest |
18 |
index c90cb18e7b0..ba4cfde1b5e 100644 |
19 |
--- a/dev-qt/qtwebengine/Manifest |
20 |
+++ b/dev-qt/qtwebengine/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654 |
23 |
DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84 SHA512 939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51 |
24 |
-DIST qtwebengine-5.15.2_p20210406.tar.xz 320144324 BLAKE2B 45aafc32f4642fee5525f0504d61ed47c3085d5eff566271701805942ce5fcb2233655111592059775991da5b89dc1702031373f6ff171722ed163265d894daa SHA512 c4a0d5fec3247c04acc447c1c819d1e5dcb1d3c0cbb57a87a5cfa5c0c2b765e82c9f75a7297ba57303df5e1004d75dc554ffd70e24ecb8655126136672f38fdb |
25 |
DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317 SHA512 3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa |
26 |
|
27 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild |
28 |
deleted file mode 100644 |
29 |
index 8e61171efc8..00000000000 |
30 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,190 +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 |
- QT5_BUILD_DIR="${S}_build" |
50 |
- fi |
51 |
-fi |
52 |
- |
53 |
-# patchset based on https://github.com/chromium-ppc64le releases |
54 |
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )" |
55 |
- |
56 |
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" |
57 |
-REQUIRED_USE="designer? ( widgets )" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- app-arch/snappy:= |
61 |
- dev-libs/glib:2 |
62 |
- dev-libs/nspr |
63 |
- dev-libs/nss |
64 |
- dev-libs/expat |
65 |
- dev-libs/libevent:= |
66 |
- dev-libs/libxml2[icu] |
67 |
- dev-libs/libxslt |
68 |
- dev-libs/re2:= |
69 |
- ~dev-qt/qtcore-${QTVER} |
70 |
- ~dev-qt/qtdeclarative-${QTVER} |
71 |
- ~dev-qt/qtgui-${QTVER} |
72 |
- ~dev-qt/qtnetwork-${QTVER} |
73 |
- ~dev-qt/qtprintsupport-${QTVER} |
74 |
- ~dev-qt/qtwebchannel-${QTVER}[qml] |
75 |
- media-libs/fontconfig |
76 |
- media-libs/freetype |
77 |
- media-libs/harfbuzz:= |
78 |
- media-libs/lcms:2 |
79 |
- media-libs/libjpeg-turbo:= |
80 |
- media-libs/libpng:0= |
81 |
- >=media-libs/libvpx-1.5:=[svc(+)] |
82 |
- media-libs/libwebp:= |
83 |
- media-libs/mesa[egl,X(+)] |
84 |
- media-libs/opus |
85 |
- sys-apps/dbus |
86 |
- sys-apps/pciutils |
87 |
- sys-libs/zlib[minizip] |
88 |
- virtual/libudev |
89 |
- x11-libs/libdrm |
90 |
- x11-libs/libX11 |
91 |
- x11-libs/libXcomposite |
92 |
- x11-libs/libXcursor |
93 |
- x11-libs/libXdamage |
94 |
- x11-libs/libXext |
95 |
- x11-libs/libXfixes |
96 |
- x11-libs/libXi |
97 |
- x11-libs/libXrandr |
98 |
- x11-libs/libXrender |
99 |
- x11-libs/libXScrnSaver |
100 |
- x11-libs/libXtst |
101 |
- alsa? ( media-libs/alsa-lib ) |
102 |
- designer? ( ~dev-qt/designer-${QTVER} ) |
103 |
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} ) |
104 |
- kerberos? ( virtual/krb5 ) |
105 |
- pulseaudio? ( media-sound/pulseaudio:= ) |
106 |
- system-ffmpeg? ( media-video/ffmpeg:0= ) |
107 |
- system-icu? ( >=dev-libs/icu-68.2:= ) |
108 |
- widgets? ( |
109 |
- ~dev-qt/qtdeclarative-${QTVER}[widgets] |
110 |
- ~dev-qt/qtwidgets-${QTVER} |
111 |
- ) |
112 |
-" |
113 |
-DEPEND="${RDEPEND}" |
114 |
-BDEPEND=" |
115 |
- ${PYTHON_DEPS} |
116 |
- dev-util/gperf |
117 |
- dev-util/ninja |
118 |
- dev-util/re2c |
119 |
- net-libs/nodejs[ssl] |
120 |
- sys-devel/bison |
121 |
-" |
122 |
- |
123 |
-PATCHES=( |
124 |
- "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446 |
125 |
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 |
126 |
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix |
127 |
- "${FILESDIR}/${P}-glibc-2.33.patch" # by Fedora, bug 769989 |
128 |
- "${FILESDIR}/${P}-gcc11.patch" # by Fedora, bug 768261 |
129 |
- "${FILESDIR}/${P}-icu69.patch" # bug 781236 |
130 |
-) |
131 |
- |
132 |
-src_prepare() { |
133 |
- if [[ ${PV} == ${QTVER}_p* ]]; then |
134 |
- # This is made from git, and for some reason will fail w/o .git directories. |
135 |
- mkdir -p .git src/3rdparty/chromium/.git || die |
136 |
- |
137 |
- # We need to make sure this integrates well into Qt 5.15.2 installation. |
138 |
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. |
139 |
- sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die |
140 |
- fi |
141 |
- |
142 |
- # QTBUG-88657 - jumbo-build could still make trouble |
143 |
- if ! use jumbo-build; then |
144 |
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
145 |
- src/buildtools/config/common.pri || die |
146 |
- fi |
147 |
- |
148 |
- # bug 630834 - pass appropriate options to ninja when building GN |
149 |
- sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ |
150 |
- -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die |
151 |
- |
152 |
- # bug 620444 - ensure local headers are used |
153 |
- find "${S}" -type f -name "*.pr[fio]" | \ |
154 |
- xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die |
155 |
- |
156 |
- if use system-icu; then |
157 |
- # Sanity check to ensure that bundled copy of ICU is not used. |
158 |
- # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because |
159 |
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. |
160 |
- # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in |
161 |
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in |
162 |
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. |
163 |
- local file |
164 |
- while read file; do |
165 |
- echo "#error This file should not be used!" > "${file}" || die |
166 |
- done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) |
167 |
- fi |
168 |
- |
169 |
- qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri |
170 |
- qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri |
171 |
- |
172 |
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro |
173 |
- |
174 |
- qt_use_disable_mod widgets widgets src/src.pro |
175 |
- |
176 |
- qt5-build_src_prepare |
177 |
- |
178 |
- # we need to generate ppc64 stuff because upstream does not ship it yet |
179 |
- if use ppc64; then |
180 |
- einfo "Patching for ppc64le and generating build files" |
181 |
- eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" |
182 |
- pushd src/3rdparty/chromium > /dev/null || die |
183 |
- eapply -p0 "${WORKDIR}/${PN}-ppc64le" |
184 |
- popd > /dev/null || die |
185 |
- pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die |
186 |
- mkdir -vp source/config/linux/ppc64 || die |
187 |
- mkdir -p source/libvpx/test || die |
188 |
- touch source/libvpx/test/test.mk || die |
189 |
- ./generate_gni.sh || die |
190 |
- popd >/dev/null || die |
191 |
- fi |
192 |
-} |
193 |
- |
194 |
-src_configure() { |
195 |
- export NINJA_PATH=/usr/bin/ninja |
196 |
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" |
197 |
- |
198 |
- local myqmakeargs=( |
199 |
- -- |
200 |
- -no-build-qtpdf |
201 |
- -printing-and-pdf |
202 |
- -system-opus |
203 |
- -system-webp |
204 |
- $(usex alsa '-alsa' '-no-alsa') |
205 |
- $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') |
206 |
- $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation') |
207 |
- $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos') |
208 |
- $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') |
209 |
- $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') |
210 |
- $(usex system-icu '-webengine-icu' '-no-webengine-icu') |
211 |
- ) |
212 |
- qt5-build_src_configure |
213 |
-} |
214 |
- |
215 |
-src_install() { |
216 |
- qt5-build_src_install |
217 |
- |
218 |
- # bug 601472 |
219 |
- if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then |
220 |
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" |
221 |
- fi |
222 |
-} |