1 |
commit: 2b6bfff4302a3c4f8ccdc19d76add554441012bc |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 2 17:57:45 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 2 18:51:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6bfff4 |
7 |
|
8 |
dev-qt/qtwebengine: 5.15.2_p20210625 snapshot bump |
9 |
|
10 |
Snapshotted at: |
11 |
Branch: 5.15 |
12 |
Commit: 7b9e9c92286aec8102ab221434e785a1def0af87 |
13 |
|
14 |
Submodule qtwebengine-chromium.git: |
15 |
Branch: 87-based |
16 |
Commit: 0b959ee26c9e4098744021d949d0fc67cc0316d8 |
17 |
|
18 |
Closes: https://bugs.gentoo.org/792054 |
19 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
20 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
21 |
|
22 |
dev-qt/qtwebengine/Manifest | 1 + |
23 |
.../qtwebengine-5.15.2_p20210625.ebuild | 212 +++++++++++++++++++++ |
24 |
2 files changed, 213 insertions(+) |
25 |
|
26 |
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest |
27 |
index a189e345d82..99cd2facee1 100644 |
28 |
--- a/dev-qt/qtwebengine/Manifest |
29 |
+++ b/dev-qt/qtwebengine/Manifest |
30 |
@@ -1,3 +1,4 @@ |
31 |
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654 |
32 |
DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317 SHA512 3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa |
33 |
DIST qtwebengine-5.15.2_p20210521.tar.xz 320126348 BLAKE2B 49a910d19487a720bca751d40bb694536d2ac7002b10de5b949b9bb98baf5f86001e89f522bb05edafc5c050a55f7ac15b6689138cff0912990472735a46bfbc SHA512 f71941667abd1a797442dedb501010cb67512e2df9a818b15ff8901a49987211bddcba80e7cc2a4652db9bf56fc9d969e8fa38de1f3ad112838a1a9c9facde8f |
34 |
+DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1 |
35 |
|
36 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild |
37 |
new file mode 100644 |
38 |
index 00000000000..424e09b3692 |
39 |
--- /dev/null |
40 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild |
41 |
@@ -0,0 +1,212 @@ |
42 |
+# Copyright 1999-2021 Gentoo Authors |
43 |
+# Distributed under the terms of the GNU General Public License v2 |
44 |
+ |
45 |
+EAPI=7 |
46 |
+ |
47 |
+PYTHON_COMPAT=( python2_7 ) |
48 |
+QTVER=$(ver_cut 1-3) |
49 |
+inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build |
50 |
+ |
51 |
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
52 |
+HOMEPAGE="https://www.qt.io/" |
53 |
+ |
54 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
55 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
56 |
+ if [[ ${PV} == ${QTVER}_p* ]]; then |
57 |
+ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" |
58 |
+ S="${WORKDIR}/${P}" |
59 |
+ QT5_BUILD_DIR="${S}_build" |
60 |
+ fi |
61 |
+else |
62 |
+ EGIT_BRANCH="5.15" |
63 |
+ EGIT_REPO_URI=( |
64 |
+ "https://code.qt.io/qt/${QT5_MODULE}.git" |
65 |
+ "https://github.com/qt/${QT5_MODULE}.git" |
66 |
+ ) |
67 |
+ inherit git-r3 |
68 |
+fi |
69 |
+ |
70 |
+# patchset based on https://github.com/chromium-ppc64le releases |
71 |
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )" |
72 |
+ |
73 |
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets" |
74 |
+REQUIRED_USE="designer? ( widgets )" |
75 |
+ |
76 |
+RDEPEND=" |
77 |
+ app-arch/snappy:= |
78 |
+ dev-libs/glib:2 |
79 |
+ dev-libs/nspr |
80 |
+ dev-libs/nss |
81 |
+ dev-libs/expat |
82 |
+ dev-libs/libevent:= |
83 |
+ dev-libs/libxml2[icu] |
84 |
+ dev-libs/libxslt |
85 |
+ dev-libs/re2:= |
86 |
+ ~dev-qt/qtcore-${QTVER} |
87 |
+ ~dev-qt/qtdeclarative-${QTVER} |
88 |
+ ~dev-qt/qtgui-${QTVER} |
89 |
+ ~dev-qt/qtnetwork-${QTVER} |
90 |
+ ~dev-qt/qtprintsupport-${QTVER} |
91 |
+ ~dev-qt/qtwebchannel-${QTVER}[qml] |
92 |
+ media-libs/fontconfig |
93 |
+ media-libs/freetype |
94 |
+ media-libs/harfbuzz:= |
95 |
+ media-libs/lcms:2 |
96 |
+ media-libs/libjpeg-turbo:= |
97 |
+ media-libs/libpng:0= |
98 |
+ >=media-libs/libvpx-1.5:=[svc(+)] |
99 |
+ media-libs/libwebp:= |
100 |
+ media-libs/mesa[egl,X(+)] |
101 |
+ media-libs/opus |
102 |
+ sys-apps/dbus |
103 |
+ sys-apps/pciutils |
104 |
+ sys-libs/zlib[minizip] |
105 |
+ virtual/libudev |
106 |
+ x11-libs/libdrm |
107 |
+ x11-libs/libX11 |
108 |
+ x11-libs/libXcomposite |
109 |
+ x11-libs/libXcursor |
110 |
+ x11-libs/libXdamage |
111 |
+ x11-libs/libXext |
112 |
+ x11-libs/libXfixes |
113 |
+ x11-libs/libXi |
114 |
+ x11-libs/libxkbfile |
115 |
+ x11-libs/libXrandr |
116 |
+ x11-libs/libXrender |
117 |
+ x11-libs/libXScrnSaver |
118 |
+ x11-libs/libXtst |
119 |
+ alsa? ( media-libs/alsa-lib ) |
120 |
+ designer? ( ~dev-qt/designer-${QTVER} ) |
121 |
+ geolocation? ( ~dev-qt/qtpositioning-${QTVER} ) |
122 |
+ kerberos? ( virtual/krb5 ) |
123 |
+ pulseaudio? ( media-sound/pulseaudio:= ) |
124 |
+ system-ffmpeg? ( media-video/ffmpeg:0= ) |
125 |
+ system-icu? ( >=dev-libs/icu-69.1:= ) |
126 |
+ widgets? ( |
127 |
+ ~dev-qt/qtdeclarative-${QTVER}[widgets] |
128 |
+ ~dev-qt/qtwidgets-${QTVER} |
129 |
+ ) |
130 |
+" |
131 |
+DEPEND="${RDEPEND}" |
132 |
+BDEPEND="${PYTHON_DEPS} |
133 |
+ dev-util/gperf |
134 |
+ dev-util/ninja |
135 |
+ dev-util/re2c |
136 |
+ net-libs/nodejs[ssl] |
137 |
+ sys-devel/bison |
138 |
+ ppc64? ( >=dev-util/gn-0.1807 ) |
139 |
+" |
140 |
+ |
141 |
+PATCHES=( |
142 |
+ "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446 |
143 |
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606 |
144 |
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix |
145 |
+ "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989 |
146 |
+ "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261 |
147 |
+) |
148 |
+ |
149 |
+src_unpack() { |
150 |
+ # bug 307861 |
151 |
+ eshopts_push -s extglob |
152 |
+ if is-flagq '-g?(gdb)?([1-9])'; then |
153 |
+ ewarn |
154 |
+ ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." |
155 |
+ ewarn "You may experience really long compilation times and/or increased memory usage." |
156 |
+ ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." |
157 |
+ ewarn |
158 |
+ fi |
159 |
+ eshopts_pop |
160 |
+ |
161 |
+ case ${QT5_BUILD_TYPE} in |
162 |
+ live) git-r3_src_unpack ;& |
163 |
+ release) default ;; |
164 |
+ esac |
165 |
+} |
166 |
+ |
167 |
+src_prepare() { |
168 |
+ if [[ ${PV} == ${QTVER}_p* ]]; then |
169 |
+ # This is made from git, and for some reason will fail w/o .git directories. |
170 |
+ mkdir -p .git src/3rdparty/chromium/.git || die |
171 |
+ |
172 |
+ # We need to make sure this integrates well into Qt 5.15.2 installation. |
173 |
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it. |
174 |
+ sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die |
175 |
+ fi |
176 |
+ |
177 |
+ # QTBUG-88657 - jumbo-build could still make trouble |
178 |
+ if ! use jumbo-build; then |
179 |
+ sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ |
180 |
+ src/buildtools/config/common.pri || die |
181 |
+ fi |
182 |
+ |
183 |
+ # bug 620444 - ensure local headers are used |
184 |
+ find "${S}" -type f -name "*.pr[fio]" | \ |
185 |
+ xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die |
186 |
+ |
187 |
+ if use system-icu; then |
188 |
+ # Sanity check to ensure that bundled copy of ICU is not used. |
189 |
+ # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because |
190 |
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. |
191 |
+ # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in |
192 |
+ # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in |
193 |
+ # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. |
194 |
+ local file |
195 |
+ while read file; do |
196 |
+ echo "#error This file should not be used!" > "${file}" || die |
197 |
+ done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) |
198 |
+ fi |
199 |
+ |
200 |
+ qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri |
201 |
+ qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri |
202 |
+ |
203 |
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro |
204 |
+ |
205 |
+ qt_use_disable_mod widgets widgets src/src.pro |
206 |
+ |
207 |
+ qt5-build_src_prepare |
208 |
+ |
209 |
+ # we need to generate ppc64 stuff because upstream does not ship it yet |
210 |
+ if use ppc64; then |
211 |
+ einfo "Patching for ppc64le and generating build files" |
212 |
+ eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" |
213 |
+ pushd src/3rdparty/chromium > /dev/null || die |
214 |
+ eapply -p0 "${WORKDIR}/${PN}-ppc64le" |
215 |
+ popd > /dev/null || die |
216 |
+ pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die |
217 |
+ mkdir -vp source/config/linux/ppc64 || die |
218 |
+ mkdir -p source/libvpx/test || die |
219 |
+ touch source/libvpx/test/test.mk || die |
220 |
+ ./generate_gni.sh || die |
221 |
+ popd >/dev/null || die |
222 |
+ fi |
223 |
+} |
224 |
+ |
225 |
+src_configure() { |
226 |
+ export NINJA_PATH=/usr/bin/ninja |
227 |
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" |
228 |
+ |
229 |
+ local myqmakeargs=( |
230 |
+ -- |
231 |
+ -no-build-qtpdf |
232 |
+ -printing-and-pdf |
233 |
+ -system-opus |
234 |
+ -system-webp |
235 |
+ $(usex alsa '-alsa' '-no-alsa') |
236 |
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') |
237 |
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation') |
238 |
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos') |
239 |
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') |
240 |
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') |
241 |
+ $(usex system-icu '-webengine-icu' '-no-webengine-icu') |
242 |
+ ) |
243 |
+ qt5-build_src_configure |
244 |
+} |
245 |
+ |
246 |
+src_install() { |
247 |
+ qt5-build_src_install |
248 |
+ |
249 |
+ # bug 601472 |
250 |
+ if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then |
251 |
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" |
252 |
+ fi |
253 |
+} |