* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2022-06-18 14:27 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2022-06-18 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 2223eef5da0d0a43c39eedc8c9be4d6dfd8d3ca9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 19:34:05 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 14:26:46 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2223eef5
dev-qt/qtwebengine: Sync with 5.15.4_p20220526::gentoo
Fix build with GCC 12
Bug: https://bugs.gentoo.org/840326
Closes: https://bugs.gentoo.org/847298
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...webengine-5.15.3_p20220406-gcc12-includes.patch | 32 ++++++++++++++++++++++
| 10 +++++++
dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild | 7 +++--
3 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
new file mode 100644
index 00000000..cd476564
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
@@ -0,0 +1,32 @@
+https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtwebengine/0001-skia-Some-includes-to-fix-build-with-GCC-12.patch?expand=1
+https://bugs.gentoo.org/840326
+
+From 68799a1e0815b20ca59ce354a55280399257a201 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Fri, 25 Mar 2022 15:29:28 +0100
+Subject: [PATCH] skia: Some includes to fix build with GCC 12
+
+Those includes got introduced upstream for other reasons and fixed building
+with GCC 12 as a side effect.
+--- a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
++++ b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
+@@ -12,6 +12,8 @@
+ #include "include/core/SkScalar.h"
+ #include "include/core/SkTypes.h"
+
++#include <array>
++
+ /** \file SkColor.h
+
+ Types, consts, functions, and macros for colors.
+--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+@@ -8,6 +8,8 @@
+
+ #include "include/utils/SkParse.h"
+
++#include <algorithm> // std::lower_bound
++
+ static constexpr const char* gColorNames[] = {
+ "aliceblue",
+ "antiquewhite",
--git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
new file mode 100644
index 00000000..a319f521
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
@@ -0,0 +1,10 @@
+--- a/src/core/gn_run.pro
++++ b/src/core/gn_run.pro
+@@ -64,6 +64,7 @@
+ }
+ } else {
+ gn_args+= "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\""
++ gn_args += $$(EXTRA_GN)
+ gn_args = $$system_quote($$gn_args)
+ gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
+ gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args --root=$$gn_src_root
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
index 438a2c86..3c78403a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
@@ -104,11 +104,12 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
+ "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
)
@@ -268,8 +269,8 @@ src_install() {
}
pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
- elog "additional security fixes from newer versions. Extensive as it is, the"
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
+ elog "with additional security fixes from newer versions. Extensive as it is, the"
elog "list of backports is impossible to evaluate, but always bound to be behind"
elog "Chromium's release schedule."
elog "In addition, various online services may deny service based on an outdated"
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2024-03-23 13:35 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2024-03-23 13:35 UTC (permalink / raw
To: gentoo-commits
commit: cd3cd64d1cd2ca1fd2ac71015ea88ecc205fa6ef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 11:05:28 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 11:44:48 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cd3cd64d
dev-qt/qtwebengine: drop ~ppc64 keyword and modifications
Bug: https://bugs.gentoo.org/924936
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 --
.../files/qtwebengine-5.15.2-enable-ppc64.patch | 37 ---------------------
dev-qt/qtwebengine/metadata.xml | 5 ---
dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild | 38 ++--------------------
4 files changed, 3 insertions(+), 79 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 88b8c511..901ba754 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1 @@
-DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585eda0539f8adf988413aa52503caca3a347a62f75584efb42bcfa4832aadfc51fb98073f4ed3ddfc9701caf570e7186e0e1357af9569f SHA512 e0275ac4eb8d113581fc4fdf42be831903496b6ed95dca5b3d88113107e5453ee8c40df0e2956dd4e343b08e09c57607b1b82a78bf77a780225ff0030a249cef
DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
-DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
deleted file mode 100644
index 4fb19ccd..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 18 Jan 2020 23:52:55 +0100
-Subject: [PATCH 1/3] Enable ppc64 builds
-
----
- configure.pri | 1 +
- mkspecs/features/functions.prf | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configure.pri b/configure.pri
-index 3a144e3f8..cabe8b24a 100644
---- a/configure.pri 2021-02-24 10:45:58.000000000 +0100
-+++ - 2021-03-07 21:18:43.124754796 +0100
-@@ -144,6 +144,7 @@
- contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
- contains(QT_ARCH, "mips"): return(true)
- contains(QT_ARCH, "mips64"): return(true)
-+ contains(QT_ARCH, "power64"): return(true)
- qtLog("Architecture not supported.")
- return(false)
- }
-diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index 512e2523b..e31123654 100644
---- a/mkspecs/features/functions.prf 2021-02-24 10:45:58.000000000 +0100
-+++ - 2021-03-07 21:19:21.345036293 +0100
-@@ -107,6 +107,7 @@
- contains(qtArch, "mips"): return(mipsel)
- contains(qtArch, "mips64"): return(mips64el)
- contains(qtArch, "mips64el"): return(mips64el)
-+ contains(qtArch, "power64"): return(ppc64)
- return(unknown)
- }
-
---
-2.26.0
-
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index f447332f..0d16fef3 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -5,11 +5,6 @@
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
- <maintainer type="person">
- <description>ppc64 patchset maintainer</description>
- <email>gyakovlev@gentoo.org</email>
- <name>Georgy Yakovlev</name>
- </maintainer>
<use>
<flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag>
<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
index 489e6121..23e3fab7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
HOMEPAGE="https://www.qt.io/"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
@@ -27,13 +27,7 @@ else
inherit git-r3
fi
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-# ppc64 ffmpeg patchset backported from chromium 98 on https://ppa.quickbuild.io/raptor-engineering-public/chromium/ubuntu/pool/main/c/chromium/
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz
- ppc64? (
- https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15-ffmpeg-ppc64le.tar.xz
- )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
@@ -102,7 +96,6 @@ BDEPEND="${PYTHON_DEPS}
net-libs/nodejs[ssl]
sys-devel/bison
sys-devel/flex
- ppc64? ( >=dev-build/gn-0.1807 )
"
PATCHES=( "${WORKDIR}/${PATCHSET}" )
@@ -208,32 +201,7 @@ src_prepare() {
qt_use_disable_mod widgets widgets src/src.pro
- if use ppc64; then
- einfo "Patching for ppc64le and generating build files"
- eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
- pushd src/3rdparty/chromium > /dev/null || die
- eapply -p0 "${WORKDIR}/${PN}-ppc64le"
- eapply -p1 "${WORKDIR}/${PN}-ffmpeg-ppc64le"
- popd > /dev/null || die
- fi
-
qt5-build_src_prepare
-
- # we need to generate ppc64 stuff because upstream does not ship it yet
- if use ppc64; then
- einfo "Generating ppc64le build files"
- pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
- mkdir -vp source/config/linux/ppc64 || die
- mkdir -p source/libvpx/test || die
- touch source/libvpx/test/test.mk || die
- # clang-format is used to re-format sources
- # but we'd rather make it a no-op than introduce a clang dependency
- # https://bugs.gentoo.org/849458
- clang-format() { : ; }
- export -f clang-format || die
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2022-04-09 15:05 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2022-04-09 15:05 UTC (permalink / raw
To: gentoo-commits
commit: b70d10d2259fa7c4a100ebb90f47719c40eb2cb8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 13:40:33 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 13:40:51 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b70d10d2
dev-qt/qtwebengine: Support build w/ py3, IUSE=screencast, fix ffmpeg5
${PN}-5.15.3_p20220406-patchset contains patches to drop catapult as well.
Bug: https://bugs.gentoo.org/698988
Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
... => qtwebengine-5.15.3_p20220406-ffmpeg5.patch} | 32 +++++++++++-----------
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 12 +++++---
4 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3d567b3b..1673d115 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,5 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
+DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-everywhere-src-6.2.3.tar.xz 369703936 BLAKE2B 2418cc900b8fde42bb5753fef554525bfd3cc4bbe5a2f07a1daae626309c6d29da0eb2a173612924a27b4c85d3bdf1e0d3f57ffd6a4703a6a66fb36e235f3cd1 SHA512 8b2c8decbff025d756c1c083ff6c734b3edfb50613d8bdf9c272468c41c8ba89d22164ca440073fb706b735668bb8b0d30a166305a140f61a3acb3b46def4e01
DIST qtwebengine-everywhere-src-6.2.4.tar.xz 369689936 BLAKE2B ab38c0af341393c95188ccbe498953e8b47c78a75f0aa3695defbb80981ec77702ff8a42c78fcf9c90ad21a8f4b3147b9d199e6b7fea49af5d1b0b1af821fbe1 SHA512 b76aa6f0b5aa33a178bcf6ebd0256776f5aa20eb763599b0ccd2b6fc544bf8a189a12fbf8f0e0d7414c99e6975b20d9127f6a53bc6126904d487efb6d472008f
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
similarity index 87%
rename from dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch
rename to dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
index d85c1985..15c19266 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
@@ -16,8 +16,8 @@ Subject: [PATCH] Fix build with ffmpeg 5
diff --git a/chromium/media/ffmpeg/ffmpeg_common.h b/chromium/media/ffmpeg/ffmpeg_common.h
index 2734a485cbd..70b1877a43c 100644
---- a/chromium/media/ffmpeg/ffmpeg_common.h
-+++ b/chromium/media/ffmpeg/ffmpeg_common.h
+--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
++++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
@@ -29,6 +29,7 @@ extern "C" {
#include <libavformat/avformat.h>
#include <libavformat/avio.h>
@@ -28,8 +28,8 @@ index 2734a485cbd..70b1877a43c 100644
#include <libavutil/mastering_display_metadata.h>
diff --git a/chromium/media/filters/audio_file_reader.cc b/chromium/media/filters/audio_file_reader.cc
index cb81d920def..bd73908d0ca 100644
---- a/chromium/media/filters/audio_file_reader.cc
-+++ b/chromium/media/filters/audio_file_reader.cc
+--- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc
++++ b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
@@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
}
@@ -41,8 +41,8 @@ index cb81d920def..bd73908d0ca 100644
if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P)
diff --git a/chromium/media/filters/ffmpeg_audio_decoder.cc b/chromium/media/filters/ffmpeg_audio_decoder.cc
index 0d825ed791b..72fac6167ef 100644
---- a/chromium/media/filters/ffmpeg_audio_decoder.cc
-+++ b/chromium/media/filters/ffmpeg_audio_decoder.cc
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
@@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
}
}
@@ -54,8 +54,8 @@ index 0d825ed791b..72fac6167ef 100644
DLOG(ERROR) << "Could not initialize audio decoder: "
diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc
index d34db63f3ef..427565b00c1 100644
---- a/chromium/media/filters/ffmpeg_demuxer.cc
-+++ b/chromium/media/filters/ffmpeg_demuxer.cc
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc
@@ -98,12 +98,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
// Next try to use the first DTS value, for codecs where we know PTS == DTS
@@ -105,8 +105,8 @@ index d34db63f3ef..427565b00c1 100644
packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
diff --git a/chromium/media/filters/ffmpeg_glue.cc b/chromium/media/filters/ffmpeg_glue.cc
index 0ef3521473d..8483ecc348f 100644
---- a/chromium/media/filters/ffmpeg_glue.cc
-+++ b/chromium/media/filters/ffmpeg_glue.cc
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_glue.cc
@@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
}
@@ -127,8 +127,8 @@ index 0ef3521473d..8483ecc348f 100644
format_context_->error_recognition |= AV_EF_EXPLODE;
diff --git a/chromium/media/filters/ffmpeg_video_decoder.cc b/chromium/media/filters/ffmpeg_video_decoder.cc
index ef12477ee89..7996606f5f9 100644
---- a/chromium/media/filters/ffmpeg_video_decoder.cc
-+++ b/chromium/media/filters/ffmpeg_video_decoder.cc
+--- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
++++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
@@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
if (decode_nalus_)
codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
@@ -140,8 +140,8 @@ index ef12477ee89..7996606f5f9 100644
return false;
diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc
index 59c2a2fc618..1a9872c7acb 100644
---- a/chromium/media/filters/media_file_checker.cc
-+++ b/chromium/media/filters/media_file_checker.cc
+--- a/src/3rdparty/chromium/media/filters/media_file_checker.cc
++++ b/src/3rdparty/chromium/media/filters/media_file_checker.cc
@@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
auto context = AVStreamToAVCodecContext(format_context->streams[i]);
if (!context)
@@ -153,8 +153,8 @@ index 59c2a2fc618..1a9872c7acb 100644
stream_contexts[i] = {std::move(context), std::move(loop)};
diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
index 9002b874611..d12fade8b63 100644
---- a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
-+++ b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
@@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
// a pointer |this|.
av_context_->opaque = this;
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 0bc98db9..6912e8aa 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -15,6 +15,7 @@
<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
<flag name="pipewire">Enable PipeWire support for WebRTC.</flag>
+ <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
index b755d163..8d3e80b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -28,9 +28,10 @@ fi
# ppc64 patchset based on https://github.com/chromium-ppc64le releases
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -80,6 +81,7 @@ RDEPEND="
geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
+ screencast? ( media-video/pipewire:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
@@ -106,8 +108,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # fixes build with clang 14
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+ "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
)
qtwebengine_check-reqs() {
@@ -200,7 +203,7 @@ src_prepare() {
fi
if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220330-ffmpeg5.patch" # by Archlinux, bug 831437
+ eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
fi
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
@@ -243,6 +246,7 @@ src_configure() {
$(qt_use geolocation webengine-geolocation)
$(qt_use kerberos webengine-kerberos)
$(qt_use pulseaudio)
+ $(usex screencast -webengine-webrtc-pipewire '')
$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
$(qt_use system-icu webengine-icu)
)
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2022-04-05 17:07 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2022-04-05 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 8d42cc5a68b1abca413483e3906b04e6ccfa0a15
Author: Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Mon Apr 4 11:40:05 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 17:01:30 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8d42cc5a
dev-qt/qtwebengine: fix building with clang 14
Signed-off-by: Miezhiko <Miezhiko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24897
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.15.3_p20220329-clang14.patch | 16 ++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
new file mode 100644
index 00000000..ed48544f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
+@@ -119,11 +119,11 @@ enum TextContext { kNoContext, kPriorContext, kPrimary
+
+ const int kTextBufferCapacity = 16;
+
+-typedef struct {
++struct UTextWithBuffer {
+ DISALLOW_NEW();
+ UText text;
+ UChar buffer[kTextBufferCapacity];
+-} UTextWithBuffer;
++};
+
+ static inline int64_t TextPinIndex(int64_t& index, int64_t limit) {
+ if (index < 0)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
index 8c44a498..53315490 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
@@ -107,6 +107,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # fixes build with clang 14
)
qtwebengine_check-reqs() {
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2021-12-24 23:33 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2021-12-24 23:33 UTC (permalink / raw
To: gentoo-commits
commit: cce023e39dd7138573d426d5d407a17dde3986f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 23:32:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 23:32:55 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cce023e3
dev-qt/qtwebengine: Drop obsolete patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.15.2_p20210521-gcc11.patch | 74 ----------------------
...ne-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch | 72 ---------------------
...gine-5.15.2_p20210824-breakpad-glibc-2.34.patch | 72 ---------------------
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 3 -
4 files changed, 221 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
deleted file mode 100644
index 0014ec13..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-index 013f1dfb2..3ce63c192 100644
---- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
-@@ -9,6 +9,7 @@
-
- #include "libANGLE/HandleAllocator.h"
-
-+#include <limits>
- #include <algorithm>
- #include <functional>
-
-diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-index be91def6b..73f202356 100644
---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
-@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
- }
-
- GType ax_platform_atk_hyperlink_get_type() {
-- static volatile gsize type_volatile = 0;
-+ static gsize type_volatile = 0;
-
- AXPlatformNodeAuraLinux::EnsureGTypeInit();
-
-diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-index 04125c6fd..6c64e5d8e 100644
---- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
-@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) {
- GType GetType() {
- AXPlatformNodeAuraLinux::EnsureGTypeInit();
-
-- static volatile gsize type_volatile = 0;
-+ static gsize type_volatile = 0;
- if (g_once_init_enter(&type_volatile)) {
- static const GTypeInfo type_info = {
- sizeof(AXPlatformNodeAuraLinuxClass), // class_size
-diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-index c663a2074..38a342484 100644
---- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-+++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
-@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
- }
-
- GType GtkKeyBindingsHandler::HandlerGetType() {
-- static volatile gsize type_id_volatile = 0;
-+ static gsize type_id_volatile = 0;
- if (g_once_init_enter(&type_id_volatile)) {
- GType type_id = g_type_register_static_simple(
- GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"),
---- a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
-+++ b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
-@@ -2,6 +2,7 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include <cstddef>
- #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
-
- #include <stdint.h>
-diff --git a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-index 657a3c96b..ad641a082 100644
---- a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-+++ b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include <cstddef>
-+
- #include "components/bookmarks/browser/base_bookmark_model_observer.h"
-
- namespace bookmarks {
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
deleted file mode 100644
index dfaa634b..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 78b1bcff4d9b977313e9ea15068168e1b11f5ba1 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 4 Aug 2021 19:08:03 +0200
-Subject: [PATCH] chromium: abseil-cpp: fix build with glibc-2.34
-
-* backport a fix from upstream abseil-cpp:
- https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9
-
- to fix:
-
-[97/24505] CXX obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-FAILED: obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DABSL_ALLOCATOR_NOTHROW=1 -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-prote
ctor -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc -o obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc: In function 'bool absl::SetupAlternateStackOnce()':
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: error: no matching function for call to 'max(long int, int)'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
- from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
- 254 | max(const _Tp& __a, const _Tp& __b)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: deduced conflicting types for parameter 'const _Tp' ('long int' and 'int')
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
- from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
- 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: deduced conflicting types for parameter 'const _Tp' ('long int' and 'int')
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
- 3461 | max(initializer_list<_Tp> __l)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: mismatched types 'std::initializer_list<_Tp>' and 'long int'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
- 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: mismatched types 'std::initializer_list<_Tp>' and 'long int'
- 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../abseil-cpp/absl/debugging/failure_signal_handler.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc b/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
-index 5d13bdbbbd1..150a43f2660 100644
---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
-+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
-@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
- #else
- const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
- #endif
-- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
-+ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
- #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
- defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
- // Account for sanitizer instrumentation requiring additional stack space.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
deleted file mode 100644
index b91c239a..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 4 Aug 2021 19:11:06 +0200
-Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34
-
-* fixes:
-[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o
-FAILED: obj/third_party/breakpad/client/exception_handler.o
-/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/
src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad
/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()':
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)'
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
- from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
- 254 | max(const _Tp& __a, const _Tp& __b)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
- from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
- 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
- 3461 | max(initializer_list<_Tp> __l)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
- from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
- 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
- | ^~~
-../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
- 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
- | ~~~~~~~~^~~~~~~~~~~~~~~~~
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index ca353c40997..2e43ba6fc04 100644
---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
- // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
- // the alternative stack. Ensure that the size of the alternative stack is
- // large enough.
-- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
-+ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
-
- // Only set an alternative stack if there isn't already one, or if the current
- // one is too small.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 336099a8..61b7a1f3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -104,9 +104,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
- "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
- "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
)
pkg_preinst() {
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2021-09-30 11:35 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 11:35 UTC (permalink / raw
To: gentoo-commits
commit: aad69b828c1ddfee75bd2b04bfcc382adb6d27ea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 16:25:57 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 10:42:19 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=aad69b82
dev-qt/qtwebengine: Fix build with GLIBC-2.34
(sync with Gentoo ebuild repository)
Thanks-to: Nik <nik_cro <AT> abv.bg>
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ne-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch | 72 ++++++++++++++++++++++
...gine-5.15.2_p20210824-breakpad-glibc-2.34.patch | 72 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 2 +
3 files changed, 146 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
new file mode 100644
index 00000000..dfaa634b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch
@@ -0,0 +1,72 @@
+From 78b1bcff4d9b977313e9ea15068168e1b11f5ba1 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 4 Aug 2021 19:08:03 +0200
+Subject: [PATCH] chromium: abseil-cpp: fix build with glibc-2.34
+
+* backport a fix from upstream abseil-cpp:
+ https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9
+
+ to fix:
+
+[97/24505] CXX obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
+FAILED: obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
+/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DABSL_ALLOCATOR_NOTHROW=1 -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-prote
ctor -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc -o obj/third_party/abseil-cpp/absl/debugging/failure_signal_handler/failure_signal_handler.o
+../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc: In function 'bool absl::SetupAlternateStackOnce()':
+../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: error: no matching function for call to 'max(long int, int)'
+ 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
+ from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
+ 254 | max(const _Tp& __a, const _Tp& __b)
+ | ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: deduced conflicting types for parameter 'const _Tp' ('long int' and 'int')
+ 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:61,
+ from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
+ 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
+ | ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: deduced conflicting types for parameter 'const _Tp' ('long int' and 'int')
+ 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
+ from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
+ 3461 | max(initializer_list<_Tp> __l)
+ | ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: mismatched types 'std::initializer_list<_Tp>' and 'long int'
+ 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
+ from ../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:35:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
+ 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
+ | ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc:138:32: note: mismatched types 'std::initializer_list<_Tp>' and 'long int'
+ 138 | size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ .../abseil-cpp/absl/debugging/failure_signal_handler.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc b/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+index 5d13bdbbbd1..150a43f2660 100644
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
+ #else
+ const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
+ #endif
+- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
++ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
+ defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
+ // Account for sanitizer instrumentation requiring additional stack space.
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
new file mode 100644
index 00000000..b91c239a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210824-breakpad-glibc-2.34.patch
@@ -0,0 +1,72 @@
+From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 4 Aug 2021 19:11:06 +0200
+Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34
+
+* fixes:
+[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o
+FAILED: obj/third_party/breakpad/client/exception_handler.o
+/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/
src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad
/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()':
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)'
+ 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
+ from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
+ from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
+ from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template<class _Tp> constexpr const _Tp& std::max(const _Tp&, const _Tp&)'
+ 254 | max(const _Tp& __a, const _Tp& __b)
+ | ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
+ 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39,
+ from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40,
+ from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38,
+ from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template<class _Tp, class _Compare> constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)'
+ 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp)
+ | ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int')
+ 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
+ from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template<class _Tp> constexpr _Tp std::max(std::initializer_list<_Tp>)'
+ 3461 | max(initializer_list<_Tp> __l)
+ | ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
+ 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62,
+ from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85:
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template<class _Tp, class _Compare> constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)'
+ 3467 | max(initializer_list<_Tp> __l, _Compare __comp)
+ | ^~~
+../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed:
+../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int'
+ 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ | ~~~~~~~~^~~~~~~~~~~~~~~~~
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+index ca353c40997..2e43ba6fc04 100644
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
+ // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+ // the alternative stack. Ensure that the size of the alternative stack is
+ // large enough.
+- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++ static const unsigned kSigStackSize = std::max<size_t>(16384, SIGSTKSZ);
+
+ // Only set an alternative stack if there isn't already one, or if the current
+ // one is too small.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index d1ba0e1a..a64f24ef 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -105,6 +105,8 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
"${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
+ "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
+ "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
)
pkg_preinst() {
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2021-09-30 11:35 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 11:35 UTC (permalink / raw
To: gentoo-commits
commit: bf472e90b5db5c7ccf5528ed77bd4084c566cb47
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 19:14:58 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 10:40:56 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bf472e90
dev-qt/qtwebengine: Add Fedora patch for GCC-11
(sync with Gentoo ebuild repository)
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.15.2_p20210521-gcc11.patch | 74 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 1 +
2 files changed, 75 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
new file mode 100644
index 00000000..0014ec13
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
@@ -0,0 +1,74 @@
+diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
+index 013f1dfb2..3ce63c192 100644
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
+@@ -9,6 +9,7 @@
+
+ #include "libANGLE/HandleAllocator.h"
+
++#include <limits>
+ #include <algorithm>
+ #include <functional>
+
+diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
+index be91def6b..73f202356 100644
+--- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
++++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
+@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
+ }
+
+ GType ax_platform_atk_hyperlink_get_type() {
+- static volatile gsize type_volatile = 0;
++ static gsize type_volatile = 0;
+
+ AXPlatformNodeAuraLinux::EnsureGTypeInit();
+
+diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
+index 04125c6fd..6c64e5d8e 100644
+--- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
++++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
+@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) {
+ GType GetType() {
+ AXPlatformNodeAuraLinux::EnsureGTypeInit();
+
+- static volatile gsize type_volatile = 0;
++ static gsize type_volatile = 0;
+ if (g_once_init_enter(&type_volatile)) {
+ static const GTypeInfo type_info = {
+ sizeof(AXPlatformNodeAuraLinuxClass), // class_size
+diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
+index c663a2074..38a342484 100644
+--- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
++++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
+@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
+ }
+
+ GType GtkKeyBindingsHandler::HandlerGetType() {
+- static volatile gsize type_id_volatile = 0;
++ static gsize type_id_volatile = 0;
+ if (g_once_init_enter(&type_id_volatile)) {
+ GType type_id = g_type_register_static_simple(
+ GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"),
+--- a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
++++ b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
+@@ -2,6 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <cstddef>
+ #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
+
+ #include <stdint.h>
+diff --git a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
+index 657a3c96b..ad641a082 100644
+--- a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
++++ b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <cstddef>
++
+ #include "components/bookmarks/browser/base_bookmark_model_observer.h"
+
+ namespace bookmarks {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 3a092b0f..c096ab58 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -103,6 +103,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
+ "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
)
pkg_preinst() {
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2021-09-30 11:35 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 7530970e4e7a71404b857e654221360fb45dcfc3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 13:35:44 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 10:23:49 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7530970e
dev-qt/qtwebengine: Add V8-ICU-68 runtime fix
(sync with Gentoo ebuild repository)
Thanks-to: Stephan Hartmann <sultan <AT> gentoo.org>
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ine-5.15.2_p20210224-chromium-87-v8-icu68.patch | 192 +++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 3 +-
2 files changed, 194 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
new file mode 100644
index 00000000..a6856975
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
@@ -0,0 +1,192 @@
+From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001
+From: Frank Tang <ftang@chromium.org>
+Date: Tue, 03 Nov 2020 23:20:37 -0800
+Subject: [PATCH] Update to ICU68-1
+
+ICU68-1 change the output skeleton format. So we need to change
+resolvedOptions code for 68 migration.
+
+Chromium roll
+https://chromium-review.googlesource.com/c/chromium/src/+/2474093
+
+Bug: v8:10945
+Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431
+Commit-Queue: Frank Tang <ftang@chromium.org>
+Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
+Reviewed-by: Shu-yu Guo <syg@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#70972}
+
+(ported to work with <ICU-68.1 and rebased chromium)
+---
+
+diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
+index 45b0eab..d18b133 100644
+--- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
++++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
+@@ -389,17 +389,20 @@ Handle<String> CurrencySignString(Isolate* isolate,
+ Handle<String> UnitDisplayString(Isolate* isolate,
+ const icu::UnicodeString& skeleton) {
+ // Ex: skeleton as
+- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name"
++ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-full-name".
++ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-full-name"
+ if (skeleton.indexOf("unit-width-full-name") >= 0) {
+ return ReadOnlyRoots(isolate).long_string_handle();
+ }
+ // Ex: skeleton as
+- // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
++ // <ICU-68.1: "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
++ // >=ICU-68.1: "unit/length-meter .### rounding-mode-half-up unit-width-narrow".
+ if (skeleton.indexOf("unit-width-narrow") >= 0) {
+ return ReadOnlyRoots(isolate).narrow_string_handle();
+ }
+ // Ex: skeleton as
+- // "measure-unit/length-foot .### rounding-mode-half-up"
++ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up"
++ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
+ return ReadOnlyRoots(isolate).short_string_handle();
+ }
+
+@@ -422,7 +425,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& skeleton) {
+ return Notation::COMPACT;
+ }
+ // Ex: skeleton as
+- // "measure-unit/length-foot .### rounding-mode-half-up"
++ // <ICU-68.1: "measure-unit/length-foot .### rounding-mode-half-up"
++ // >=ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
+ return Notation::STANDARD;
+ }
+
+@@ -562,14 +566,23 @@ namespace {
+
+ // Ex: percent .### rounding-mode-half-up
+ // Special case for "percent"
+-// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
+-// rounding-mode-half-up" should return "kilometer-per-unit".
+-// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
+-// "year".
++// <ICU-68.1:
++// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
++// rounding-mode-half-up" should return "kilometer-per-unit".
++// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
++// >=ICU-68.1:
++// Ex: "unit/milliliter-per-acre .### rounding-mode-half-up"
++// should return "milliliter-per-acre".
++// Ex: "unit/year .### rounding-mode-half-up" should return
++// "year".
+ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
+ std::string str;
+ str = skeleton.toUTF8String<std::string>(str);
++#if U_ICU_VERSION_MAJOR_NUM < 68
+ std::string search("measure-unit/");
++#else
++ std::string search("unit/");
++#endif
+ size_t begin = str.find(search);
+ if (begin == str.npos) {
+ // Special case for "percent".
+@@ -578,20 +591,41 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
+ }
+ return "";
+ }
++#if U_ICU_VERSION_MAJOR_NUM < 68
+ // Skip the type (ex: "length").
+ // "measure-unit/length-kilometer per-measure-unit/duration-hour"
+ // b
+ begin = str.find("-", begin + search.size());
++#else
++ // Ex:
++ // "unit/acre .### rounding-mode-half-up"
++ // b
++ // Ex:
++ // "unit/milliliter-per-acre .### rounding-mode-half-up"
++ // b
++ begin += search.size();
++#endif
+ if (begin == str.npos) {
+ return "";
+ }
++#if U_ICU_VERSION_MAJOR_NUM < 68
+ begin++; // Skip the '-'.
++#endif
+ // Find the end of the subtype.
+ size_t end = str.find(" ", begin);
+- // "measure-unit/length-kilometer per-measure-unit/duration-hour"
+- // b e
++ // <ICU-68.1:
++ // "measure-unit/length-kilometer per-measure-unit/duration-hour"
++ // b e
++ // >=ICU-68.1:
++ // Ex:
++ // "unit/acre .### rounding-mode-half-up"
++ // b e
++ // Ex:
++ // "unit/milliliter-per-acre .### rounding-mode-half-up"
++ // b e
+ if (end == str.npos) {
+ end = str.size();
++#if U_ICU_VERSION_MAJOR_NUM < 68
+ return str.substr(begin, end - begin);
+ }
+ // "measure-unit/length-kilometer per-measure-unit/duration-hour"
+@@ -625,17 +659,36 @@ std::string UnitFromSkeleton(const icu::UnicodeString& skeleton) {
+ // "measure-unit/length-kilometer per-measure-unit/duration-hour"
+ // [result ] b e
+ return result + "-per-" + str.substr(begin, end - begin);
++#else
++ }
++ return str.substr(begin, end - begin);
++#endif
+ }
+
+ Style StyleFromSkeleton(const icu::UnicodeString& skeleton) {
+ if (skeleton.indexOf("currency/") >= 0) {
+ return Style::CURRENCY;
+ }
++#if U_ICU_VERSION_MAJOR_NUM < 68
+ if (skeleton.indexOf("measure-unit/") >= 0) {
+ if (skeleton.indexOf("scale/100") >= 0 &&
+ skeleton.indexOf("measure-unit/concentr-percent") >= 0) {
++#else
++ if (skeleton.indexOf("percent") >= 0) {
++ // percent precision-integer rounding-mode-half-up scale/100
++ if (skeleton.indexOf("scale/100") >= 0) {
++#endif
+ return Style::PERCENT;
++#if U_ICU_VERSION_MAJOR_NUM >= 68
++ } else {
++ return Style::UNIT;
++#endif
+ }
++#if U_ICU_VERSION_MAJOR_NUM >= 68
++ }
++ // Before ICU68: "measure-unit/", since ICU68 "unit/"
++ if (skeleton.indexOf("unit/") >= 0) {
++#endif
+ return Style::UNIT;
+ }
+ return Style::DECIMAL;
+diff --git a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
+index 267343aaae..64d56a1c12 100644
+--- a/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
++++ b/src/3rdparty/chromium/v8/src/objects/js-relative-time-format.cc
+@@ -195,9 +195,18 @@ MaybeHandle<JSRelativeTimeFormat> JSRelativeTimeFormat::New(
+ }
+ }
+
++#if U_ICU_VERSION_MAJOR_NUM < 68
+ icu::DecimalFormat* decimal_format =
+ static_cast<icu::DecimalFormat*>(number_format);
+ decimal_format->setMinimumGroupingDigits(-2);
++#else
++ if (number_format->getDynamicClassID() ==
++ icu::DecimalFormat::getStaticClassID()) {
++ icu::DecimalFormat* decimal_format =
++ static_cast<icu::DecimalFormat*>(number_format);
++ decimal_format->setMinimumGroupingDigits(-2);
++ }
++#endif
+
+ // Change UDISPCTX_CAPITALIZATION_NONE to other values if
+ // ECMA402 later include option to change capitalization.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index c81a1a6b..57d3478d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -99,7 +99,8 @@ BDEPEND="${PYTHON_DEPS}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+ "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
)
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2021-03-14 15:36 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2021-03-14 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 8419ef9dd4ed9bf4be9feffa56f92d2165cfa0e2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 15:36:51 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 15:35:16 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8419ef9d
dev-qt/qtwebengine: Sync with Gentoo ebuild repo
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.15.2_p20210224-disable-git.patch | 15 +++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 15 +++++++--------
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
new file mode 100644
index 00000000..c31e8970
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
@@ -0,0 +1,15 @@
+generate_gni.sh: update_readme() runs git at the end of process, prevent it.
+
+Thanks-to: Georgy Yakovlev <gyakovlev@gentoo.org>
+
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-07 12:51:49.438514897 +0100
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh 2021-02-21 16:23:38.375724515 +0100
+@@ -519,8 +519,3 @@
+
+ gn format --in-place $BASE_DIR/BUILD.gn
+ gn format --in-place $BASE_DIR/libvpx_srcs.gni
+-
+-cd $BASE_DIR/$LIBVPX_SRC_DIR
+-update_readme
+-
+-cd $BASE_DIR
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 98ede450..d2b9e762 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -21,7 +21,7 @@ fi
# patchset based on https://github.com/chromium-ppc64le releases
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
-IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -72,7 +72,7 @@ RDEPEND="
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-60.2:= )
+ system-icu? ( >=dev-libs/icu-68.2:= )
widgets? (
~dev-qt/qtdeclarative-${QTVER}[widgets]
~dev-qt/qtwidgets-${QTVER}
@@ -88,7 +88,10 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
+PATCHES=(
+ "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+)
src_prepare() {
if [[ ${PV} == ${QTVER}_p* ]]; then
@@ -100,7 +103,7 @@ src_prepare() {
sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
fi
- # QTBUG-88657 - jumbo-build is broken
+ # QTBUG-88657 - jumbo-build could still make trouble
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
@@ -144,11 +147,7 @@ src_prepare() {
mkdir -vp source/config/linux/ppc64 || die
mkdir -p source/libvpx/test || die
touch source/libvpx/test/test.mk || die
- # generate_gni.sh runs git at the end of process, prevent it.
- git() { : ; }
- export -f git
./generate_gni.sh || die
- unset git
popd >/dev/null || die
fi
}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2020-06-03 10:45 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2020-06-03 10:45 UTC (permalink / raw
To: gentoo-commits
commit: 7e8f9bebf9a491824733739d29bbf82900f8dee6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 3 10:45:07 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 3 10:45:07 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7e8f9beb
dev-qt/qtwebengine: Drop upstreamed icu-67.1 patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.14.2-icu67.patch | 169 ---------------------
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 5 +-
2 files changed, 1 insertion(+), 173 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
deleted file mode 100644
index 42ee5e87..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
-From: Ujjwal Sharma <ryzokuken@disroot.org>
-Date: Wed, 22 Apr 2020 12:20:17 +0530
-Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
-
-Original commit message:
-
- [intl] Remove soon-to-be removed getAllFieldPositions
-
- Needed to land ICU67.1 soon.
-
- Bug: v8:10393
- Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
- Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
- Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
- Commit-Queue: Frank Tang <ftang@chromium.org>
- Cr-Commit-Position: refs/heads/master@{#67027}
-
-Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
----
- common.gypi | 2 +-
- src/3rdparty/chromium/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------
- 2 files changed, 38 insertions(+), 36 deletions(-)
-
-diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc
-index 92d3e2fb82e..ced408aa173 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
- }
-
- namespace {
--Maybe<icu::UnicodeString> IcuFormatNumber(
-+Maybe<bool> IcuFormatNumber(
- Isolate* isolate,
- const icu::number::LocalizedNumberFormatter& number_format,
-- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
-+ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
- // If it is BigInt, handle it differently.
- UErrorCode status = U_ZERO_ERROR;
-- icu::number::FormattedNumber formatted;
- if (numeric_obj->IsBigInt()) {
- Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
- Handle<String> big_int_string;
- ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
- BigInt::ToString(isolate, big_int),
-- Nothing<icu::UnicodeString>());
-- formatted = number_format.formatDecimal(
-+ Nothing<bool>());
-+ *formatted = number_format.formatDecimal(
- {big_int_string->ToCString().get(), big_int_string->length()}, status);
- } else {
- double number = numeric_obj->Number();
-- formatted = number_format.formatDouble(number, status);
-+ *formatted = number_format.formatDouble(number, status);
- }
- if (U_FAILURE(status)) {
- // This happen because of icu data trimming trim out "unit".
- // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
-- THROW_NEW_ERROR_RETURN_VALUE(isolate,
-- NewTypeError(MessageTemplate::kIcuError),
-- Nothing<icu::UnicodeString>());
-- }
-- if (fp_iter) {
-- formatted.getAllFieldPositions(*fp_iter, status);
-+ THROW_NEW_ERROR_RETURN_VALUE(
-+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
- }
-- icu::UnicodeString result = formatted.toString(status);
-- if (U_FAILURE(status)) {
-- THROW_NEW_ERROR_RETURN_VALUE(isolate,
-- NewTypeError(MessageTemplate::kIcuError),
-- Nothing<icu::UnicodeString>());
-- }
-- return Just(result);
-+ return Just(true);
- }
-
- } // namespace
-@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
- Handle<Object> numeric_obj) {
- DCHECK(numeric_obj->IsNumeric());
-
-- Maybe<icu::UnicodeString> maybe_format =
-- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
-+ icu::number::FormattedNumber formatted;
-+ Maybe<bool> maybe_format =
-+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
- MAYBE_RETURN(maybe_format, Handle<String>());
-- return Intl::ToString(isolate, maybe_format.FromJust());
-+ UErrorCode status = U_ZERO_ERROR;
-+ icu::UnicodeString result = formatted.toString(status);
-+ if (U_FAILURE(status)) {
-+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
-+ }
-+ return Intl::ToString(isolate, result);
- }
-
- namespace {
-@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
- }
-
- namespace {
--Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-- icu::FieldPositionIterator* fp_iter,
-+Maybe<int> ConstructParts(Isolate* isolate,
-+ icu::number::FormattedNumber* formatted,
- Handle<JSArray> result, int start_index,
- Handle<Object> numeric_obj, bool style_is_unit) {
-+ UErrorCode status = U_ZERO_ERROR;
-+ icu::UnicodeString formatted_text = formatted->toString(status);
-+ if (U_FAILURE(status)) {
-+ THROW_NEW_ERROR_RETURN_VALUE(
-+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
-+ }
- DCHECK(numeric_obj->IsNumeric());
-- int32_t length = formatted.length();
-+ int32_t length = formatted_text.length();
- int index = start_index;
- if (length == 0) return Just(index);
-
-@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
- // other region covers some part of the formatted string. It's possible
- // there's another field with exactly the same begin and end as this backdrop,
- // in which case the backdrop's field_id of -1 will give it lower priority.
-- regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
-+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
-
- {
-- icu::FieldPosition fp;
-- while (fp_iter->next(fp)) {
-- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
-- fp.getEndIndex()));
-+ icu::ConstrainedFieldPosition cfp;
-+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
-+ while (formatted->nextPosition(cfp, status)) {
-+ regions.push_back(
-+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
- }
- }
-
-@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
- Handle<String> substring;
- ASSIGN_RETURN_ON_EXCEPTION_VALUE(
- isolate, substring,
-- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
-+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
- Nothing<int>());
- Intl::AddElement(isolate, result, index, field_type_string, substring);
- ++index;
-@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
- number_format->icu_number_formatter().raw();
- CHECK_NOT_NULL(fmt);
-
-- icu::FieldPositionIterator fp_iter;
-- Maybe<icu::UnicodeString> maybe_format =
-- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
-+ icu::number::FormattedNumber formatted;
-+ Maybe<bool> maybe_format =
-+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
- MAYBE_RETURN(maybe_format, Handle<JSArray>());
-
- Handle<JSArray> result = factory->NewJSArray(0);
- Maybe<int> maybe_format_to_parts = ConstructParts(
-- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
-+ isolate, &formatted, result, 0, numeric_obj,
- number_format->style() == JSNumberFormat::Style::UNIT);
- MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
-
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 7c6d8e1d..84a5805b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -78,10 +78,7 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=(
- "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
- "${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
-)
+PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
src_prepare() {
if ! use jumbo-build; then
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2020-05-10 5:40 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2020-05-10 5:40 UTC (permalink / raw
To: gentoo-commits
commit: a127863585a1407e549afb7e92f8f0ca355cb109
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 04:17:21 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun May 10 04:46:43 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1278635
dev-qt/qtwebengine: fix build with GCC-10
Bug: https://bugs.gentoo.org/721876
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
.../files/qtwebengine-5.15.0-gcc-10-build.patch | 64 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.0_rc.ebuild | 1 +
2 files changed, 65 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-gcc-10-build.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-gcc-10-build.patch
new file mode 100644
index 00000000..214bf76a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-gcc-10-build.patch
@@ -0,0 +1,64 @@
+From f6e84fa97536812867be6f4c2162f5b86547477f Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Tue, 5 May 2020 07:50:18 +0300
+Subject: [PATCH] Fix build with GCC 10
+
+Change-Id: I4101211163f3bb3f9a5fa673169aa41fa000ccca
+---
+ chromium/media/cdm/supported_cdm_versions.h | 1 +
+ .../third_party/perfetto/include/perfetto/base/task_runner.h | 1 +
+ chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 +
+ .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
+index dbe59ba5ea7..5216cfe3ee9 100644
+--- a/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
++++ b/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
+@@ -6,6 +6,7 @@
+ #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
+
+ #include <array>
++#include <cstddef>
+
+ #include "media/base/media_export.h"
+ #include "media/cdm/api/content_decryption_module.h"
+diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
+index cf60401238f..ee4ad255dea 100644
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
+@@ -18,6 +18,7 @@
+ #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
+
+ #include <functional>
++#include <stdint.h>
+
+ #include "perfetto/base/export.h"
+
+diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
+index 8ffa4400a9c..66cc46dc091 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
++++ b/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
+@@ -12,6 +12,7 @@
+ #define CALL_RTX_RECEIVE_STREAM_H_
+
+ #include <map>
++#include <stdint.h>
+
+ #include "call/rtp_packet_sink_interface.h"
+
+diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+index 22528c94892..69e624e8b19 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+
+ #include <array>
++#include <cstddef>
+
+ namespace webrtc {
+
+--
+2.26.2
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_rc.ebuild
index 7c6d8e1d..91e79534 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0_rc.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_rc.ebuild
@@ -81,6 +81,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
"${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
+ "${FILESDIR}/${PN}-5.15.0-gcc-10-build.patch" # bug 721876
)
src_prepare() {
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2020-04-30 9:26 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2020-04-30 9:26 UTC (permalink / raw
To: gentoo-commits
commit: b078110093de1ca03bf41d781d4e720eeaf56fd6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 20:38:38 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 09:26:41 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b0781100
dev-qt/qtwebengine: Fixed build with icu-67
Closes: https://bugs.gentoo.org/720054
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.14.2-icu67.patch | 169 +++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild | 5 +-
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 5 +-
3 files changed, 177 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
new file mode 100644
index 00000000..42ee5e87
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
@@ -0,0 +1,169 @@
+From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
+From: Ujjwal Sharma <ryzokuken@disroot.org>
+Date: Wed, 22 Apr 2020 12:20:17 +0530
+Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
+
+Original commit message:
+
+ [intl] Remove soon-to-be removed getAllFieldPositions
+
+ Needed to land ICU67.1 soon.
+
+ Bug: v8:10393
+ Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
+ Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
+ Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
+ Commit-Queue: Frank Tang <ftang@chromium.org>
+ Cr-Commit-Position: refs/heads/master@{#67027}
+
+Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
+---
+ common.gypi | 2 +-
+ src/3rdparty/chromium/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------
+ 2 files changed, 38 insertions(+), 36 deletions(-)
+
+diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc
+index 92d3e2fb82e..ced408aa173 100644
+--- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
++++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
+@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
+ }
+
+ namespace {
+-Maybe<icu::UnicodeString> IcuFormatNumber(
++Maybe<bool> IcuFormatNumber(
+ Isolate* isolate,
+ const icu::number::LocalizedNumberFormatter& number_format,
+- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
++ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
+ // If it is BigInt, handle it differently.
+ UErrorCode status = U_ZERO_ERROR;
+- icu::number::FormattedNumber formatted;
+ if (numeric_obj->IsBigInt()) {
+ Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
+ Handle<String> big_int_string;
+ ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
+ BigInt::ToString(isolate, big_int),
+- Nothing<icu::UnicodeString>());
+- formatted = number_format.formatDecimal(
++ Nothing<bool>());
++ *formatted = number_format.formatDecimal(
+ {big_int_string->ToCString().get(), big_int_string->length()}, status);
+ } else {
+ double number = numeric_obj->Number();
+- formatted = number_format.formatDouble(number, status);
++ *formatted = number_format.formatDouble(number, status);
+ }
+ if (U_FAILURE(status)) {
+ // This happen because of icu data trimming trim out "unit".
+ // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
+- THROW_NEW_ERROR_RETURN_VALUE(isolate,
+- NewTypeError(MessageTemplate::kIcuError),
+- Nothing<icu::UnicodeString>());
+- }
+- if (fp_iter) {
+- formatted.getAllFieldPositions(*fp_iter, status);
++ THROW_NEW_ERROR_RETURN_VALUE(
++ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
+ }
+- icu::UnicodeString result = formatted.toString(status);
+- if (U_FAILURE(status)) {
+- THROW_NEW_ERROR_RETURN_VALUE(isolate,
+- NewTypeError(MessageTemplate::kIcuError),
+- Nothing<icu::UnicodeString>());
+- }
+- return Just(result);
++ return Just(true);
+ }
+
+ } // namespace
+@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
+ Handle<Object> numeric_obj) {
+ DCHECK(numeric_obj->IsNumeric());
+
+- Maybe<icu::UnicodeString> maybe_format =
+- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
++ icu::number::FormattedNumber formatted;
++ Maybe<bool> maybe_format =
++ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
+ MAYBE_RETURN(maybe_format, Handle<String>());
+- return Intl::ToString(isolate, maybe_format.FromJust());
++ UErrorCode status = U_ZERO_ERROR;
++ icu::UnicodeString result = formatted.toString(status);
++ if (U_FAILURE(status)) {
++ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
++ }
++ return Intl::ToString(isolate, result);
+ }
+
+ namespace {
+@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
+ }
+
+ namespace {
+-Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+- icu::FieldPositionIterator* fp_iter,
++Maybe<int> ConstructParts(Isolate* isolate,
++ icu::number::FormattedNumber* formatted,
+ Handle<JSArray> result, int start_index,
+ Handle<Object> numeric_obj, bool style_is_unit) {
++ UErrorCode status = U_ZERO_ERROR;
++ icu::UnicodeString formatted_text = formatted->toString(status);
++ if (U_FAILURE(status)) {
++ THROW_NEW_ERROR_RETURN_VALUE(
++ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
++ }
+ DCHECK(numeric_obj->IsNumeric());
+- int32_t length = formatted.length();
++ int32_t length = formatted_text.length();
+ int index = start_index;
+ if (length == 0) return Just(index);
+
+@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+ // other region covers some part of the formatted string. It's possible
+ // there's another field with exactly the same begin and end as this backdrop,
+ // in which case the backdrop's field_id of -1 will give it lower priority.
+- regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
++ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
+
+ {
+- icu::FieldPosition fp;
+- while (fp_iter->next(fp)) {
+- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
+- fp.getEndIndex()));
++ icu::ConstrainedFieldPosition cfp;
++ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
++ while (formatted->nextPosition(cfp, status)) {
++ regions.push_back(
++ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
+ }
+ }
+
+@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+ Handle<String> substring;
+ ASSIGN_RETURN_ON_EXCEPTION_VALUE(
+ isolate, substring,
+- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
++ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
+ Nothing<int>());
+ Intl::AddElement(isolate, result, index, field_type_string, substring);
+ ++index;
+@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
+ number_format->icu_number_formatter().raw();
+ CHECK_NOT_NULL(fmt);
+
+- icu::FieldPositionIterator fp_iter;
+- Maybe<icu::UnicodeString> maybe_format =
+- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
++ icu::number::FormattedNumber formatted;
++ Maybe<bool> maybe_format =
++ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
+ MAYBE_RETURN(maybe_format, Handle<JSArray>());
+
+ Handle<JSArray> result = factory->NewJSArray(0);
+ Maybe<int> maybe_format_to_parts = ConstructParts(
+- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
++ isolate, &formatted, result, 0, numeric_obj,
+ number_format->style() == JSNumberFormat::Style::UNIT);
+ MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
index 84a5805b..d96fd9de 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta4.ebuild
@@ -78,7 +78,10 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
+PATCHES=(
+ "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+ "${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
+)
src_prepare() {
if ! use jumbo-build; then
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 84a5805b..7c6d8e1d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -78,7 +78,10 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
+PATCHES=(
+ "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+ "${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
+)
src_prepare() {
if ! use jumbo-build; then
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2020-02-28 20:34 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2020-02-28 20:34 UTC (permalink / raw
To: gentoo-commits
commit: d9ed3bbd57b1a44af65d7799b3e91682fec628cf
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 20:33:38 2020 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 20:33:38 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d9ed3bbd
dev-qt/qtwebengine: refactor fatal-warnings patch for 5.15.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
.../files/qtwebengine-5.15.0-disable-fatal-warnings.patch | 10 ++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch
new file mode 100644
index 00000000..af602855
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch
@@ -0,0 +1,10 @@
+--- a/src/buildtools/config/common.pri 2020-02-28 22:21:09.341072620 +0200
++++ b/src/buildtools/config/common.pri 2020-02-28 22:20:26.702399180 +0200
+@@ -25,6 +25,7 @@
+ strip_absolute_paths_from_debug_symbols=false \
+ toolkit_views=false \
+ treat_warnings_as_errors=false \
++ fatal_linker_warnings=false \
+ use_allocator_shim=false \
+ use_allocator=\"none\" \
+ use_custom_libcxx=false \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index 54714f0c..c468cea0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -77,7 +77,7 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=( "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" ) # bug 695446
+PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
src_prepare() {
if ! use jumbo-build; then
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2020-02-10 6:47 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2020-02-10 6:47 UTC (permalink / raw
To: gentoo-commits
commit: c451f62d808f3642fa25778a9d7895e1710b69f6
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Sat Feb 8 21:35:41 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 06:47:05 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c451f62d
dev-qt/qtwebengine: fix building on x86
Closes: https://bugs.gentoo.org/695446
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/14598
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.14.1-disable-fatal-warnings.patch | 12 ++++++++++++
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 2 ++
2 files changed, 14 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
new file mode 100644
index 00000000..40f1f5d6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
@@ -0,0 +1,12 @@
+diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
+index 97d3953..dd3d222 100644
+--- a/src/buildtools/config/common.pri
++++ b/src/buildtools/config/common.pri
+@@ -25,6 +25,7 @@ gn_args += \
+ v8_use_external_startup_data=false \
+ toolkit_views=false \
+ treat_warnings_as_errors=false \
++ fatal_linker_warnings=false \
+ safe_browsing_mode=0 \
+ optimize_webui=false \
+ forbid_non_component_debug_builds=false
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
index 2f92716a..c2229351 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
@@ -77,6 +77,8 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
+PATCHES=( "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" ) # bug 695446
+
src_prepare() {
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2019-10-29 23:54 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2019-10-29 23:54 UTC (permalink / raw
To: gentoo-commits
commit: eb95b42220ff63338858a7fc86624b8141f910bc
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 23:50:42 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 23:52:27 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=eb95b422
dev-qt/qtwebengine: update crash reporting patch
Replace 'no-kcrash-reporting' patch with an upstream fix, and drop
it from where it's no longer needed.
https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=73-based&id=ccfc032f
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
.../qtwebengine-5.13.1-disable-crash-reports.patch | 29 ++++++++++++++++++++++
.../qtwebengine-5.13.1-no-kcrash-reporting.patch | 18 --------------
dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 4 +--
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 5 ----
dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild | 2 --
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 5 ----
6 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-disable-crash-reports.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-disable-crash-reports.patch
new file mode 100644
index 00000000..c0a5941b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-disable-crash-reports.patch
@@ -0,0 +1,29 @@
+From ccfc032fb57e98936ad9dd08ad5e75845b9e74b8 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Tue, 2 Jul 2019 17:17:18 +0200
+Subject: FIXUP: Disable crash-reports when reporting is disabled
+
+Fix compilation issue because of unknown macro and flag,
+as enable_reporting feature is defined for net sub component.
+
+Change-Id: I451dc005fec66ddbf7a5c9de43eccfaafa2fe809
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/content/public/common/content_features.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chromium/content/public/common/content_features.cc b/chromium/content/public/common/content_features.cc
+index e14b7733d9b..ff3f58dc1fc 100644
+--- a/src/3rdparty/chromium/content/public/common/content_features.cc
++++ b/src/3rdparty/chromium/content/public/common/content_features.cc
+@@ -4,6 +4,7 @@
+
+ #include "content/public/common/content_features.h"
+ #include "build/build_config.h"
++#include "net/net_buildflags.h"
+
+ namespace features {
+
+--
+cgit v1.2.1
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch
deleted file mode 100644
index 6f66c262..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Signed-off-by: Nicholas Meyer <nickaristocrates@gmail.com>
-
---- a/src/3rdparty/chromium/content/public/common/content_features.cc 2019-10-10 22:59:16.733542336 -0700
-+++ b/src/3rdparty/chromium/content/public/common/content_features.cc 2019-10-10 22:59:03.675634565 -0700
-@@ -119,12 +119,7 @@
- // Enables crash reporting via Reporting API.
- // https://www.w3.org/TR/reporting/#crash-report
- const base::Feature kCrashReporting{"CrashReporting",
--#if BUILDFLAG(ENABLE_REPORTING)
-- base::FEATURE_ENABLED_BY_DEFAULT
--#else
-- base::FEATURE_DISABLED_BY_DEFAULT
--#endif
--};
-+ base::FEATURE_DISABLED_BY_DEFAULT};
-
- // Enables specification of a target element in the fragment identifier
- // via a CSS selector.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
index 39f64d63..c606a80b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
@@ -83,8 +83,8 @@ PATCHES+=(
"${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
# QTBUG-76963, 5.13 branch:
"${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch"
- # bug 693668, upstream(?) TODO:
- "${FILESDIR}/${P}-no-kcrash-reporting.patch"
+ # bug 693668
+ "${FILESDIR}/${P}-disable-crash-reports.patch"
)
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index f22df0e5..3ec1fb34 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -78,11 +78,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=(
- # bug 693668, upstream(?) TODO:
- "${FILESDIR}/${PN}-5.13.1-no-kcrash-reporting.patch"
-)
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild
index 8ef8814c..7033c9fc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild
@@ -80,8 +80,6 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${P}-icu-65.patch"
- # bug 693668, upstream(?) TODO:
- "${FILESDIR}/${PN}-5.13.1-no-kcrash-reporting.patch"
)
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
index 35adda04..13940d0b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
@@ -78,11 +78,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=(
- # bug 693668, upstream(?) TODO:
- "${FILESDIR}/${PN}-5.13.1-no-kcrash-reporting.patch"
-)
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2019-09-30 19:28 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2019-09-30 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 02acf820c8992ba17f93c5f3b36baf31e5ddddcf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 19:27:42 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 19:27:42 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=02acf820
dev-qt/qtwebengine: Fix build with >=media-sound/pulseaudio-13.0
Closes: https://bugs.gentoo.org/694960
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.13.1-pulseaudio-13.patch | 89 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 1 +
2 files changed, 90 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-pulseaudio-13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-pulseaudio-13.patch
new file mode 100644
index 00000000..af1a39ec
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-pulseaudio-13.patch
@@ -0,0 +1,89 @@
+From b84e8682b312fb16b16ffb9591415067ceae69f8 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Mon, 23 Sep 2019 13:49:53 +0200
+Subject: [PATCH] Fix building with pulseaudio 13
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+The function signature changed though the ABI stayed the same.
+
+Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876
+Fixes: QTBUG-77037
+Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
+---
+ src/3rdparty/chromium/media/audio/pulse/pulse.sigs | 16 ++++++++--------
+ src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment | 11 +++++++++++
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/src/3rdparty/chromium/media/audio/pulse/pulse.sigs b/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+index 8b5888786a9..daaeb149c13 100644
+--- a/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
++++ b/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
+ pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
+ pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
+ pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
+-pa_context_state_t pa_context_get_state(pa_context* c);
++pa_context_state_t pa_context_get_state(const_pa_context_ptr c);
+ pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
+ pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
+ void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
+-pa_operation_state_t pa_operation_get_state(pa_operation* o);
++pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o);
+ void pa_context_unref(pa_context* c);
+ void pa_operation_unref(pa_operation* o);
+ int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
+@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
+ int pa_stream_disconnect(pa_stream* s);
+ int pa_stream_drop(pa_stream *p);
+ pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
+-uint32_t pa_stream_get_device_index(pa_stream* s);
++uint32_t pa_stream_get_device_index(const_pa_stream_ptr s);
+ int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
+-pa_stream_state_t pa_stream_get_state(pa_stream* p);
++pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p);
+ pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map);
+ pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
+ pa_proplist* pa_proplist_new(void);
+-int pa_proplist_contains(pa_proplist* p, const char* key);
++int pa_proplist_contains(const_pa_proplist_ptr p, const char* key);
+ void pa_proplist_free(pa_proplist* p);
+-const char* pa_proplist_gets(pa_proplist* p, const char* key);
++const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key);
+ int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
+-size_t pa_stream_readable_size(pa_stream *p);
++size_t pa_stream_readable_size(const_pa_stream_ptr p);
+ int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
+ void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
+ void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
+ int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
+ void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
+ void pa_stream_unref(pa_stream* s);
+-int pa_context_errno(pa_context *c);
++int pa_context_errno(const_pa_context_ptr c);
+ const char* pa_strerror(int error);
+ pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v);
+diff --git a/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment b/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
+index 2a2d3e7552b..cdaa841b29f 100644
+--- a/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
++++ b/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
+@@ -5,4 +5,15 @@ extern "C" {
+
+ #include <pulse/pulseaudio.h>
+
++#if PA_MAJOR > 12
++typedef const pa_context* const_pa_context_ptr;
++typedef const pa_operation* const_pa_operation_ptr;
++typedef const pa_proplist* const_pa_proplist_ptr;
++typedef const pa_stream* const_pa_stream_ptr;
++#else
++typedef pa_context* const_pa_context_ptr;
++typedef pa_operation* const_pa_operation_ptr;
++typedef pa_proplist* const_pa_proplist_ptr;
++typedef pa_stream* const_pa_stream_ptr;
++#endif
+ }
+--
+2.16.3
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
index dcdec942..8e40a949 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
@@ -79,6 +79,7 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
+ "${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
# QTBUG-76963, not yet upstream:
"${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch"
)
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2019-03-16 22:39 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2019-03-16 22:39 UTC (permalink / raw
To: gentoo-commits
commit: 7122efed47bb1e5db727c80a9f3004b4fe64b881
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 22:35:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 22:35:23 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7122efed
dev-qt/qtwebengine: Drop upstreamed patch
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.12.1-CVE-2019-5786.patch | 29 ----------------------
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 2 --
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 -
4 files changed, 33 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.1-CVE-2019-5786.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.1-CVE-2019-5786.patch
deleted file mode 100644
index 5dbc6172..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.1-CVE-2019-5786.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Bug: https://bugs.gentoo.org/679530
-# Chromium Gerrit: https://chromium-review.googlesource.com/c/chromium/src/+/1495209
-
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
-@@ -143,14 +143,16 @@
- if (!raw_data_ || error_code_ != FileErrorCode::kOK)
- return nullptr;
-
-- DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-- if (finished_loading_) {
-- array_buffer_result_ = result;
-- AdjustReportedMemoryUsageToV8(
-- -1 * static_cast<int64_t>(raw_data_->ByteLength()));
-- raw_data_.reset();
-+ if (!finished_loading_) {
-+ return DOMArrayBuffer::Create(
-+ ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength()));
- }
-- return result;
-+
-+ array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
-+ AdjustReportedMemoryUsageToV8(-1 *
-+ static_cast<int64_t>(raw_data_->ByteLength()));
-+ raw_data_.reset();
-+ return array_buffer_result_;
- }
-
- String FileReaderLoader::StringResult() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 50e3c61c..48fcb535 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -81,7 +81,6 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
- "${FILESDIR}/${PN}-5.12.1-CVE-2019-5786.patch" # bug 679530
)
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index 2b24b481..cff56886 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.12.1-CVE-2019-5786.patch" ) # bug 679530
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index fbf405c6..220936d4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -81,7 +81,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch"
- "${FILESDIR}/${PN}-5.12.1-CVE-2019-5786.patch" # bug 679530
)
src_prepare() {
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2019-02-05 20:38 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2019-02-05 20:38 UTC (permalink / raw
To: gentoo-commits
commit: a4671abbefea45730d7e8204ce4e8f510069e7c7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 5 20:35:21 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 5 20:35:21 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a4671abb
dev-qt/qtwebengine: Drop broken gcc8 patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../qtwebengine/files/qtwebengine-5.9.6-gcc8.patch | 24 ----------------------
dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 3 +--
3 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch
deleted file mode 100644
index ba6a49fd..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Fedora
-Subject: Fix build for 32-bit platforms
-
-Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source?
-https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch
-
-diff -up chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h
---- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400
-+++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400
-@@ -18,7 +18,13 @@
- #endif
-
- // Like the C++11 |alignof| operator.
--#if __cplusplus >= 201103L
-+#if defined(__GNUC__) && __GNUC__ >= 8
-+// GCC 8 has changed the alignof operator to return the minimal alignment
-+// required by the target ABI, instead of the preferred alignment.
-+// This means that on 32-bit x86, it will return 4 instead of 8.
-+// Use __alignof__ instead to avoid this.
-+#define MOJO_ALIGNOF(type) __alignof__(type)
-+#elif __cplusplus >= 201103L
- #define MOJO_ALIGNOF(type) alignof(type)
- #elif defined(__GNUC__)
- #define MOJO_ALIGNOF(type) __alignof__(type)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild
index 2fb3f7b6..48fcb535 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild
@@ -80,7 +80,6 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
- "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 232f3195..48fcb535 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -80,7 +80,6 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
- "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
)
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2019-02-04 18:40 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2019-02-04 18:40 UTC (permalink / raw
To: gentoo-commits
commit: bf2b3bb1663224ea5a711de4be9d972352002d2b
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 4 18:38:31 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Feb 4 18:39:20 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bf2b3bb1
dev-qt/qtwebengine: fix build with USE="system-icu"
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
.../files/qtwebengine-5.13.0-fixup-system-icu.patch | 17 +++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 ++
3 files changed, 21 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch
new file mode 100644
index 00000000..e7fb9f81
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch
@@ -0,0 +1,17 @@
+From https://codereview.qt-project.org/#/c/251995/
+
+--- a/src/3rdparty/chromium/url/url_idna_icu.cc
++++ b/src/3rdparty/chromium/url/url_idna_icu.cc
+@@ -86,8 +86,10 @@ bool IDNToASCII(const base::char16* src, int src_len, CanonOutputW* output) {
+ while (true) {
+ UErrorCode err = U_ZERO_ERROR;
+ UIDNAInfo info = UIDNA_INFO_INITIALIZER;
+- int output_length = uidna_nameToASCII(uidna, src, src_len, output->data(),
+- output->capacity(), &info, &err);
++ int output_length = uidna_nameToASCII(uidna,
++ reinterpret_cast<const UChar*>(src), src_len,
++ reinterpret_cast<UChar*>(output->data()), output->capacity(),
++ &info, &err);
+ if (U_SUCCESS(err) && info.errors == 0) {
+ output->set_length(output_length);
+ return true;
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
index cff56886..ff148cf7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild
@@ -79,6 +79,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch" )
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index cff56886..ff148cf7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -79,6 +79,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch" )
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2018-10-31 19:29 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2018-10-31 19:29 UTC (permalink / raw
To: gentoo-commits
commit: 141357aad041fd74e847dbd07af29b09159022b1
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 31 19:20:50 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 19:24:05 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=141357aa
dev-qt/qtwebengine: sync with the main Gentoo repo tree
- Add patch for GCC-8 (https://bugs.gentoo.org/657124).
- Remove 'net-libs/libsrtp' DEPEND
(https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c290ff).
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../qtwebengine/files/qtwebengine-5.9.6-gcc8.patch | 24 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 3 ++-
5 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch
new file mode 100644
index 00000000..ba6a49fd
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch
@@ -0,0 +1,24 @@
+From: Fedora
+Subject: Fix build for 32-bit platforms
+
+Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source?
+https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch
+
+diff -up chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h
+--- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400
++++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400
+@@ -18,7 +18,13 @@
+ #endif
+
+ // Like the C++11 |alignof| operator.
+-#if __cplusplus >= 201103L
++#if defined(__GNUC__) && __GNUC__ >= 8
++// GCC 8 has changed the alignof operator to return the minimal alignment
++// required by the target ABI, instead of the preferred alignment.
++// This means that on 32-bit x86, it will return 4 instead of 8.
++// Use __alignof__ instead to avoid this.
++#define MOJO_ALIGNOF(type) __alignof__(type)
++#elif __cplusplus >= 201103L
+ #define MOJO_ALIGNOF(type) alignof(type)
+ #elif defined(__GNUC__)
+ #define MOJO_ALIGNOF(type) __alignof__(type)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index c3ed341b..57fa9ada 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -40,7 +40,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/opus
- net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
@@ -80,6 +79,7 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
+ "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 4a62001c..2a34a526 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -40,7 +40,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/opus
- net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
@@ -79,6 +78,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 65a2d764..2b521acd 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -38,7 +38,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/opus
- net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
@@ -81,6 +80,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
"${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
+ "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
)
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 4a62001c..2a34a526 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -40,7 +40,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/opus
- net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
@@ -79,6 +78,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2018-09-21 11:26 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2018-09-21 11:26 UTC (permalink / raw
To: gentoo-commits
commit: b858236bcaf2dfacdeb7c9e129ad71b24d44f35f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 11:25:48 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 11:25:48 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b858236b
dev-qt/qtwebengine: remove upstreamed libxml catalog patch
With 5.9999 no longer needing this, it can be fully removed.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch | 12 ------------
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 +----
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch
deleted file mode 100644
index 5fd14b0d..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/config.tests/xml2/xml2.cpp
-+++ b/config.tests/xml2/xml2.cpp
-@@ -27,9 +27,6 @@
- ****************************************************************************/
-
- #include <libxml/xmlversion.h>
--#if defined(LIBXML_CATALOG_ENABLED)
--#error "libxml catalog enabled"
--#endif
- #if !defined(LIBXML_ICU_ENABLED)
- #error "libxml icu not enabled"
- #endif
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 63a7df36..4fab7ab9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -79,10 +79,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=(
- "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
- "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch"
-)
+PATCHES+=( "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2018-08-25 4:32 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2018-08-25 4:32 UTC (permalink / raw
To: gentoo-commits
commit: 6cd461df4b6a107915a66bbe4ba3752f97b4056f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 04:31:35 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 04:31:35 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6cd461df
dev-qt/qtwebengine: add USE="system-libvpx"
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../qtwebengine-5.12.0-add-libvpx-options.patch | 20 ++++++++++++++++++++
dev-qt/qtwebengine/metadata.xml | 2 ++
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 8 ++++++--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 8 ++++++--
4 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch
new file mode 100644
index 00000000..fd278fe7
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch
@@ -0,0 +1,20 @@
+--- a/src/core/configure.json 2018-08-17 19:00:05.269528234 +0300
++++ b/src/core/configure.json 2018-08-17 19:01:31.444789488 +0300
+@@ -24,6 +24,7 @@
+ "webengine-geolocation": "boolean",
+ "webengine-v8-snapshot": "boolean",
+ "webengine-webchannel": "boolean",
++ "webengine-libvpx": { "type": "enum", "name": "webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } },
+ "alsa": { "type": "boolean", "name": "webengine-alsa" },
+ "pulseaudio": { "type": "boolean", "name": "webengine-pulseaudio" },
+ "ffmpeg": { "type": "enum", "name": "webengine-system-ffmpeg", "values": { "system": "yes", "qt": "no" } },
+@@ -33,7 +34,8 @@
+ "printing-and-pdf": { "type": "boolean", "name": "webengine-printing-and-pdf" },
+ "proprietary-codecs": { "type": "boolean", "name": "webengine-proprietary-codecs" },
+ "spellchecker": { "type": "boolean", "name": "webengine-spellchecker" },
+- "webrtc": { "type": "boolean", "name": "webengine-webrtc" }
++ "webrtc": { "type": "boolean", "name": "webengine-webrtc" },
++ "libvpx": { "type": "enum", "name": "webengine-system-libvpx", "values": { "system": "yes", "qt": "no" } }
+ }
+ },
+
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index acca7340..429513db 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -16,6 +16,8 @@
instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
instead of bundled.</flag>
+ <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
+ instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
</use>
<upstream>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 3b0d387a..63a7df36 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+ +system-ffmpeg +system-icu +system-libvpx widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078
+PATCHES+=(
+ "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch"
+)
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
@@ -121,6 +124,7 @@ src_configure() {
$(usex pulseaudio '-pulseaudio' '')
$(usex system-ffmpeg '-ffmpeg' '')
$(usex system-icu '-webengine-icu' '')
+ $(usex system-libvpx '-system-webengine-libvpx' '-qt-webengine-libvpx')
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 3b0d387a..63a7df36 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+ +system-ffmpeg +system-icu +system-libvpx widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078
+PATCHES+=(
+ "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch"
+)
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
@@ -121,6 +124,7 @@ src_configure() {
$(usex pulseaudio '-pulseaudio' '')
$(usex system-ffmpeg '-ffmpeg' '')
$(usex system-icu '-webengine-icu' '')
+ $(usex system-libvpx '-system-webengine-libvpx' '-qt-webengine-libvpx')
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2018-08-24 22:58 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2018-08-24 22:58 UTC (permalink / raw
To: gentoo-commits
commit: 02166c221b4f60cafef3e1b3499de924ad583a25
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 22:54:00 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 22:54:48 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=02166c22
dev-qt/qtwebengine: update libxml catalogs patches
The Chromium part has been upstreamed, and is no longer needed in
5.11.2 nor in 5.12.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
...webengine-5.11.1-libxml2-disable-catalogs.patch | 35 ----------------------
...webengine-5.11.2-libxml2-disable-catalogs.patch | 12 ++++++++
...webengine-5.12.0-libxml2-disable-catalogs.patch | 35 ----------------------
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
6 files changed, 15 insertions(+), 73 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
deleted file mode 100644
index 7e0efcf3..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/config.tests/xml2/xml2.cpp
-+++ b/config.tests/xml2/xml2.cpp
-@@ -27,9 +27,6 @@
- ****************************************************************************/
-
- #include <libxml/xmlversion.h>
--#if defined(LIBXML_CATALOG_ENABLED)
--#error "libxml catalog enabled"
--#endif
- #if !defined(LIBXML_ICU_ENABLED)
- #error "libxml icu not enabled"
- #endif
---- a/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp
-@@ -28,6 +28,10 @@
-
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-+#include <libxml/xmlversion.h>
-+#if defined(LIBXML_CATALOG_ENABLED)
-+#include <libxml/catalog.h>
-+#endif
- #include <libxslt/xslt.h>
- #include <memory>
- #include "core/css/StyleEngine.h"
-@@ -646,6 +650,9 @@
- if (did_init)
- return;
-
-+#if defined(LIBXML_CATALOG_ENABLED)
-+ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-+#endif
- xmlInitParser();
- xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
- xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch
new file mode 100644
index 00000000..5fd14b0d
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-libxml2-disable-catalogs.patch
@@ -0,0 +1,12 @@
+--- a/config.tests/xml2/xml2.cpp
++++ b/config.tests/xml2/xml2.cpp
+@@ -27,9 +27,6 @@
+ ****************************************************************************/
+
+ #include <libxml/xmlversion.h>
+-#if defined(LIBXML_CATALOG_ENABLED)
+-#error "libxml catalog enabled"
+-#endif
+ #if !defined(LIBXML_ICU_ENABLED)
+ #error "libxml icu not enabled"
+ #endif
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch
deleted file mode 100644
index 6093b145..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/config.tests/xml2/xml2.cpp
-+++ b/config.tests/xml2/xml2.cpp
-@@ -27,9 +27,6 @@
- ****************************************************************************/
-
- #include <libxml/xmlversion.h>
--#if defined(LIBXML_CATALOG_ENABLED)
--#error "libxml catalog enabled"
--#endif
- #if !defined(LIBXML_ICU_ENABLED)
- #error "libxml icu not enabled"
- #endif
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc
-@@ -28,6 +28,10 @@
-
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-+#include <libxml/xmlversion.h>
-+#if defined(LIBXML_CATALOG_ENABLED)
-+#include <libxml/catalog.h>
-+#endif
- #include <libxslt/xslt.h>
-
- #include <memory>
-@@ -646,6 +650,9 @@ static void InitializeLibXMLIfNecessary() {
- if (did_init)
- return;
-
-+#if defined(LIBXML_CATALOG_ENABLED)
-+ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE);
-+#endif
- xmlInitParser();
- xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc);
- xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 32fb11c5..c3b6285f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -79,7 +79,7 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
- "${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" # bug 653078
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 91c3f9fb..7c793ad2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -78,7 +78,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" ) # bug 653078
+PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 91c3f9fb..7c793ad2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -78,7 +78,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" ) # bug 653078
+PATCHES+=( "${FILESDIR}/${PN}-5.11.2-libxml2-disable-catalogs.patch" ) # bug 653078
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2018-06-16 18:06 Andreas Sturmlechner
0 siblings, 0 replies; 32+ messages in thread
From: Andreas Sturmlechner @ 2018-06-16 18:06 UTC (permalink / raw
To: gentoo-commits
commit: 2cc6a49343586a8f067e0c62819ad1155a229368
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 14 22:17:53 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 18:00:39 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2cc6a493
dev-qt/qtwebengine: Drop upstreamed icu patch from 5.9 branch
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ----------------
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 1 -
2 files changed, 17 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
deleted file mode 100644
index 9866ab92..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with >=ICU-60
-
-Bug: https://bugs.gentoo.org/639220
-Bug: https://bugreports.qt.io/browse/QTBUG-64925
-
---- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-+++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-@@ -488,7 +488,7 @@
- // are added to the allowed set. The list has to be updated when a new
- // version of Unicode is released. The current version is 9.0.0 and ICU 60
- // will have Unicode 10.0 data.
--#if U_ICU_VERSION_MAJOR_NUM < 60
-+#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
- const icu::UnicodeSet aspirational_scripts(
- icu::UnicodeString(
- // Unified Canadian Syllabics
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 97480393..1cfd7f69 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -78,7 +78,6 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch"
"${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
"${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
)
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2018-04-11 12:56 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2018-04-11 12:56 UTC (permalink / raw
To: gentoo-commits
commit: 10100ed92d119e229b38ba0236e85f3123a5b9ab
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 11 12:51:29 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 12:51:29 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=10100ed9
dev-qt/qtwebengine: move patches around
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-qt/qtwebengine/Manifest | 2 +-
| 102 +++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 6 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 +-
4 files changed, 107 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ff7af173..2312c90e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,5 @@
DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
-DIST qtwebengine-5.11.0-icu-patches.tar.bz2 7598 BLAKE2B 4cb72bf71eba67bcbceee5e35b75b19664e0e4027e24e722d159dde1d8741d8621647c5aa7d7298e5e7209800945eadae9f203d59a604481c2c09f99578347ed SHA512 50fa38962ef5203b2fc1f6df0bca8acebc18c26579077cb090dc7f14ad9def39a1325644e66a83dd52cd7943053fc0c6894a00f6939443c34961620ac93c3dd5
+DIST qtwebengine-5.11.0-system-icu-patch.tar.bz2 6661 BLAKE2B e15ab9af0adedbf1da55d53f2e671026f3db4aca848fb8f7a821215c17a3bd51725c23a1e8504a24cbceb37736d0135df926282161f06f2e8c9e340671863c4b SHA512 2b46533c0b23b9ed6c8fa13eb579e21fb1b06019bfe7d79cf277a2e32fad8a5265df2905898ffec2a075d0252435937001fb6355035c71f1a4e34f812836a359
DIST qtwebengine-5.11.0_beta2-icu-patches.tar.bz2 6781 BLAKE2B 921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c SHA512 b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
DIST qtwebengine-everywhere-src-5.10.1.tar.xz 209844952 BLAKE2B 4a9ac3a5a931c239b0eac949d6d52e22f7752ece4ba08126d0be2509b43b36ebebd1fbf3d1c9076e05fb866caea9bc00d902864a496e6f50cc367cee86602618 SHA512 dc1b15eb857cb9ff3ef98a2f90cfec8c40429eea292bbed6a323cf1c4b044f3b73efaf51833fe8d9ca2ecc4f99d7092590a1a34248a9ab14fa5a38d4335f4925
DIST qtwebengine-everywhere-src-5.11.0-beta2.tar.xz 221511360 BLAKE2B 4bb8ee10ea760c59518d0d411de29b51a9cfd95e8b2a78f7e1cfadcb5de8ffa9443f2a2518fc1defa086582df1767a74107f2e64bc6d1a623983cc468a42a598 SHA512 09589759792336e0483d8cd908760f7c9435b218f05d125867d3fdf85e21a2edf4f5fe17509a6b7f64be3012c631adaa5e2ae62c53ec736d0008a12b5388ac9c
--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 00000000..e5e38312
--- /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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index edbb26bd..32064b19 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -11,10 +11,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
-)"
-
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
@@ -84,7 +80,7 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
- PATCHES+=( "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch" )
+ 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
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 85042ae6..0fc2f021 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
- https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
+ https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
@@ -85,8 +85,8 @@ src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
PATCHES+=(
- "${WORKDIR}/${PN}-5.11.0-system-icu-build.patch"
- "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
+ "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch"
+ "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch"
)
# bug 620444 - ensure local headers are used
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2017-12-09 23:02 Jimi Huotari
0 siblings, 0 replies; 32+ messages in thread
From: Jimi Huotari @ 2017-12-09 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 9fc33af6d26ab78fa51e4570e972502cad3bb9ee
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 16:16:15 2017 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 16:18:51 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9fc33af6
dev-qt/qtwebengine: remove unneeded patch
The ICU 60.1 patch is not needed, nor does it apply on 5.9999/5.10.
Package-Manager: Portage-2.3.17, Repoman-2.3.6
.../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ----------------
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 --
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 --
3 files changed, 20 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
deleted file mode 100644
index 9866ab92..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with >=ICU-60
-
-Bug: https://bugs.gentoo.org/639220
-Bug: https://bugreports.qt.io/browse/QTBUG-64925
-
---- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-+++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
-@@ -488,7 +488,7 @@
- // are added to the allowed set. The list has to be updated when a new
- // version of Unicode is released. The current version is 9.0.0 and ICU 60
- // will have Unicode 10.0 data.
--#if U_ICU_VERSION_MAJOR_NUM < 60
-+#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
- const icu::UnicodeSet aspirational_scripts(
- icu::UnicodeString(
- // Unified Canadian Syllabics
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 2b51fbf7..2c0bd638 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -73,8 +73,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 2b51fbf7..2c0bd638 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -73,8 +73,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
-
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2017-06-04 5:10 Michael Palimaka
0 siblings, 0 replies; 32+ messages in thread
From: Michael Palimaka @ 2017-06-04 5:10 UTC (permalink / raw
To: gentoo-commits
commit: 72e078089f97f5aabec840c840c875af22d345ad
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 05:10:00 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 05:10:11 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=72e07808
dev-qt/qtwebengine: port fix detecting audio backends from main repo
e146460dfde8972861dae5099f45e9dee5da2b6b by Jimi Huotari <chiitoo <AT> gentoo.org>
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../qtwebengine-5.7.1-fix-audio-detection.patch | 23 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 8 ++++++--
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 8 ++++++--
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 8 ++++++--
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 8 ++++++--
5 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch
new file mode 100644
index 00000000..597554e6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-fix-audio-detection.patch
@@ -0,0 +1,23 @@
+# dev-qt/qtwebengine: Fix detecting audio backends.
+
+# The upstream change doesn't really work for us, so we'll make
+# it work with us.
+# Gentoo-Bug: https://bugs.gentoo.org/603498
+
+--- /src/core/config/linux.pri 2016-12-23 00:05:41.057955774 +0200
++++ /src/core/config/linux.pri 2016-12-23 00:09:39.000573909 +0200
+@@ -35,12 +35,12 @@
+ contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
+ contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
+ contains(QT_CONFIG, system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1
+-contains(QT_CONFIG, pulseaudio) {
++use?(pulseaudio) {
+ GYP_CONFIG += use_pulseaudio=1
+ } else {
+ GYP_CONFIG += use_pulseaudio=0
+ }
+-contains(QT_CONFIG, alsa) {
++use?(alsa) {
+ GYP_CONFIG += use_alsa=1
+ } else {
+ GYP_CONFIG += use_alsa=0
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 601e8685..487e68d8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
media-libs/freetype
@@ -57,7 +56,9 @@ RDEPEND="
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/qtwidgets-${PV} )
@@ -72,6 +73,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
+ "${FILESDIR}/${PN}-5.7.1-fix-audio-detection.patch"
"${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
"${FILESDIR}/${PN}-5.7.0-icu58.patch"
"${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch"
@@ -99,7 +101,9 @@ src_configure() {
export NINJAOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
local myqmakeargs=(
+ $(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex pulseaudio 'WEBENGINE_CONFIG+=use_pulseaudio' '')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
$(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index 473bf57a..f4fb9799 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
media-libs/freetype
@@ -57,7 +56,9 @@ RDEPEND="
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/qtwidgets-${PV} )
@@ -74,6 +75,9 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ qt_use_disable_config alsa alsa src/core/config/linux.pri
+ qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 473bf57a..f4fb9799 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
media-libs/freetype
@@ -57,7 +56,9 @@ RDEPEND="
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/qtwidgets-${PV} )
@@ -74,6 +75,9 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ qt_use_disable_config alsa alsa src/core/config/linux.pri
+ qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 473bf57a..f4fb9799 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
- media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
media-libs/freetype
@@ -57,7 +56,9 @@ RDEPEND="
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/qtwidgets-${PV} )
@@ -74,6 +75,9 @@ DEPEND="${RDEPEND}
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ qt_use_disable_config alsa alsa src/core/config/linux.pri
+ qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2016-12-06 8:21 Michael Palimaka
0 siblings, 0 replies; 32+ messages in thread
From: Michael Palimaka @ 2016-12-06 8:21 UTC (permalink / raw
To: gentoo-commits
commit: feea681af8f400fca9cfa3e600cfb585c6aa845b
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Dec 6 07:37:50 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 08:21:45 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=feea681a
dev-qt/qtwebengine: Add patches.
qtwebengine-5.7.0-fix-system-ffmpeg.patch undefines FF_API_CONVERGENCE_DURATION,
which should only be defined when not using the system ffmpeg. This causes
segmentation faults at runtime with FFMPEG 3.x
qtwebengine-5.7.0-icu58.patch is adapted from
www-client/chromium/files/chromium-icu-58.patch
qtwebengine-5.7.0-undef-madv_free.patch is adapted from
http://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=fa8cdb3a32c377b6290d0a92d2522186bcd48293
Gentoo-Bug: 599094
Package-Manager: portage-2.3.2
.../qtwebengine-5.7.0-fix-system-ffmpeg.patch | 13 ++++++
.../files/qtwebengine-5.7.0-icu58.patch | 51 ++++++++++++++++++++++
.../files/qtwebengine-5.7.0-undef-madv_free.patch | 33 ++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 6 +++
dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 5 +++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 +++
6 files changed, 113 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch
new file mode 100644
index 0000000..71881e0
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-fix-system-ffmpeg.patch
@@ -0,0 +1,13 @@
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:01:20.929772871 -0800
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2016-11-23 13:02:18.879462854 -0800
+@@ -24,7 +24,9 @@
+ // Disable deprecated features which result in spammy compile warnings. This
+ // list of defines must mirror those in the 'defines' section of BUILD.gn file &
+ // ffmpeg.gyp file or the headers below will generate different structures!
++#if !defined(USE_SYSTEM_FFMPEG)
+ #define FF_API_CONVERGENCE_DURATION 0
++#endif
+ // Upstream libavcodec/utils.c still uses the deprecated
+ // av_dup_packet(), causing deprecation warnings.
+ // The normal fix for such things is to disable the feature as below,
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch
new file mode 100644
index 0000000..ced5367
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-icu58.patch
@@ -0,0 +1,51 @@
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:07:38.680665385 -0800
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:12:17.564001354 -0800
+@@ -26,6 +26,9 @@
+ #include "wtf/StdLibExtras.h"
+ #include "wtf/text/CharacterNames.h"
+
++#include <unicode/uchar.h>
++#include <unicode/uvernum.h>
++
+ namespace blink {
+
+ unsigned numGraphemeClusters(const String& string)
+@@ -122,13 +125,18 @@
+ { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL
+ };
+
++#if U_ICU_VERSION_MAJOR_NUM >= 58
++#define BA_LB_COUNT (U_LB_COUNT - 3)
++#else
++#define BA_LB_COUNT U_LB_COUNT
++#endif
+ // Line breaking table for CSS word-break: break-all. This table differs from
+ // asciiLineBreakTable in:
+ // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking
+ // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties
+ // - 1 indicates additional break opportunities. 0 indicates to fallback to
+ // normal line break, not "prohibit break."
+-static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = {
++static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = {
+ // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI
+ { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX
+ { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI
+@@ -178,7 +186,7 @@
+ #undef AL
+
+ static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent");
+-static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
++static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent");
+
+ static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh)
+ {
+@@ -209,7 +217,7 @@
+
+ static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak)
+ {
+- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) {
++ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) {
+ const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak];
+ return tableRow[lineBreak / 8] & (1 << (lineBreak % 8));
+ }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
new file mode 100644
index 0000000..193e713
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.0-undef-madv_free.patch
@@ -0,0 +1,33 @@
+From fa8cdb3a32c377b6290d0a92d2522186bcd48293 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+Date: Tue, 9 Aug 2016 16:21:29 +0200
+Subject: Do not depend on Linux 4.5
+
+Avoid using MADV_FREE that was only recently added to Linux. It will fail when
+run on older Linux kernels.
+
+Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0
+Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
+---
+ chromium/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
+index 12c9a7b..1639013 100644
+--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
+@@ -39,6 +39,11 @@
+
+ #include <sys/mman.h>
+
++#if OS(LINUX) && defined(MADV_FREE)
++// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
++#undef MADV_FREE
++#endif
++
+ #ifndef MADV_FREE
+ #define MADV_FREE MADV_DONTNEED
+ #endif
+--
+cgit v1.0-4-g1e03
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 475ef9e..62b4112 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -71,6 +71,12 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
+ "${FILESDIR}/${PN}-5.7.0-icu58.patch"
+ "${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch"
+)
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
index 475ef9e..bcc8e36 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
+ "${FILESDIR}/${PN}-5.7.0-icu58.patch"
+)
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 475ef9e..bcc8e36 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
+ "${FILESDIR}/${PN}-5.7.0-icu58.patch"
+)
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2016-12-06 7:24 Michael Palimaka
0 siblings, 0 replies; 32+ messages in thread
From: Michael Palimaka @ 2016-12-06 7:24 UTC (permalink / raw
To: gentoo-commits
commit: 5ba6b2a0be445e551d764fa8ced1f0e3d9447f61
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Dec 6 07:23:38 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 07:24:39 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5ba6b2a0
dev-qt/qtwebengine: Fix on PaX kernels
Gentoo-Bug: 579712
Gentoo-Bug: 582558
Package-Manager: portage-2.3.2
.../files/qtwebengine-paxmark-mksnapshot.patch | 46 ++++++++++++++++++++++
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 13 +++++-
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 13 +++++-
dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild | 13 +++++-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 13 +++++-
6 files changed, 91 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
new file mode 100644
index 0000000..c71cedc
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
@@ -0,0 +1,46 @@
+--- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100
++++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000
+@@ -33,6 +33,7 @@
+ 'embed_script%': "",
+ 'v8_extra_library_files%': [],
+ 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+ 'remove_v8base_debug_symbols%': 0,
+ },
+ 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
+@@ -1913,7 +1914,7 @@
+ ]
+ },
+ {
+- 'target_name': 'mksnapshot',
++ 'target_name': 'mksnapshot_u',
+ 'type': 'executable',
+ 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
+ 'include_dirs+': [
+@@ -1936,5 +1937,26 @@
+ }],
+ ],
+ },
++ {
++ 'target_name': 'mksnapshot',
++ 'type': 'executable',
++ 'dependencies': ['mksnapshot_u'],
++ 'actions': [
++ {
++ 'action_name': 'paxmark_m_mksnapshot',
++ 'inputs': [
++ '<(mksnapshot_u_exec)',
++ ],
++ 'outputs': [
++ '<(mksnapshot_exec)',
++ ],
++ 'action': [
++ 'sh',
++ '-c',
++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)',
++ ],
++ },
++ ],
++ },
+ ],
+ }
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 881cc17..9c08bb1 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
+ <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index dbd3eea..475ef9e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -68,9 +68,12 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
+ pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+
if use system-icu; then
# ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
@@ -95,3 +98,9 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index dbd3eea..475ef9e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -68,9 +68,12 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
+ pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+
if use system-icu; then
# ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
@@ -95,3 +98,9 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
index dbd3eea..475ef9e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.8.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -68,9 +68,12 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
+ pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+
if use system-icu; then
# ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
@@ -95,3 +98,9 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index dbd3eea..475ef9e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
fi
-IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
RDEPEND="
app-arch/snappy
@@ -68,9 +68,12 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
+ pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+
if use system-icu; then
# ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
@@ -95,3 +98,9 @@ src_configure() {
)
qt5-build_src_configure
}
+
+src_install() {
+ qt5-build_src_install
+
+ pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2016-05-08 1:28 Davide Pesavento
0 siblings, 0 replies; 32+ messages in thread
From: Davide Pesavento @ 2016-05-08 1:28 UTC (permalink / raw
To: gentoo-commits
commit: 841314d1b7527983d04195a33ca469bec11249ee
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 01:28:23 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 8 01:28:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=841314d1
dev-qt/qtwebengine: sync
Package-Manager: portage-2.2.28
.../qtwebengine/files/qtwebengine-5.6.0-icu.patch | 15 --------------
dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild | 22 +++++++++++---------
dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild | 24 ++++++++++++----------
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 24 ++++++++++++----------
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 24 +++++++++++-----------
5 files changed, 50 insertions(+), 59 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch
deleted file mode 100644
index 0b367c7..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Solves issue with trying to locate icudtl.dat in /usr/share/qt5/ when built
-with system-icu.
-
-Patch from Fedora.
-
---- a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -40,6 +40,6 @@
- use?(system_snappy): GYP_CONFIG += use_system_snappy=1
- use?(system_speex): GYP_CONFIG += use_system_speex=1
- use?(system_vpx): GYP_CONFIG += use_system_libvpx=1
--use?(system_icu): GYP_CONFIG += use_system_icu=1
-+use?(system_icu): GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0
- use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1
-
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
index 3d54717..1e51797 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.9999.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libevent
+ dev-libs/jsoncpp:=
+ dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4
- media-libs/libwebp
+ >=media-libs/libvpx-1.4:=
+ media-libs/libwebp:=
+ media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp
+ net-libs/libsrtp:=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
- sys-libs/zlib
+ sys-libs/zlib[minizip]
+ x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
@@ -72,15 +74,15 @@ src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- tests/quicktestbrowser/quicktestbrowser.pro
+
+ qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
}
src_configure() {
- export NINJA_PATH="/usr/bin/ninja"
+ export NINJA_PATH=/usr/bin/ninja
+
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
index d1fa59f..1e51797 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.0_beta.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libevent
+ dev-libs/jsoncpp:=
+ dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4
- media-libs/libwebp
+ >=media-libs/libvpx-1.4:=
+ media-libs/libwebp:=
+ media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp
+ net-libs/libsrtp:=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
- sys-libs/zlib
+ sys-libs/zlib[minizip]
+ x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
@@ -56,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( media-video/ffmpeg:= )
+ system-ffmpeg? ( =media-video/ffmpeg-2*:= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
@@ -72,15 +74,15 @@ src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- tests/quicktestbrowser/quicktestbrowser.pro
+
+ qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
}
src_configure() {
- export NINJA_PATH="/usr/bin/ninja"
+ export NINJA_PATH=/usr/bin/ninja
+
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index d1fa59f..1e51797 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libevent
+ dev-libs/jsoncpp:=
+ dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4
- media-libs/libwebp
+ >=media-libs/libvpx-1.4:=
+ media-libs/libwebp:=
+ media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp
+ net-libs/libsrtp:=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
- sys-libs/zlib
+ sys-libs/zlib[minizip]
+ x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
@@ -56,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( media-video/ffmpeg:= )
+ system-ffmpeg? ( =media-video/ffmpeg-2*:= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
@@ -72,15 +74,15 @@ src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- tests/quicktestbrowser/quicktestbrowser.pro
+
+ qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
}
src_configure() {
- export NINJA_PATH="/usr/bin/ninja"
+ export NINJA_PATH=/usr/bin/ninja
+
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 344dc64..78ea518 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libevent
+ dev-libs/jsoncpp:=
+ dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4
- media-libs/libwebp
+ >=media-libs/libvpx-1.4:=
+ media-libs/libwebp:=
+ media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp
+ net-libs/libsrtp:=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
- sys-libs/zlib
+ sys-libs/zlib[minizip]
+ x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
@@ -68,21 +70,19 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
-
src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- tests/quicktestbrowser/quicktestbrowser.pro
+
+ qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
}
src_configure() {
- export NINJA_PATH="/usr/bin/ninja"
+ export NINJA_PATH=/usr/bin/ninja
+
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2016-04-19 1:21 Davide Pesavento
0 siblings, 0 replies; 32+ messages in thread
From: Davide Pesavento @ 2016-04-19 1:21 UTC (permalink / raw
To: gentoo-commits
commit: ce4f746b119b08789e7e52e7758a6a3ee599b970
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Apr 18 15:26:56 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 15:55:27 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ce4f746b
dev-qt/qtwebengine: Fix 5.6.0 build with system-nss
Gentoo-bug: 577676
Both patches taken from upstream 5.6 branch
Package-Manager: portage-2.2.28
.../files/qtwebengine-5.6.0-nss-3.23-01.patch | 59 ++++++++++++++++++
.../files/qtwebengine-5.6.0-nss-3.23-02.patch | 69 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild | 6 +-
3 files changed, 133 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch
new file mode 100644
index 0000000..8d192b6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch
@@ -0,0 +1,59 @@
+From 0a385bb01d9cf060fae4c9d350ee98561654df96 Mon Sep 17 00:00:00 2001
+From: Kai Koehne <kai.koehne@theqtcompany.com>
+Date: Thu, 24 Mar 2016 12:34:25 +0100
+Subject: [PATCH] [backport] Call EnsureNSSHttpIOInit in the chimera build.
+
+Otherwise we end up using the default NSS client and not
+SystemURLRequestContext.
+
+This is a minimal fix to be merged onto release branches.
+A follow-up will revise this to be somewhat less error-prone.
+
+BUG=539520
+TEST=Open about:net-internals on Linux or Chrome OS
+ Visit https://incomplete-chain.badssl.com/ in a new tab
+ The Events tab of about:net-internals should show a fetch for http://crt.comodoca.com/COMODORSADomainValidationSecureServerCA.crt
+
+Review URL: https://codereview.chromium.org/1384343002
+
+Task-number: QTBUG-51890
+Task-number: QTBUG-52068
+Change-Id: I567d5cd5e6d4e53b833699e67c45f3bdfc52953d
+Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+---
+ chromium/net/socket/ssl_client_socket_openssl.cc | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc b/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc
+index 5489ead..dc9b3ff 100644
+--- a/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc
++++ b/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc
+@@ -57,6 +57,10 @@
+ #include "net/ssl/ssl_platform_key.h"
+ #endif
+
++#if defined(USE_NSS_CERTS) || defined(OS_IOS)
++#include "net/cert_net/nss_ocsp.h"
++#endif
++
+ namespace net {
+
+ namespace {
+@@ -795,6 +799,14 @@ int SSLClientSocketOpenSSL::Init() {
+ DCHECK(!ssl_);
+ DCHECK(!transport_bio_);
+
++#if defined(USE_NSS_CERTS) || defined(OS_IOS)
++ if (ssl_config_.cert_io_enabled) {
++ // TODO(davidben): Move this out of SSLClientSocket. See
++ // https://crbug.com/539520.
++ EnsureNSSHttpIOInit();
++ }
++#endif
++
+ SSLContext* context = SSLContext::GetInstance();
+ crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
+
+--
+2.7.4
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch
new file mode 100644
index 0000000..a194650
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch
@@ -0,0 +1,69 @@
+From 82900c7b96b2a6fb42fe3841df7685b820edd588 Mon Sep 17 00:00:00 2001
+From: Kai Koehne <kai.koehne@theqtcompany.com>
+Date: Thu, 24 Mar 2016 13:55:28 +0100
+Subject: [PATCH] Use system NSS only for certificate handling
+
+Compiling against NSS 3.23 fails with current Chromium. Also, with NSS
+3.21 there are failures connecting to e.g. google.com.
+
+Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL
+is always used for cryptography, and NSS only for certificate handlng.
+
+Patches included in 3rdparty update:
+
+0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build.
+0472123 Fix build against newer NSS
+90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56
+34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!"
+
+Task-number: QTBUG-52193
+Task-number: QTBUG-51890
+Task-number: QTBUG-52068
+Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+---
+ src/core/config/linux.pri | 9 ++++++---
+ tools/qmake/mkspecs/features/configure.prf | 4 ++--
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
+index 88c1a41..39eeb2a 100644
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -18,11 +18,14 @@ GYP_CONFIG += \
+ use_gio=0 \
+ use_gnome_keyring=0 \
+ use_kerberos=0 \
+- use_pango=0
++ use_pango=0 \
++ use_openssl=1
+
+-!use?(nss) {
++use?(nss) {
++ GYP_CONFIG += use_nss_certs=1 \
++ use_openssl_certs=0
++} else {
+ GYP_CONFIG += use_nss_certs=0 \
+- use_openssl=1 \
+ use_openssl_certs=1
+ }
+
+diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
+index 4cb4600..953572d 100644
+--- a/tools/qmake/mkspecs/features/configure.prf
++++ b/tools/qmake/mkspecs/features/configure.prf
+@@ -72,9 +72,9 @@ defineTest(runConfigure) {
+ defineTest(finalizeConfigure) {
+ linux {
+ use?(nss) {
+- log("SSL............................... Using system NSS$${EOL}")
++ log("Certificate handling.............. Using system NSS$${EOL}")
+ } else {
+- log("SSL............................... Using bundled BoringSSL$${EOL}")
++ log("Certificate handling.............. Using bundled BoringSSL$${EOL}")
+ }
+ use?(system_icu) {
+ packagesExist("icu-uc icu-i18n") {
+--
+2.7.4
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
index 34ca7d3..0edd6dd 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
@@ -68,7 +68,11 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
-PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.6.0-icu.patch"
+ "${FILESDIR}/${PN}-5.6.0-nss-3.23-01.patch"
+ "${FILESDIR}/${PN}-5.6.0-nss-3.23-02.patch"
+)
src_prepare() {
qt_use_disable_mod geolocation positioning \
^ permalink raw reply related [flat|nested] 32+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
@ 2016-01-17 19:14 Michael Palimaka
0 siblings, 0 replies; 32+ messages in thread
From: Michael Palimaka @ 2016-01-17 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 2fb5d5d92dcded5ea30b5b1eb58e46e9a0eb412b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 19:14:10 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 19:14:10 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2fb5d5d9
dev-qt/qtwebengine: add patch from Fedora to solve system-icu issue
Package-Manager: portage-2.2.26
dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch | 15 +++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild | 2 ++
2 files changed, 17 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch
new file mode 100644
index 0000000..0b367c7
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch
@@ -0,0 +1,15 @@
+Solves issue with trying to locate icudtl.dat in /usr/share/qt5/ when built
+with system-icu.
+
+Patch from Fedora.
+
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -40,6 +40,6 @@
+ use?(system_snappy): GYP_CONFIG += use_system_snappy=1
+ use?(system_speex): GYP_CONFIG += use_system_speex=1
+ use?(system_vpx): GYP_CONFIG += use_system_libvpx=1
+-use?(system_icu): GYP_CONFIG += use_system_icu=1
++use?(system_icu): GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0
+ use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
index 5293465..34ca7d3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
@@ -68,6 +68,8 @@ DEPEND="${RDEPEND}
sys-devel/bison
"
+PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
+
src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
^ permalink raw reply related [flat|nested] 32+ messages in thread
end of thread, other threads:[~2024-03-23 13:35 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-18 14:27 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-03-23 13:35 Andreas Sturmlechner
2022-04-09 15:05 Andreas Sturmlechner
2022-04-05 17:07 Andreas Sturmlechner
2021-12-24 23:33 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-03-14 15:36 Andreas Sturmlechner
2020-06-03 10:45 Andreas Sturmlechner
2020-05-10 5:40 Jimi Huotari
2020-04-30 9:26 Andreas Sturmlechner
2020-02-28 20:34 Jimi Huotari
2020-02-10 6:47 Andreas Sturmlechner
2019-10-29 23:54 Jimi Huotari
2019-09-30 19:28 Andreas Sturmlechner
2019-03-16 22:39 Andreas Sturmlechner
2019-02-05 20:38 Andreas Sturmlechner
2019-02-04 18:40 Jimi Huotari
2018-10-31 19:29 Jimi Huotari
2018-09-21 11:26 Jimi Huotari
2018-08-25 4:32 Jimi Huotari
2018-08-24 22:58 Jimi Huotari
2018-06-16 18:06 Andreas Sturmlechner
2018-04-11 12:56 Jimi Huotari
2017-12-09 23:02 Jimi Huotari
2017-06-04 5:10 Michael Palimaka
2016-12-06 8:21 Michael Palimaka
2016-12-06 7:24 Michael Palimaka
2016-05-08 1:28 Davide Pesavento
2016-04-19 1:21 Davide Pesavento
2016-01-17 19:14 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox