* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2017-06-01 14:16 Michael Palimaka
0 siblings, 0 replies; 39+ messages in thread
From: Michael Palimaka @ 2017-06-01 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 330ee98430e07f7271bb347780bbe00d822e0cb8
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 1 14:16:24 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 1 14:16:27 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=330ee984
dev-qt/qtwebengine: rebase paxmark-mksnapshot patch for 5.9
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../qtwebengine-5.9.0-paxmark-mksnapshot.patch | 46 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
4 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
new file mode 100644
index 00000000..5eb8ce12
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
@@ -0,0 +1,46 @@
+--- a/src/3rdparty/chromium/v8/src/v8.gyp
++++ b/src/3rdparty/chromium/v8/src/v8.gyp
+@@ -36,6 +36,7 @@
+ 'v8_experimental_extra_library_files%': [],
+ 'v8_enable_inspector%': 0,
+ 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+ 'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)',
+ 'v8_os_page_size%': 0,
+ },
+@@ -2432,7 +2433,7 @@
+ ]
+ },
+ {
+- 'target_name': 'mksnapshot',
++ 'target_name': 'mksnapshot_u',
+ 'type': 'executable',
+ 'dependencies': [
+ 'v8_base',
+@@ -2485,5 +2486,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/qtwebengine-5.9.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
index bebfc788..68e4702b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.0.ebuild
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index bebfc788..68e4702b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index bebfc788..68e4702b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2017-06-04 11:55 Michael Palimaka
0 siblings, 0 replies; 39+ messages in thread
From: Michael Palimaka @ 2017-06-04 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 8a778f2b0396c2f4415d92bc688ec8fc55d83991
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 11:54:14 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 11:54:53 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8a778f2b
dev-qt/qtwebengine: fix build with GCC 7
Gentoo-bug: 617896
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../files/qtwebengine-5.7.1-gcc-7.patch | 144 +++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild | 1 +
2 files changed, 145 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
new file mode 100644
index 00000000..a5c3072a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
@@ -0,0 +1,144 @@
+From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Wed, 29 Mar 2017 17:42:18 +0200
+Subject: [PATCH] Fix build with GCC 7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but
+earlier compilers did.
+
+Task-number:QTBUG-59776
+Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3
+Reviewed-by: Michael Brüning <michael.bruning@qt.io>
+---
+ .../mojo/public/cpp/bindings/interface_ptr_info.h | 2 +-
+ .../third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++
+ chromium/v8/src/objects-body-descriptors.h | 2 +-
+ chromium/v8/src/objects-inl.h | 19 +++++++++++++++++++
+ chromium/v8/src/objects.h | 16 ++--------------
+ 5 files changed, 25 insertions(+), 16 deletions(-)
+
+diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
+index 5bd29d5..c94a5ac 100644
+--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
+@@ -34,7 +34,7 @@ class InterfacePtrInfo {
+
+ InterfacePtrInfo& operator=(InterfacePtrInfo&& other) {
+ if (this != &other) {
+- handle_ = other.handle_.Pass();
++ handle_ = std::move(other.handle_);
+ version_ = other.version_;
+ other.version_ = 0u;
+ }
+--
+2.7.4
+From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Wed, 29 Mar 2017 15:53:00 +0200
+Subject: [PATCH 1/1] Fix build with GCC 7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes a few problems with using undeclared functions and ambigious
+code.
+
+Task-number: QTBUG-59776
+Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c
+Reviewed-by: Michael Brüning <michael.bruning@qt.io>
+---
+ chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++
+ .../third_party/pdfium/fpdfsdk/javascript/global.cpp | 8 ++++----
+ chromium/v8/src/objects-body-descriptors.h | 2 +-
+ chromium/v8/src/objects-inl.h | 18 ++++++++++++++++++
+ chromium/v8/src/objects.h | 16 ++--------------
+ 5 files changed, 27 insertions(+), 19 deletions(-)
+
+diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
+index e85c72f..6f94cd6 100644
+--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
+@@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas
+ return *this;
+ }
+
++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
++
+ template<typename T, typename U, typename V, typename W>
+ inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other)
+ {
+diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
+index 91cb888..a1c3634 100644
+--- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
++++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
+@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
+
+ template <typename StaticVisitor>
+ static inline void IterateBody(HeapObject* obj, int object_size) {
+- IterateBody(obj);
++ IterateBody<StaticVisitor>(obj);
+ }
+ };
+
+diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h
+index 58441d3..4c486ea 100644
+--- a/src/3rdparty/chromium/v8/src/objects-inl.h
++++ b/src/3rdparty/chromium/v8/src/objects-inl.h
+@@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) {
+ }
+
+
++template <typename Derived, typename Shape, typename Key>
++inline uint32_t HashTable<Derived,Shape,Key>::Hash(Key key) {
++ if (Shape::UsesSeed) {
++ return Shape::SeededHash(key, GetHeap()->HashSeed());
++ } else {
++ return Shape::Hash(key);
++ }
++}
++
++template <typename Derived, typename Shape, typename Key>
++inline uint32_t HashTable<Derived,Shape,Key>::HashForObject(Key key, Object* object) {
++ if (Shape::UsesSeed) {
++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
++ } else {
++ return Shape::HashForObject(key, object);
++ }
++}
++
+ bool ObjectHashTableShape::IsMatch(Handle<Object> key, Object* other) {
+ return key->SameValue(other);
+ }
+diff --git a/src/3rdparty/chromium/v8/src/objects.h b/src/3rdparty/chromium/v8/src/objects.h
+index 7d774be..42da5fa 100644
+--- a/src/3rdparty/chromium/v8/src/objects.h
++++ b/src/3rdparty/chromium/v8/src/objects.h
+@@ -3194,21 +3194,9 @@ class HashTable : public HashTableBase {
+ typedef Shape ShapeT;
+
+ // Wrapper methods
+- inline uint32_t Hash(Key key) {
+- if (Shape::UsesSeed) {
+- return Shape::SeededHash(key, GetHeap()->HashSeed());
+- } else {
+- return Shape::Hash(key);
+- }
+- }
++ inline uint32_t Hash(Key key);
+
+- inline uint32_t HashForObject(Key key, Object* object) {
+- if (Shape::UsesSeed) {
+- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+- } else {
+- return Shape::HashForObject(key, object);
+- }
+- }
++ inline uint32_t HashForObject(Key key, Object* object);
+
+ // Returns a new HashTable object.
+ MUST_USE_RESULT static Handle<Derived> New(
+--
+2.7.4
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
index 6662a5a0..1499b058 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.9999.ebuild
@@ -77,6 +77,7 @@ 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"
+ "${FILESDIR}/${PN}-5.7.1-gcc-7.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2017-12-05 11:25 Michael Palimaka
0 siblings, 0 replies; 39+ messages in thread
From: Michael Palimaka @ 2017-12-05 11:25 UTC (permalink / raw
To: gentoo-commits
commit: 0f96244f88e39a6132b484dde151de55ebad29a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 5 11:25:20 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 5 11:25:45 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f96244f
dev-qt/qtwebengine: Fix build with >=ICU-60
Bug: https://bugs.gentoo.org/639220
Package-Manager: Portage-2.3.14, 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.9.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 ++
4 files changed, 22 insertions(+)
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
new file mode 100644
index 00000000..9866ab92
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
@@ -0,0 +1,16 @@
+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 2c0bd638..afb0d89d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${P}-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.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 2c0bd638..afb0d89d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${P}-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 2c0bd638..afb0d89d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" )
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2017-12-10 1:48 Michael Palimaka
0 siblings, 0 replies; 39+ messages in thread
From: Michael Palimaka @ 2017-12-10 1:48 UTC (permalink / raw
To: gentoo-commits
commit: 299d80e3980c7cf916264f4c269a163192c52c3a
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 01:47:53 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 01:48:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=299d80e3
dev-qt/qtwebengine: fix build on pax kernel
Bug: https://bugs.gentoo.org/634220
Package-Manager: Portage-2.3.14, Repoman-2.3.6
.../qtwebengine-5.9.3-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
5 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch
new file mode 100644
index 00000000..ecedaf62
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -661,6 +661,7 @@ action("run_mksnapshot") {
+
+ deps = [
+ ":mksnapshot($v8_snapshot_toolchain)",
++ ":run_paxmark",
+ ]
+
+ script = "tools/run.py"
+@@ -706,6 +707,28 @@ action("run_mksnapshot") {
+ args += [ rebase_path(v8_embed_script, root_build_dir) ]
+ }
+ }
++action("run_paxmark") {
++ visibility = [ ":*" ] # Only targets in this file can depend on this.
++
++ deps = [
++ ":mksnapshot($v8_snapshot_toolchain)",
++ ]
++
++ script = "/usr/sbin/pypaxctl"
++
++ sources = []
++
++ outputs = [
++ "$target_out_dir/mksnapshot",
++ ]
++
++ args = [
++ "-sm",
++ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++ "root_out_dir") + "/mksnapshot",
++ root_build_dir),
++ ]
++}
+
+ action("run_mkpeephole") {
+ visibility = [ ":*" ] # Only targets in this file can depend on this.
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index 4191302a..c970853b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.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.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index 4191302a..c970853b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.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.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index 2b51fbf7..635faf47 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -76,7 +76,7 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.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 4191302a..c970853b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.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
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-02-07 10:30 Michael Palimaka
0 siblings, 0 replies; 39+ messages in thread
From: Michael Palimaka @ 2018-02-07 10:30 UTC (permalink / raw
To: gentoo-commits
commit: 6ae7dcf1de5b2cf896fa6ceefd7e4c42d2da8b54
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 7 10:29:50 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 7 10:30:43 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6ae7dcf1
dev-qt/qtwebengine: port media-libs/jpeg-9b patches from ::gentoo
Bug: https://bugs.gentoo.org/607424
Bug: https://bugs.gentoo.org/646456
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/qtwebengine-5.9.4-jpeg-9-1.patch | 70 ++++++++++++++++++++++
.../files/qtwebengine-5.9.4-jpeg-9-2.patch | 46 ++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 2 +
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 +
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 2 +
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 6 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +
7 files changed, 129 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
new file mode 100644
index 00000000..8b739680
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-1.patch
@@ -0,0 +1,70 @@
+From 560a4a616f2a1307385e5e7a7d2e99b0b41775c8 Mon Sep 17 00:00:00 2001
+From: Viktor Engelmann <viktor.engelmann@qt.io>
+Date: Fri, 18 Aug 2017 14:50:20 +0200
+Subject: [PATCH] Fix improper boolean values
+
+jpeg_codec.cc contained some implicit conversions to boolean, which
+is apparently problematic for some versions of libjpeg. Patch
+taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191
+but not backported, since it has not been accepted into chromium yet.
+
+Task-Number: QTBUG-58482
+
+Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+index 6d92637..85c7bec 100644
+--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
++++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+@@ -121,7 +121,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
+ // tell libjpeg where to write the next data
+ cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
+ cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
+- return 1;
++ return TRUE;
+ }
+
+ // Cleans up the JpegEncoderState to prepare for returning in the final form.
+@@ -262,7 +262,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
+ cinfo.data_precision = 8;
+
+ jpeg_set_defaults(&cinfo);
+- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100
++ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100
+
+ // set up the destination manager
+ jpeg_destination_mgr destmgr;
+@@ -274,7 +274,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
+ JpegEncoderState state(output);
+ cinfo.client_data = &state;
+
+- jpeg_start_compress(&cinfo, 1);
++ jpeg_start_compress(&cinfo, TRUE);
+
+ // feed it the rows, doing necessary conversions for the color format
+ #ifdef JCS_EXTENSIONS
+@@ -360,7 +360,7 @@ void InitSource(j_decompress_ptr cinfo) {
+ // set to a positive value if TRUE is returned. A FALSE return should only
+ // be used when I/O suspension is desired."
+ boolean FillInputBuffer(j_decompress_ptr cinfo) {
+- return false;
++ return FALSE;
+ }
+
+ // Skip data in the buffer. Since we have all the data at once, this operation
+@@ -488,7 +488,7 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
+ cinfo.client_data = &state;
+
+ // fill the file metadata into our buffer
+- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
++ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
+ return false;
+
+ // we want to always get RGB data out
+--
+2.7.4
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
new file mode 100644
index 00000000..ef5f44ef
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
@@ -0,0 +1,46 @@
+Fix build with jpeg-9. Bug #646456
+
+--- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp 2018-01-15 12:39:43.000000000 +0100
++++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp 2018-02-06 20:55:37.455912163 +0100
+@@ -57,12 +57,12 @@
+ };
+ extern "C" {
+ static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
+- return 0;
++ return FALSE;
+ }
+ };
+ extern "C" {
+ static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
+- return 0;
++ return FALSE;
+ }
+ };
+ extern "C" {
+@@ -126,7 +126,7 @@
+ jpeg_destroy_decompress(&cinfo);
+ return false;
+ }
+- int ret = jpeg_read_header(&cinfo, true);
++ int ret = jpeg_read_header(&cinfo, TRUE);
+ if (ret != JPEG_HEADER_OK) {
+ jpeg_destroy_decompress(&cinfo);
+ return false;
+@@ -210,7 +210,7 @@
+ }
+ cinfo.image_width = m_OrigWidth;
+ cinfo.image_height = m_OrigHeight;
+- int ret = jpeg_read_header(&cinfo, true);
++ int ret = jpeg_read_header(&cinfo, TRUE);
+ if (ret != JPEG_HEADER_OK)
+ return false;
+
+@@ -433,7 +433,7 @@
+ if (setjmp(ctx->m_JumpMark) == -1)
+ return 1;
+
+- int ret = jpeg_read_header(&ctx->m_Info, true);
++ int ret = jpeg_read_header(&ctx->m_Info, TRUE);
+ if (ret == JPEG_SUSPENDED)
+ return 2;
+ if (ret != JPEG_HEADER_OK)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index e999c623..e4e575b4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -81,6 +81,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index e999c623..e4e575b4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -81,6 +81,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index e999c623..e4e575b4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -81,6 +81,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
index e36ea1ca..02106ae4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild
@@ -77,7 +77,11 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" )
+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"
+)
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 e999c623..e4e575b4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -81,6 +81,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-02-09 10:46 Michael Palimaka
0 siblings, 0 replies; 39+ messages in thread
From: Michael Palimaka @ 2018-02-09 10:46 UTC (permalink / raw
To: gentoo-commits
commit: a76d2f0a50951a6fbef8c77f4aaaa49ab523e04d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 10:45:53 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 10:46:07 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a76d2f0a
dev-qt/qtwebengine: rebase jpeg-9 patch for qt-5.10
Closes: https://bugs.gentoo.org/647038
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/qtwebengine-5.10.0-jpeg-9.patch | 45 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
5 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch b/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
new file mode 100644
index 00000000..21e147db
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
@@ -0,0 +1,45 @@
+Fix build with jpeg-9. Bug #646456
+
+--- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
++++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
+@@ -74,11 +74,11 @@
+ }
+
+ static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
+- return 0;
++ return FALSE;
+ }
+
+ static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
+- return 0;
++ return FALSE;
+ }
+
+ static void _error_do_nothing(j_common_ptr cinfo) {}
+@@ -147,7 +147,7 @@
+ jpeg_destroy_decompress(&cinfo);
+ return false;
+ }
+- int ret = jpeg_read_header(&cinfo, true);
++ int ret = jpeg_read_header(&cinfo, TRUE);
+ if (ret != JPEG_HEADER_OK) {
+ jpeg_destroy_decompress(&cinfo);
+ return false;
+@@ -231,7 +231,7 @@
+ }
+ cinfo.image_width = m_OrigWidth;
+ cinfo.image_height = m_OrigHeight;
+- int ret = jpeg_read_header(&cinfo, true);
++ int ret = jpeg_read_header(&cinfo, TUE);
+ if (ret != JPEG_HEADER_OK)
+ return false;
+
+@@ -459,7 +459,7 @@
+ if (setjmp(ctx->m_JumpMark) == -1)
+ return 1;
+
+- int ret = jpeg_read_header(&ctx->m_Info, true);
++ int ret = jpeg_read_header(&ctx->m_Info, TRUE);
+ if (ret == JPEG_SUSPENDED)
+ return 2;
+ if (ret != JPEG_HEADER_OK)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index e4e575b4..7f6d0349 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index e4e575b4..7f6d0349 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index e4e575b4..7f6d0349 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
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 e4e575b4..7f6d0349 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-06-16 18:04 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2018-06-16 18:04 UTC (permalink / raw
To: gentoo-commits
commit: f50ddb7b79edf05472d8a9852c6c76d939391177
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 11:06:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 11:06:24 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f50ddb7b
dev-qt/qtwebengine: Fix page rendering
See also: https://bugreports.qt.io/browse/QTBUG-68224
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/qtwebengine-5.11.0-fix-page-render.patch | 29 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild | 5 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-page-render.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-page-render.patch
new file mode 100644
index 00000000..7bfaf322
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-page-render.patch
@@ -0,0 +1,29 @@
+From ce01bf795b5a50e28e119d1925b395b8bfcf419b Mon Sep 17 00:00:00 2001
+From: =?utf8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
+Date: Tue, 15 May 2018 16:21:04 +0200
+Subject: [PATCH] Remove old focusProxy widget from layout in
+ RWHVQDW::initAsChild
+
+Task-number: QTBUG-68224
+Change-Id: I317915f0c81531e5858dfa3a76365b16266ce919
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+index 16ea216f2..56f04d424 100644
+--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
++++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+@@ -198,6 +198,9 @@ void RenderWidgetHostViewQtDelegateWidget::initAsChild(WebContentsAdapterClient*
+ disconnect(parentWidget(), &QObject::destroyed,
+ this, &RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete);
+ pagePrivate->view->layout()->addWidget(this);
++ if (QWidget *focusProxy = pagePrivate->view->focusProxy())
++ if (focusProxy != this)
++ pagePrivate->view->layout()->removeWidget(focusProxy);
+ pagePrivate->view->setFocusProxy(this);
+ show();
+ } else
+--
+2.16.3
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
index df8f0ed1..46f6eac4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0.ebuild
@@ -77,7 +77,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" )
+PATCHES+=(
+ "${FILESDIR}/${P}-fix-build-w-o-qtlocation.patch"
+ "${FILESDIR}/${P}-fix-page-render.patch"
+)
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-06-19 20:12 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2018-06-19 20:12 UTC (permalink / raw
To: gentoo-commits
commit: c29568a3feeeb6afcb34dc6cbd32efe5e4f81be7
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 19 20:09:57 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Jun 19 20:09:57 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c29568a3
dev-qt/qtwebengine: remove upstreamed ICU patch from 5.9999
Also remove the patch itself, as it is no longer needed.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
| 102 ---------------------
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 -
2 files changed, 104 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch
deleted file mode 100644
index e5e38312..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- 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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 39f78647..b98972ea 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -81,8 +81,6 @@ 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+=( "${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
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-06-20 15:29 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2018-06-20 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 92acfdf50b8c5a5abd2b0c1b6d559c63ca5a6a7d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 20:44:20 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 14:30:49 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=92acfdf5
dev-qt/qtwebengine: Try to fix libxml2 disable-xml-catalogs
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
Bug: https://bugs.gentoo.org/653078
Package-Manager: Portage-2.3.40, Repoman-2.3.9
...webengine-5.11.1-libxml2-disable-catalogs.patch | 46 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 4 ++
2 files changed, 50 insertions(+)
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
new file mode 100644
index 00000000..8ac5b90b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
@@ -0,0 +1,46 @@
+--- 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"
+@@ -538,10 +542,6 @@
+ static bool ShouldAllowExternalLoad(const KURL& url) {
+ String url_string = url.GetString();
+
+- // libxml should not be configured with catalogs enabled, so it
+- // should not be asking to load default catalogs.
+- CHECK(!IsLibxmlDefaultCatalogFile(url));
+-
+ // The most common DTD. There isn't much point in hammering www.w3c.org by
+ // requesting this URL for every XHTML document.
+ if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml"))
+@@ -646,6 +646,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/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index b98972ea..150c23c4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -79,6 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES+=(
+ "${FILESDIR}/${P}-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] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-06-20 15:29 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2018-06-20 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 32b1948b8e17cba3c717c8a5692c24c887894003
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 20:53:28 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 14:30:49 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=32b1948b
dev-qt/qtwebengine: Fix build with ffmpeg-4
Patch kindly borrowed from opensuse.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/qtwebengine-5.11.1-ffmpeg4.patch | 32 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 1 +
2 files changed, 33 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
new file mode 100644
index 00000000..e9ef452a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
@@ -0,0 +1,32 @@
+From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001
+From: Xiaohan Wang <xhwang@chromium.org>
+Date: Mon, 29 Jan 2018 21:28:28 +0000
+Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64
+
+AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg:
+https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5
+
+BUG=777484
+
+Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db
+Reviewed-on: https://chromium-review.googlesource.com/889686
+Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
+Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#532593}
+---
+ src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h
+index 0341e5784f725..60ffba708b0e5 100644
+--- a/src/3rdparty/chromium/media/base/decoder_buffer.h
++++ b/src/3rdparty/chromium/media/base/decoder_buffer.h
+@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer
+ : public base::RefCountedThreadSafe<DecoderBuffer> {
+ public:
+ enum {
+- kPaddingSize = 32,
++ kPaddingSize = 64,
+ #if defined(ARCH_CPU_ARM_FAMILY)
+ kAlignmentSize = 16
+ #else
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index 150c23c4..9c54aa9e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -81,6 +81,7 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${P}-ffmpeg4.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-06-20 15:29 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2018-06-20 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 938edc9a6b2179e4aabcf5ab340ebd64d90a77d1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 18 21:05:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 14:30:49 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=938edc9a
dev-qt/qtwebengine: Disable GPU when using nouveau
One upstream backport, the other one kindly borrowed from opensuse
(disable-gpu-when-using-nouveau-boo-1005323.diff).
Bug: https://bugs.gentoo.org/609752
Package-Manager: Portage-2.3.40, Repoman-2.3.9
...-5.11.1-eglGetProcAddress-fallback-lookup.patch | 68 +++++++++++++++
.../qtwebengine-5.11.1-nouveau-disable-gpu.patch | 98 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 2 +
3 files changed, 168 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
new file mode 100644
index 00000000..4b2676fa
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-eglGetProcAddress-fallback-lookup.patch
@@ -0,0 +1,68 @@
+From a66d4cd82972996d76edff52d17464c150dec6a6 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Mon, 11 Jun 2018 16:16:55 +0300
+Subject: Add fallback lookup for eglGetProcAddress
+
+Use the GLContext to find address for eglGetProcAddress symbol, if it's
+not found with dlopen.
+
+Change-Id: I3f5330c21ecc9b66e5e376d50d3fc6965b227f85
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ src/core/gl_context_qt.cpp | 11 +++++++++++
+ src/core/gl_context_qt.h | 1 +
+ src/core/gl_surface_qt.cpp | 4 ++++
+ 3 files changed, 16 insertions(+)
+
+diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
+index 9ed1db8b..95491709 100644
+--- a/src/core/gl_context_qt.cpp
++++ b/src/core/gl_context_qt.cpp
+@@ -155,6 +155,17 @@ QFunctionPointer GLContextHelper::getGlXGetProcAddress()
+ return get_proc_address;
+ }
+
++QFunctionPointer GLContextHelper::getEglGetProcAddress()
++{
++ QFunctionPointer get_proc_address = nullptr;
++#ifndef QT_NO_OPENGL
++ if (QOpenGLContext *context = qt_gl_global_share_context()) {
++ get_proc_address = context->getProcAddress("eglGetProcAddress");
++ }
++#endif
++ return get_proc_address;
++}
++
+ QT_END_NAMESPACE
+
+ #if defined(USE_OZONE) || defined(OS_WIN)
+diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h
+index 8ffdad58..cecceabc 100644
+--- a/src/core/gl_context_qt.h
++++ b/src/core/gl_context_qt.h
+@@ -63,6 +63,7 @@ public:
+ static void* getXDisplay();
+ static void* getNativeDisplay();
+ static QFunctionPointer getGlXGetProcAddress();
++ static QFunctionPointer getEglGetProcAddress();
+ private:
+ Q_INVOKABLE bool initializeContextOnBrowserThread(gl::GLContext* context, gl::GLSurface* surface, gl::GLContextAttribs attribs);
+
+diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
+index 7e579246..4d38d7c2 100644
+--- a/src/core/gl_surface_qt.cpp
++++ b/src/core/gl_surface_qt.cpp
+@@ -227,6 +227,10 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
+ base::GetFunctionPointerFromNativeLibrary(library,
+ "eglGetProcAddress"));
+ if (!get_proc_address) {
++ QFunctionPointer address = GLContextHelper::getEglGetProcAddress();
++ get_proc_address = reinterpret_cast<gl::GLGetProcAddressProc>(address);
++ }
++ if (!get_proc_address) {
+ LOG(ERROR) << "eglGetProcAddress not found.";
+ base::UnloadNativeLibrary(library);
+ return false;
+--
+cgit v1.1-6-g87c4
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch
new file mode 100644
index 00000000..aaf3aae4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch
@@ -0,0 +1,98 @@
+From: Antonio Larrosa <alarrosa@suse.com>
+Subject: Disable GPU when using nouveau or running on wayland
+References: boo#1005323, boo#1060990
+
+Qt WebEngine uses multi-threaded OpenGL, which nouveau does not support.
+It also crashes when running on wayland, the cause is not yet known.
+Work around these issues by not doing GPU-accelerated rendering in such
+cases.
+
+Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
+===================================================================
+--- qtwebengine-everywhere-src-5.11.0.orig/src/core/web_engine_context.cpp
++++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
+@@ -100,6 +100,7 @@
+ #include <QOffscreenSurface>
+ #ifndef QT_NO_OPENGL
+ # include <QOpenGLContext>
++# include <QOpenGLFunctions>
+ #endif
+ #include <QQuickWindow>
+ #include <QStringList>
+@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v
+ }
+ #endif
+
++#ifndef QT_NO_OPENGL
++QString openGLVendor()
++{
++ QString vendor;
++
++ QOpenGLContext *oldContext = QOpenGLContext::currentContext();
++ QSurface *oldSurface = 0;
++ if (oldContext)
++ oldSurface = oldContext->surface();
++
++ QScopedPointer<QOffscreenSurface> surface( new QOffscreenSurface );
++ surface->create();
++ QOpenGLContext context;
++ if (!context.create()) {
++ qDebug() << "Error creating openGL context";
++ }
++ else if (!context.makeCurrent(surface.data())) {
++ qDebug() << "Error making openGL context current context";
++ } else {
++ const GLubyte *p;
++ QOpenGLFunctions *f = context.functions();
++ if ((p = f->glGetString(GL_VENDOR)))
++ vendor = QString::fromLatin1(reinterpret_cast<const char *>(p));
++ }
++
++ context.doneCurrent();
++ if (oldContext && oldSurface)
++ oldContext->makeCurrent(oldSurface);
++
++ return vendor;
++}
++#endif
++
+ } // namespace
+
+ namespace QtWebEngineCore {
+@@ -414,6 +448,27 @@ WebEngineContext::WebEngineContext()
+ const char *glType = 0;
+ #ifndef QT_NO_OPENGL
+
++ bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU");
++
++ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && platform.startsWith("wayland", Qt::CaseInsensitive))
++ {
++ qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n"
++ "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n"
++ "environment variable before running this application, but this is \n"
++ "not recommended since this usually causes applications to crash.";
++ disableGpu = true;
++ }
++
++ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND") && openGLVendor() == QStringLiteral("nouveau"))
++ {
++ qWarning() << "Nouveau openGL driver detected. Qt WebEngine will disable usage of the GPU.\n"
++ "Note: you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n"
++ "environment variable before running this application, but this is \n"
++ "not recommended since this usually causes applications to crash as\n"
++ "Nouveau openGL drivers don't support multithreaded rendering";
++ disableGpu = true;
++ }
++
+ bool tryGL =
+ !usingANGLE()
+ && (!usingSoftwareDynamicGL()
+@@ -424,7 +479,7 @@ WebEngineContext::WebEngineContext()
+ || enableWebGLSoftwareRendering
+ #endif
+ )
+- && !usingQtQuick2DRenderer();
++ && !usingQtQuick2DRenderer() && !disableGpu;
+
+ if (tryGL) {
+ if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index 9c54aa9e..05007972 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -82,6 +82,8 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${P}-libxml2-disable-catalogs.patch" # bug 653078
"${FILESDIR}/${P}-ffmpeg4.patch"
+ "${FILESDIR}/${P}-eglGetProcAddress-fallback-lookup.patch" # 5.11 branch
+ "${FILESDIR}/${P}-nouveau-disable-gpu.patch" # bug 609752
)
src_prepare() {
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-07-25 11:55 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2018-07-25 11:55 UTC (permalink / raw
To: gentoo-commits
commit: be7f6591e4406e1f238a6b2a169f2e98295ac435
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 11:54:07 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 11:54:36 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=be7f6591
dev-qt/qtwebengine: remove upstreamed FFmpeg patch
Package-Manager: Portage-2.3.43, Repoman-2.3.10
.../files/qtwebengine-5.11.1-ffmpeg4.patch | 32 ----------------------
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 1 -
3 files changed, 34 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
deleted file mode 100644
index e9ef452a..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-ffmpeg4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001
-From: Xiaohan Wang <xhwang@chromium.org>
-Date: Mon, 29 Jan 2018 21:28:28 +0000
-Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64
-
-AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg:
-https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5
-
-BUG=777484
-
-Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db
-Reviewed-on: https://chromium-review.googlesource.com/889686
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#532593}
----
- src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h
-index 0341e5784f725..60ffba708b0e5 100644
---- a/src/3rdparty/chromium/media/base/decoder_buffer.h
-+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h
-@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer
- : public base::RefCountedThreadSafe<DecoderBuffer> {
- public:
- enum {
-- kPaddingSize = 32,
-+ kPaddingSize = 64,
- #if defined(ARCH_CPU_ARM_FAMILY)
- kAlignmentSize = 16
- #else
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index acd54530..94340299 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -81,7 +81,6 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078
- "${FILESDIR}/${PN}-5.11.1-ffmpeg4.patch"
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index acd54530..94340299 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.11.1-libxml2-disable-catalogs.patch" # bug 653078
- "${FILESDIR}/${PN}-5.11.1-ffmpeg4.patch"
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-07-25 19:22 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2018-07-25 19:22 UTC (permalink / raw
To: gentoo-commits
commit: 05eb9454e3e8d769bbb78cb93ede37204c0a0f0d
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 21 18:48:05 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 19:13:59 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=05eb9454
dev-qt/qtwebengine: Update libxml2-disable-catalogs.patch for 5.9999.
Bug: https://bugs.gentoo.org/653078
...webengine-5.12.0-libxml2-disable-catalogs.patch | 35 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000..6093b145
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-libxml2-disable-catalogs.patch
@@ -0,0 +1,35 @@
+--- 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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 94340299..2a7c9515 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -80,7 +80,7 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
- "${FILESDIR}/${PN}-5.11.1-libxml2-disable-catalogs.patch" # bug 653078
+ "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" # bug 653078
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-08-16 12:20 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2018-08-16 12:20 UTC (permalink / raw
To: gentoo-commits
commit: 3c5c66405173f7e5782d42331ae34de392b772d7
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 11:36:27 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 12:19:20 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c5c6640
dev-qt/qtwebengine: disable 'webrtc' in 5.12
The related Chromium parts seem to require '>=media-libs/libvpx-1.8'
now, which is not yet available, so disable 'webrtc' for now to
allow for the build to complete.
Also add a patch to fix build without 'webrtc'.
Related required upstream revision (thanks to Arfrever):
https://chromium.googlesource.com/webm/libvpx/+/bd1d995c
Package-Manager: Portage-2.3.46, Repoman-2.3.10
.../qtwebengine-5.12.0-build-without-webrtc.patch | 81 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +
3 files changed, 85 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-build-without-webrtc.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-build-without-webrtc.patch
new file mode 100644
index 00000000..bb82be20
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-build-without-webrtc.patch
@@ -0,0 +1,81 @@
+From f500275e774945c8c19dc3e763510f04bca52261 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Tue, 31 Jul 2018 15:42:09 +0200
+Subject: Fix build with plugins enabled and webrtc disabled
+
+Change-Id: I2f4f9517943571ba89fdb6a48fd4381d179a96a6
+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
+---
+ chromium/content/renderer/pepper/pepper_media_device_manager.cc | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/chromium/content/renderer/pepper/pepper_media_device_manager.cc b/chromium/content/renderer/pepper/pepper_media_device_manager.cc
+index 2a1593afe4..99f2c3fb7f 100644
+--- a/src/3rdparty/chromium/content/renderer/pepper/pepper_media_device_manager.cc
++++ b/src/3rdparty/chromium/content/renderer/pepper/pepper_media_device_manager.cc
+@@ -114,9 +114,10 @@ void PepperMediaDeviceManager::EnumerateDevices(
+ callback, ToMediaDeviceType(type)));
+ #else
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+- FROM_HERE, base::Bind(&PepperMediaDeviceManager::DevicesEnumerated,
+- AsWeakPtr(), callback, ToMediaDeviceType(type),
+- std::vector<MediaDeviceInfoArray>()));
++ FROM_HERE, base::BindOnce(&PepperMediaDeviceManager::DevicesEnumerated,
++ AsWeakPtr(), callback, ToMediaDeviceType(type),
++ std::vector<MediaDeviceInfoArray>(),
++ std::vector<blink::mojom::VideoInputDeviceCapabilitiesPtr>()));
+ #endif
+ }
+
+--
+cgit v1.2.1
+
+From 26d7e8597239035a2b57c73c92743dcdeffa9368 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Tue, 31 Jul 2018 18:40:01 +0200
+Subject: FIXUP: Fix build with plugins enabled and webrtc disabled
+
+Also fix linking error, and turn it into a compiler error in the future.
+
+Change-Id: Ic6841eb70b40bd894495036d9d8d5a0a78fcf2b0
+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
+---
+ chromium/content/renderer/pepper/pepper_media_device_manager.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/chromium/content/renderer/pepper/pepper_media_device_manager.cc b/chromium/content/renderer/pepper/pepper_media_device_manager.cc
+index 99f2c3fb7f..19ff8c2e02 100644
+--- a/src/3rdparty/chromium/content/renderer/pepper/pepper_media_device_manager.cc
++++ b/src/3rdparty/chromium/content/renderer/pepper/pepper_media_device_manager.cc
+@@ -12,13 +12,16 @@
+ #include "base/threading/thread_task_runner_handle.h"
+ #include "content/public/common/console_message_level.h"
+ #include "content/public/common/content_features.h"
+-#include "content/renderer/media/stream/media_stream_device_observer.h"
+ #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
+ #include "content/renderer/render_frame_impl.h"
+ #include "media/media_buildflags.h"
+ #include "ppapi/shared_impl/ppb_device_ref_shared.h"
+ #include "services/service_manager/public/cpp/interface_provider.h"
+
++#if BUILDFLAG(ENABLE_WEBRTC)
++#include "content/renderer/media/stream/media_stream_device_observer.h"
++#endif
++
+ namespace content {
+
+ namespace {
+@@ -267,8 +270,10 @@ void PepperMediaDeviceManager::OnDeviceOpened(int request_id,
+ return;
+ }
+
++#if BUILDFLAG(ENABLE_WEBRTC)
+ if (success)
+ GetMediaStreamDeviceObserver()->AddStream(label, device);
++#endif
+
+ OpenDeviceCallback callback = iter->second;
+ open_callbacks_.erase(iter);
+--
+cgit v1.2.1
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index dfd139a4..ef85e758 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -79,6 +79,7 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
+ "${FILESDIR}/${PN}-5.12.0-build-without-webrtc.patch"
"${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" # bug 653078
)
@@ -112,6 +113,7 @@ src_configure() {
-opus
-printing-and-pdf
-webp
+ -no-webengine-webrtc
$(usex alsa '-alsa' '')
$(usex bindist '' '-proprietary-codecs')
$(usex pulseaudio '-pulseaudio' '')
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index dfd139a4..ef85e758 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -79,6 +79,7 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
+ "${FILESDIR}/${PN}-5.12.0-build-without-webrtc.patch"
"${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" # bug 653078
)
@@ -112,6 +113,7 @@ src_configure() {
-opus
-printing-and-pdf
-webp
+ -no-webengine-webrtc
$(usex alsa '-alsa' '')
$(usex bindist '' '-proprietary-codecs')
$(usex pulseaudio '-pulseaudio' '')
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-08-24 22:58 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2018-08-24 22:58 UTC (permalink / raw
To: gentoo-commits
commit: 1cc452fa0c40a3d24a4bfab404503ec5f447565f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 22:21:22 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 22:21:22 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1cc452fa
dev-qt/qtwebengine: remove no longer needed webrtc patch
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../qtwebengine-5.12.0-build-without-webrtc.patch | 81 ----------------------
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 5 +-
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 5 +-
3 files changed, 2 insertions(+), 89 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-build-without-webrtc.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-build-without-webrtc.patch
deleted file mode 100644
index bb82be20..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-build-without-webrtc.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From f500275e774945c8c19dc3e763510f04bca52261 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Tue, 31 Jul 2018 15:42:09 +0200
-Subject: Fix build with plugins enabled and webrtc disabled
-
-Change-Id: I2f4f9517943571ba89fdb6a48fd4381d179a96a6
-Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
----
- chromium/content/renderer/pepper/pepper_media_device_manager.cc | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/chromium/content/renderer/pepper/pepper_media_device_manager.cc b/chromium/content/renderer/pepper/pepper_media_device_manager.cc
-index 2a1593afe4..99f2c3fb7f 100644
---- a/src/3rdparty/chromium/content/renderer/pepper/pepper_media_device_manager.cc
-+++ b/src/3rdparty/chromium/content/renderer/pepper/pepper_media_device_manager.cc
-@@ -114,9 +114,10 @@ void PepperMediaDeviceManager::EnumerateDevices(
- callback, ToMediaDeviceType(type)));
- #else
- base::ThreadTaskRunnerHandle::Get()->PostTask(
-- FROM_HERE, base::Bind(&PepperMediaDeviceManager::DevicesEnumerated,
-- AsWeakPtr(), callback, ToMediaDeviceType(type),
-- std::vector<MediaDeviceInfoArray>()));
-+ FROM_HERE, base::BindOnce(&PepperMediaDeviceManager::DevicesEnumerated,
-+ AsWeakPtr(), callback, ToMediaDeviceType(type),
-+ std::vector<MediaDeviceInfoArray>(),
-+ std::vector<blink::mojom::VideoInputDeviceCapabilitiesPtr>()));
- #endif
- }
-
---
-cgit v1.2.1
-
-From 26d7e8597239035a2b57c73c92743dcdeffa9368 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Tue, 31 Jul 2018 18:40:01 +0200
-Subject: FIXUP: Fix build with plugins enabled and webrtc disabled
-
-Also fix linking error, and turn it into a compiler error in the future.
-
-Change-Id: Ic6841eb70b40bd894495036d9d8d5a0a78fcf2b0
-Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
----
- chromium/content/renderer/pepper/pepper_media_device_manager.cc | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/chromium/content/renderer/pepper/pepper_media_device_manager.cc b/chromium/content/renderer/pepper/pepper_media_device_manager.cc
-index 99f2c3fb7f..19ff8c2e02 100644
---- a/src/3rdparty/chromium/content/renderer/pepper/pepper_media_device_manager.cc
-+++ b/src/3rdparty/chromium/content/renderer/pepper/pepper_media_device_manager.cc
-@@ -12,13 +12,16 @@
- #include "base/threading/thread_task_runner_handle.h"
- #include "content/public/common/console_message_level.h"
- #include "content/public/common/content_features.h"
--#include "content/renderer/media/stream/media_stream_device_observer.h"
- #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
- #include "content/renderer/render_frame_impl.h"
- #include "media/media_buildflags.h"
- #include "ppapi/shared_impl/ppb_device_ref_shared.h"
- #include "services/service_manager/public/cpp/interface_provider.h"
-
-+#if BUILDFLAG(ENABLE_WEBRTC)
-+#include "content/renderer/media/stream/media_stream_device_observer.h"
-+#endif
-+
- namespace content {
-
- namespace {
-@@ -267,8 +270,10 @@ void PepperMediaDeviceManager::OnDeviceOpened(int request_id,
- return;
- }
-
-+#if BUILDFLAG(ENABLE_WEBRTC)
- if (success)
- GetMediaStreamDeviceObserver()->AddStream(label, device);
-+#endif
-
- OpenDeviceCallback callback = iter->second;
- open_callbacks_.erase(iter);
---
-cgit v1.2.1
-
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index ef85e758..91c3f9fb 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -78,10 +78,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=(
- "${FILESDIR}/${PN}-5.12.0-build-without-webrtc.patch"
- "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" # bug 653078
-)
+PATCHES+=( "${FILESDIR}/${PN}-5.12.0-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 ef85e758..91c3f9fb 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -78,10 +78,7 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=(
- "${FILESDIR}/${PN}-5.12.0-build-without-webrtc.patch"
- "${FILESDIR}/${PN}-5.12.0-libxml2-disable-catalogs.patch" # bug 653078
-)
+PATCHES+=( "${FILESDIR}/${PN}-5.12.0-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] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-10-17 16:21 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2018-10-17 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 6010c5413c9eae99ff103d47699b90c782032915
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 16:18:13 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 16:18:13 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6010c541
dev-qt/qtwebengine: remove USE="system-libvpx"
The patch does not apply at this time, without some changes, and
upstream has worked around the build issues that occur due to the
still unreleased version of 'libvpx' that is required. As such, to
build using the bundled version, the flag is no longer needed, but
can be added back in the future if need be.
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../qtwebengine-5.12.0-add-libvpx-options.patch | 20 --------------------
dev-qt/qtwebengine/metadata.xml | 2 --
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 6 ++----
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 ++----
4 files changed, 4 insertions(+), 30 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
deleted file mode 100644
index fd278fe7..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.0-add-libvpx-options.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 429513db..acca7340 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -16,8 +16,6 @@
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 4fab7ab9..90b09f43 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 Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 +system-libvpx widgets"
+ +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES+=( "${FILESDIR}/${PN}-5.12.0-add-libvpx-options.patch" )
-
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 4fab7ab9..90b09f43 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.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
@@ -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 +system-libvpx widgets"
+ +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -79,8 +79,6 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-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] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-11-13 17:52 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2018-11-13 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 37f8becb08996226dd1e0a0bfaf4bd67e7418629
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 17:16:36 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 17:17:23 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=37f8becb
dev-qt/qtwebengine: Update paxmark-mksnapshot patch
Reported-by: Han <jkmls <AT> outlook.com>
Thanks-to: Attila Tóth <atoth <AT> atoth.sote.hu>
Thanks-to: Miroslaw Mieszczak <gentoo <AT> mieszczak.com.pl>
Bug: https://bugs.gentoo.org/670852
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++
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 +-
4 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
new file mode 100644
index 00000000..f7a5c064
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -803,6 +803,7 @@
+
+ deps = [
+ ":mksnapshot($v8_snapshot_toolchain)",
++ ":run_paxmark",
+ ]
+
+ script = "tools/run.py"
+@@ -854,6 +855,28 @@
+ }
+ }
+ }
++action("run_paxmark") {
++ visibility = [ ":*" ] # Only targets in this file can depend on this.
++
++ deps = [
++ ":mksnapshot($v8_snapshot_toolchain)",
++ ]
++
++ script = "/usr/sbin/pypaxctl"
++
++ sources = []
++
++ outputs = [
++ "$target_out_dir/mksnapshot",
++ ]
++
++ args = [
++ "-sm",
++ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++ "root_out_dir") + "/mksnapshot",
++ root_build_dir),
++ ]
++}
+
+ action("v8_dump_build_config") {
+ script = "tools/testrunner/utils/dump_build_config.py"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 57fa9ada..e9994435 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -84,7 +84,7 @@ PATCHES+=(
)
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 2a34a526..c3767074 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 2a34a526..c3767074 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2018-12-18 18:55 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2018-12-18 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 8044dd90e226c6cf7deddf540bd08b13dc55234a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 18:36:01 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 18:36:01 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8044dd90
dev-qt/qtwebengine: Fix nouveau-disable-gpu patch
Closes: https://bugs.gentoo.org/673398
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...atch => qtwebengine-5.12.0-nouveau-disable-gpu.patch} | 16 ++++++++--------
dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch
similarity index 86%
rename from dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch
rename to dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch
index aaf3aae4..ec315ca2 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-nouveau-disable-gpu.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.0-nouveau-disable-gpu.patch
@@ -7,11 +7,11 @@ It also crashes when running on wayland, the cause is not yet known.
Work around these issues by not doing GPU-accelerated rendering in such
cases.
-Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
+Index: qtwebengine-everywhere-src-5.12.0-alpha/src/core/web_engine_context.cpp
===================================================================
---- qtwebengine-everywhere-src-5.11.0.orig/src/core/web_engine_context.cpp
-+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
-@@ -100,6 +100,7 @@
+--- qtwebengine-everywhere-src-5.12.0-alpha.orig/src/core/web_engine_context.cpp
++++ qtwebengine-everywhere-src-5.12.0-alpha/src/core/web_engine_context.cpp
+@@ -101,6 +101,7 @@
#include <QOffscreenSurface>
#ifndef QT_NO_OPENGL
# include <QOpenGLContext>
@@ -19,7 +19,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
#endif
#include <QQuickWindow>
#include <QStringList>
-@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v
+@@ -162,6 +163,39 @@ void dummyGetPluginCallback(const std::v
}
#endif
@@ -59,13 +59,13 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
} // namespace
namespace QtWebEngineCore {
-@@ -414,6 +448,27 @@ WebEngineContext::WebEngineContext()
+@@ -440,6 +474,27 @@ WebEngineContext::WebEngineContext()
const char *glType = 0;
#ifndef QT_NO_OPENGL
+ bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU");
+
-+ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && platform.startsWith("wayland", Qt::CaseInsensitive))
++ if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND") && qApp->platformName().startsWith("wayland", Qt::CaseInsensitive))
+ {
+ qWarning() << "Running on wayland. Qt WebEngine will disable usage of the GPU.\n"
+ "Note: you can set the QT_WEBENGINE_DISABLE_WAYLAND_WORKAROUND\n"
@@ -87,7 +87,7 @@ Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp
bool tryGL =
!usingANGLE()
&& (!usingSoftwareDynamicGL()
-@@ -424,7 +479,7 @@ WebEngineContext::WebEngineContext()
+@@ -450,7 +505,7 @@ WebEngineContext::WebEngineContext()
|| enableWebGLSoftwareRendering
#endif
)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
index 3210a151..232f3195 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.0.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
- "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
+ "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
)
src_prepare() {
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index 3210a151..232f3195 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
- "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
+ "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
)
src_prepare() {
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2019-03-06 20:55 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2019-03-06 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 32d376215b9ba05ff3d8abe9b76a36b08b1a6f7b
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 6 20:48:36 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 6 20:50:45 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=32d37621
dev-qt/qtwebengine: fix CVE-2019-5786
Bug: https://bugs.gentoo.org/679530
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jimi Huotari <chiitoo <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 | 5 +++-
4 files changed, 36 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000..5dbc6172
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.1-CVE-2019-5786.patch
@@ -0,0 +1,29 @@
+# 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 48fcb535..50e3c61c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -81,6 +81,7 @@ 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 cff56886..2b24b481 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.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 ff148cf7..fbf405c6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -79,7 +79,10 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
-PATCHES=( "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch"
+ "${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" )
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2019-05-01 9:26 Michael Palimaka
0 siblings, 0 replies; 39+ messages in thread
From: Michael Palimaka @ 2019-05-01 9:26 UTC (permalink / raw
To: gentoo-commits
commit: b15d1aecf2a9022c2b4716fc70152db3e3e6596e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 1 09:25:31 2019 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 1 09:26:09 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b15d1aec
dev-qt/qtwebengine: remove patch landed upstream
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
.../files/qtwebengine-5.13.0-fixup-system-icu.patch | 17 -----------------
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 ----
2 files changed, 21 deletions(-)
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
deleted file mode 100644
index e7fb9f81..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index f880cc18..92ce913b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -78,10 +78,6 @@ 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] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2019-09-11 12:44 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2019-09-11 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 71741eaa85e8cac49adef366366edfe89b723a04
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 11 12:37:28 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 12:37:28 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=71741eaa
dev-qt/qtwebengine: Re-Drop USE geolocation, fix linux-headers-5.2
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 26 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 12 +++++-----
2 files changed, 33 insertions(+), 5 deletions(-)
--git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch
new file mode 100644
index 00000000..40d75ad3
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch
@@ -0,0 +1,26 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Thu, 11 Jul 2019 09:35:13 +0200
+Subject: fix build after y2038 changes in glibc
+Patch-mainline: submitted on 2019/07/11
+References: QTBUG-76963
+
+SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
+file wherever needed.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
+@@ -67,6 +67,7 @@ typedef void* SockOptArg;
+ #endif // WEBRTC_POSIX
+
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
++#include <linux/sockios.h>
+
+ int64_t GetSocketRecvTimestamp(int socket) {
+ struct timeval tv_ioctl;
+--
+2.21.0
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
index 20cbb0c2..dcdec942 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
+IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
+system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
@@ -24,6 +24,7 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtpositioning-${PV}
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
@@ -59,7 +60,6 @@ RDEPEND="
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -78,6 +78,11 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
"
+PATCHES+=(
+ # QTBUG-76963, not yet upstream:
+ "${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch"
+)
+
src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
@@ -90,9 +95,6 @@ src_prepare() {
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
- qt_use_disable_config geolocation webengine-geolocation \
- src/core/core_chromium.pri \
- src/core/core_common.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2019-10-19 22:43 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2019-10-19 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 9d8a69d0257d8eca4012a7ba63bd7d1bbf85873b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 22:41:05 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 22:41:05 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9d8a69d0
dev-qt/qtwebengine: Try to fix some randomly occurring build error
Thanks-to: Nicholas Meyer <nickaristocrates <AT> gmail.com>
Bug: https://bugs.gentoo.org/693668
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.13.1-no-kcrash-reporting.patch | 18 ++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 4 +++-
2 files changed, 21 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000..477e0f50
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch
@@ -0,0 +1,18 @@
+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.
\ No newline at end of file
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
index 8e40a949..59976932 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
@@ -80,8 +80,10 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
- # QTBUG-76963, not yet upstream:
+ # QTBUG-76963, 5.13 branch:
"${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch"
+ # bug 693668, upstream(?) TODO:
+ "${FILESDIR}/${P}-no-kcrash-reporting.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2019-10-23 23:38 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2019-10-23 23:38 UTC (permalink / raw
To: gentoo-commits
commit: 3af59f2e245c41373d5dbc50086705984f1aaabd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 23:38:08 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 23:38:08 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=3af59f2e
dev-qt/qtwebengine: Fix build against ICU-65
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.13.1-icu-65.patch | 41 ++++++++++++++++++++++
.../qtwebengine-5.13.1-no-kcrash-reporting.patch | 2 +-
dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 1 +
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch
new file mode 100644
index 00000000..b5df6c8f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch
@@ -0,0 +1,41 @@
+From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Fri, 23 Aug 2019 15:09:25 +0200
+Subject: Fix compilation with system ICU
+
+1. system_icu_config is missing default type for UCHAR_TYPE, that causes
+a mismatch of types all over Chromium. uint16_t is defined as a base type
+under linux in chromium/build/linux/unbundle/icu.gn.
+Necessary constructions were lost during recent refactorings,
+and seems to be restored in later chromium > 77.
+
+2. Update shim headers
+
+3. ICU upstream now requires that ICU4C API macros are used with a
+trailing semicolon.
+
+- https://unicode-org.atlassian.net/browse/ICU-20601
+- https://github.com/unicode-org/icu/pull/759
+
+Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
+Fixes: QTBUG-78911
+Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../blink/renderer/core/dom/document.cc | 2 +-
+ chromium/third_party/icu/BUILD.gn | 28 +++++++++++++++-------
+ 2 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
+index 920dab7c48d..43fd422393c 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
+
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (c == ':') {
+ if (saw_colon)
+ return ParseQualifiedNameResult(kQNMultipleColons);
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
index 477e0f50..6f66c262 100644
--- 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
@@ -15,4 +15,4 @@ Signed-off-by: Nicholas Meyer <nickaristocrates@gmail.com>
+ base::FEATURE_DISABLED_BY_DEFAULT};
// Enables specification of a target element in the fragment identifier
- // via a CSS selector.
\ No newline at end of file
+ // 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 59976932..c6a04c51 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
@@ -80,6 +80,7 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
+ "${FILESDIR}/${P}-icu-65.patch"
# QTBUG-76963, 5.13 branch:
"${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch"
# bug 693668, upstream(?) TODO:
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2019-10-28 21:23 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2019-10-28 21:23 UTC (permalink / raw
To: gentoo-commits
commit: af39f7cd56505da2e3fe4a75a63a3a4bc7d3a456
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 18:32:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 18:32:26 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=af39f7cd
dev-qt/qtwebengine: Fix 5.14.0_beta2 build against ICU-65
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.14.0_beta2-icu-65.patch | 157 +++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild | 1 +
2 files changed, 158 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.0_beta2-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.0_beta2-icu-65.patch
new file mode 100644
index 00000000..028b26b5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.0_beta2-icu-65.patch
@@ -0,0 +1,157 @@
+From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Fri, 23 Aug 2019 15:09:25 +0200
+Subject: Fix compilation with system ICU
+
+1. system_icu_config is missing default type for UCHAR_TYPE, that causes
+a mismatch of types all over Chromium. uint16_t is defined as a base type
+under linux in chromium/build/linux/unbundle/icu.gn.
+Necessary constructions were lost during recent refactorings,
+and seems to be restored in later chromium > 77.
+
+2. Update shim headers
+
+3. ICU upstream now requires that ICU4C API macros are used with a
+trailing semicolon.
+
+- https://unicode-org.atlassian.net/browse/ICU-20601
+- https://github.com/unicode-org/icu/pull/759
+
+Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
+Fixes: QTBUG-78911
+Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../blink/renderer/core/dom/document.cc | 2 +-
+ chromium/third_party/icu/BUILD.gn | 28 +++++++++++++++-------
+ 2 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+index 920dab7c48d..43fd422393c 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
+
+ for (unsigned i = 0; i < length;) {
+ UChar32 c;
+- U16_NEXT(characters, i, length, c)
++ U16_NEXT(characters, i, length, c);
+ if (c == ':') {
+ if (saw_colon)
+ return ParseQualifiedNameResult(kQNMultipleColons);
+diff --git a/src/3rdparty/chromium/third_party/icu/BUILD.gn b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+index 8809dcfbcd4..489a87e6080 100644
+--- a/src/3rdparty/chromium/third_party/icu/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+@@ -1176,6 +1176,12 @@ config("system_icu_config") {
+ "USING_SYSTEM_ICU=1",
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+ ]
++
++ if (is_win) {
++ defines += [ "UCHAR_TYPE=wchar_t" ]
++ } else {
++ defines += [ "UCHAR_TYPE=uint16_t" ]
++ }
+ }
+
+ if (use_system_icu) {
+@@ -1193,9 +1199,7 @@ shim_headers("icui18n_shim") {
+ prefix = "unicode/"
+ headers = [
+ # This list can easily be updated using the command below:
+- # find third_party/icu/source/i18n/unicode \
+- # -iname '*.h' -printf '"%p",\n' | \
+- # sed -e 's|third_party/icu/source/i18n/unicode/||' | sort -u
++ # find third_party/icu/source/i18n/unicode -iname '*.h' -printf '%f\n' | sort -Vu | sed -e 's/.*/"&",/'
+ "alphaindex.h",
+ "basictz.h",
+ "calendar.h",
+@@ -1217,15 +1221,18 @@ shim_headers("icui18n_shim") {
+ "fieldpos.h",
+ "fmtable.h",
+ "format.h",
++ "formattedvalue.h",
+ "fpositer.h",
+ "gender.h",
+ "gregocal.h",
++ "listformatter.h",
+ "measfmt.h",
+ "measunit.h",
+ "measure.h",
+ "msgfmt.h",
+ "nounit.h",
+ "numberformatter.h",
++ "numberrangeformatter.h",
+ "numfmt.h",
+ "numsys.h",
+ "plurfmt.h",
+@@ -1261,11 +1268,14 @@ shim_headers("icui18n_shim") {
+ "udatpg.h",
+ "ufieldpositer.h",
+ "uformattable.h",
++ "uformattedvalue.h",
+ "ugender.h",
++ "ulistformatter.h",
+ "ulocdata.h",
+ "umsg.h",
+ "unirepl.h",
+ "unum.h",
++ "unumberformatter.h",
+ "unumsys.h",
+ "upluralrules.h",
+ "uregex.h",
+@@ -1284,9 +1294,7 @@ shim_headers("icuuc_shim") {
+ prefix = "unicode/"
+ headers = [
+ # This list can easily be updated using the command below:
+- # find third_party/icu/source/common/unicode \
+- # -iname '*.h' -printf '"%p",\n' | \
+- # sed -e 's|third_party/icu/source/common/unicode/||' | sort -u
++ # find third_party/icu/source/common/unicode -iname '*.h' -printf '%f\n' | sort -Vu | sed -e 's/.*/"&",/'
+ "appendable.h",
+ "brkiter.h",
+ "bytestream.h",
+@@ -1306,6 +1314,7 @@ shim_headers("icuuc_shim") {
+ "icudataver.h",
+ "icuplug.h",
+ "idna.h",
++ "localebuilder.h",
+ "localpointer.h",
+ "locdspnm.h",
+ "locid.h",
+@@ -1339,10 +1348,12 @@ shim_headers("icuuc_shim") {
+ "uchriter.h",
+ "uclean.h",
+ "ucnv.h",
++ "ucnvsel.h",
+ "ucnv_cb.h",
+ "ucnv_err.h",
+- "ucnvsel.h",
+ "uconfig.h",
++ "ucpmap.h",
++ "ucptrie.h",
+ "ucurr.h",
+ "udata.h",
+ "udisplaycontext.h",
+@@ -1353,6 +1364,7 @@ shim_headers("icuuc_shim") {
+ "uloc.h",
+ "umachine.h",
+ "umisc.h",
++ "umutablecptrie.h",
+ "unifilt.h",
+ "unifunct.h",
+ "unimatch.h",
+@@ -1373,9 +1385,9 @@ shim_headers("icuuc_shim") {
+ "ustringtrie.h",
+ "utext.h",
+ "utf.h",
++ "utf8.h",
+ "utf16.h",
+ "utf32.h",
+- "utf8.h",
+ "utf_old.h",
+ "utrace.h",
+ "utypes.h",
+--
+cgit v1.2.1
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild
index 35adda04..8ef8814c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild
@@ -79,6 +79,7 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
+ "${FILESDIR}/${P}-icu-65.patch"
# bug 693668, upstream(?) TODO:
"${FILESDIR}/${PN}-5.13.1-no-kcrash-reporting.patch"
)
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2019-10-28 21:23 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2019-10-28 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 4d6d86125f464a5834917f3e932ba71cfa4b41ea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 18:38:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 18:40:10 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4d6d8612
dev-qt/qtwebengine: Sync with ${PN}-5.12.5-icu-65.patch from Gentoo repo
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ine-5.13.1-icu-65.patch => qtwebengine-5.12.5-icu-65.patch} | 10 +---------
dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 4 ++--
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
similarity index 76%
rename from dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch
rename to dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
index b5df6c8f..d7fdaebd 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
@@ -3,15 +3,7 @@ From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Fri, 23 Aug 2019 15:09:25 +0200
Subject: Fix compilation with system ICU
-1. system_icu_config is missing default type for UCHAR_TYPE, that causes
-a mismatch of types all over Chromium. uint16_t is defined as a base type
-under linux in chromium/build/linux/unbundle/icu.gn.
-Necessary constructions were lost during recent refactorings,
-and seems to be restored in later chromium > 77.
-
-2. Update shim headers
-
-3. ICU upstream now requires that ICU4C API macros are used with a
+ICU upstream now requires that ICU4C API macros are used with a
trailing semicolon.
- https://unicode-org.atlassian.net/browse/ICU-20601
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
index c6a04c51..39f64d63 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
@@ -79,10 +79,10 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
+ "${FILESDIR}/${PN}-5.12.5-icu-65.patch"
"${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
- "${FILESDIR}/${P}-icu-65.patch"
# QTBUG-76963, 5.13 branch:
- "${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch"
+ "${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch"
# bug 693668, upstream(?) TODO:
"${FILESDIR}/${P}-no-kcrash-reporting.patch"
)
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2020-02-08 20:35 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2020-02-08 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 1063d701da0b8e04a5bb01dee749ce18bbb48c7a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 20:23:27 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 20:23:27 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1063d701
dev-qt/qtwebengine: pax_kernel is dead
Closes: https://bugs.gentoo.org/634220
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtwebengine-5.11.2-paxmark-mksnapshot.patch | 41 ----------------------
dev-qt/qtwebengine/metadata.xml | 1 -
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 13 +++----
dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 11 ++----
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 11 ++----
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 13 +++----
6 files changed, 14 insertions(+), 76 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
deleted file mode 100644
index f7a5c064..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Bug: https://bugs.gentoo.org/634220
-
---- a/src/3rdparty/chromium/v8/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/BUILD.gn
-@@ -803,6 +803,7 @@
-
- deps = [
- ":mksnapshot($v8_snapshot_toolchain)",
-+ ":run_paxmark",
- ]
-
- script = "tools/run.py"
-@@ -854,6 +855,28 @@
- }
- }
- }
-+action("run_paxmark") {
-+ visibility = [ ":*" ] # Only targets in this file can depend on this.
-+
-+ deps = [
-+ ":mksnapshot($v8_snapshot_toolchain)",
-+ ]
-+
-+ script = "/usr/sbin/pypaxctl"
-+
-+ sources = []
-+
-+ outputs = [
-+ "$target_out_dir/mksnapshot",
-+ ]
-+
-+ args = [
-+ "-sm",
-+ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
-+ "root_out_dir") + "/mksnapshot",
-+ root_build_dir),
-+ ]
-+}
-
- action("v8_dump_build_config") {
- script = "tools/testrunner/utils/dump_build_config.py"
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 75d11c0b..380559ac 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -9,7 +9,6 @@
<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="jumbo-build">Combine source files to speed up build process.</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.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
index cdbb48bf..1ef75cf4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
"
PATCHES+=(
@@ -83,8 +82,6 @@ PATCHES+=(
)
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/core/config/common.pri || die
@@ -128,6 +125,4 @@ src_install() {
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
-
- pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
index 59cd6171..2f92716a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation jumbo-build pax_kernel
- pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -75,12 +75,9 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
@@ -125,6 +122,4 @@ src_install() {
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
-
- pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index c34e9f79..0af3da8e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer geolocation jumbo-build pax_kernel
- pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -75,12 +75,9 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
@@ -126,6 +123,4 @@ src_install() {
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
-
- pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 3ec1fb34..7c6f51fc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -75,12 +75,9 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/core/config/common.pri || die
@@ -124,6 +121,4 @@ src_install() {
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
-
- pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2021-03-25 23:49 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-03-25 23:49 UTC (permalink / raw
To: gentoo-commits
commit: 9e575c776155d1fd22c1f9d2d1afbdc735ffe36e
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 24 00:15:34 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 23:49:14 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9e575c77
dev-qt/qtwebengine: restore ppc64 keyword for 5.15.2_p20210224
add new patchet, based on chromium-87
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
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/qtwebengine-5.15.9999.ebuild | 7 ++--
3 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index e93d7c47..5a8a2231 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1 +1 @@
-DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
+DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
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
new file mode 100644
index 00000000..4fb19ccd
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
@@ -0,0 +1,37 @@
+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/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
index d2b9e762..a38e6be2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
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 )"
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
@@ -142,7 +142,10 @@ src_prepare() {
# we need to generate ppc64 stuff because upstream does not ship it yet
if use ppc64; then
einfo "Patching for ppc64le and generating build files"
- eapply "${WORKDIR}/${PN}-ppc64"
+ eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
+ pushd src/3rdparty/chromium > /dev/null || die
+ eapply -p0 "${WORKDIR}/${PN}-ppc64le"
+ popd > /dev/null || die
pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
mkdir -vp source/config/linux/ppc64 || die
mkdir -p source/libvpx/test || die
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2021-09-30 11:35 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 58b8abb62752a4d0b7ebb920afc25ce383bbfa45
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 6 17:59:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 10:40:24 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=58b8abb6
dev-qt/qtwebengine: Add Fedora patch for GLIBC-2.33
(sync with Gentoo ebuild repository)
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtwebengine-5.15.2_p20210406-glibc-2.33.patch | 141 +++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 1 +
2 files changed, 142 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch
new file mode 100644
index 00000000..cb90428e
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch
@@ -0,0 +1,141 @@
+diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+ return RestrictKillTarget(current_pid, sysno);
+ }
+
++#if defined(__NR_newfstatat)
++ if (sysno == __NR_newfstatat) {
++ return RewriteFstatatSIGSYS();
++ }
++#endif
++
++#if defined(__NR_fstatat64)
++ if (sysno == __NR_fstatat64) {
++ return RewriteFstatatSIGSYS();
++ }
++#endif
++
+ if (SyscallSets::IsFileSystem(sysno) ||
+ SyscallSets::IsCurrentDirectory(sysno)) {
+ return Error(fs_denied_errno);
+diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+@@ -6,6 +6,8 @@
+
+ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
+
++#include <errno.h>
++#include <fcntl.h>
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
+@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
+ return -ENOSYS;
+ }
+
++intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
++ void* aux) {
++ switch (args.nr) {
++#if defined(__NR_newfstatat)
++ case __NR_newfstatat:
++#endif
++#if defined(__NR_fstatat64)
++ case __NR_fstatat64:
++#endif
++#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
++ if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
++ && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
++ return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
++ reinterpret_cast<struct stat64 *>(args.args[2]));
++ } else {
++ errno = EACCES;
++ return -1;
++ }
++ break;
++#endif
++ }
++
++ CrashSIGSYS_Handler(args, aux);
++
++ // Should never be reached.
++ RAW_CHECK(false);
++ return -ENOSYS;
++}
++
+ bpf_dsl::ResultExpr CrashSIGSYS() {
+ return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
+ }
+@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
+ return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
+ }
+
++bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
++ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
++}
++
+ void AllocateCrashKeys() {
+ #if !defined(OS_NACL_NONSFI)
+ if (seccomp_crash_key)
+diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
+@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
+ // sched_setparam(), sched_setscheduler()
+ SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
+ void* aux);
++// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
++// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
++SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
++ void* aux);
+
+ // Variants of the above functions for use with bpf_dsl.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
+@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
++SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
+
+ // Allocates a crash key so that Seccomp information can be recorded.
+ void AllocateCrashKeys();
+diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
+
+ #endif // defined(MEMORY_SANITIZER)
+
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
++{
++#if defined(__NR_fstat64)
++ return syscall(__NR_fstat64, fd, buf);
++#else
++ return syscall(__NR_fstat, fd, buf);
++#endif
++}
++
+ } // namespace sandbox
+diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
+@@ -17,6 +17,7 @@ struct sock_fprog;
+ struct rlimit64;
+ struct cap_hdr;
+ struct cap_data;
++struct stat64;
+
+ namespace sandbox {
+
+@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
+ const struct sigaction* act,
+ struct sigaction* oldact);
+
++// Recent glibc rewrites fstat to fstatat.
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
++
+ } // namespace sandbox
+
+ #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index 57d3478d..3a092b0f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -102,6 +102,7 @@ PATCHES=(
"${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
+ "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
)
pkg_preinst() {
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2021-09-30 11:35 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 5bfd9878ff738a85fa2f4be47c362ac4c7a08cdb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 28 10:13:58 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 10:41:00 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5bfd9878
dev-qt/qtwebengine: Support EXTRA_GN env var
(sync with Gentoo ebuild repository)
Thanks-to: Jannik Glückert <jannik.glueckert <AT> gmail.com>
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 12 ++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 1 +
2 files changed, 13 insertions(+)
--git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
new file mode 100644
index 00000000..0488122c
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
@@ -0,0 +1,12 @@
+diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
+index 3d6fda80e..3d0bc86fe 100644
+--- a/src/core/gn_run.pro
++++ b/src/core/gn_run.pro
+@@ -38,5 +38,6 @@ build_pass|!debug_and_release {
+ }
+
++ gn_args += $$(EXTRA_GN)
+ gn_args = $$system_quote($$gn_args)
+ gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
+ gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
+ gn_python = "--script-executable=$$pythonPathForSystem()"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index c096ab58..e6ec7679 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -100,6 +100,7 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${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_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2021-09-30 11:35 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-09-30 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 02565a77561b74f2d0fda1a48f9429d645a162d3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 28 10:16:32 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 10:41:00 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=02565a77
dev-qt/qtwebengine: Rebase disable-fatal-warnings.patch
(sync with Gentoo ebuild repository)
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.15.0-disable-fatal-warnings.patch | 10 ----------
.../files/qtwebengine-5.15.2-disable-fatal-warnings.patch | 12 ++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
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
deleted file mode 100644
index af602855..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-disable-fatal-warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/qtwebengine-5.15.2-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
new file mode 100644
index 00000000..b0f5f3d3
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
@@ -0,0 +1,12 @@
+diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
+index cf990c79..910a88ca 100644
+--- a/src/buildtools/config/common.pri
++++ b/src/buildtools/config/common.pri
+@@ -26,6 +26,7 @@ gn_args += \
+ skia_use_dawn=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.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index e6ec7679..d1ba0e1a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -99,7 +99,7 @@ BDEPEND="${PYTHON_DEPS}
"
PATCHES=(
- "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${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.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] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2021-11-16 0:55 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2021-11-16 0:55 UTC (permalink / raw
To: gentoo-commits
commit: 1cfaeb9ee418d1133f6a86c99a6175268c25ce24
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 22:25:30 2021 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 00:55:08 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1cfaeb9e
dev-qt/qtwebengine: remove the obsolete glibc-2.33 patch
The patch no longer applies, and the issue that it was fixing has
been fixed upstream.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
.../qtwebengine-5.15.2_p20210406-glibc-2.33.patch | 141 ---------------------
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 1 -
2 files changed, 142 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch
deleted file mode 100644
index cb90428e..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210406-glibc-2.33.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
- return RestrictKillTarget(current_pid, sysno);
- }
-
-+#if defined(__NR_newfstatat)
-+ if (sysno == __NR_newfstatat) {
-+ return RewriteFstatatSIGSYS();
-+ }
-+#endif
-+
-+#if defined(__NR_fstatat64)
-+ if (sysno == __NR_fstatat64) {
-+ return RewriteFstatatSIGSYS();
-+ }
-+#endif
-+
- if (SyscallSets::IsFileSystem(sysno) ||
- SyscallSets::IsCurrentDirectory(sysno)) {
- return Error(fs_denied_errno);
-diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
-@@ -6,6 +6,8 @@
-
- #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
-
-+#include <errno.h>
-+#include <fcntl.h>
- #include <stddef.h>
- #include <stdint.h>
- #include <string.h>
-@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
- return -ENOSYS;
- }
-
-+intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
-+ void* aux) {
-+ switch (args.nr) {
-+#if defined(__NR_newfstatat)
-+ case __NR_newfstatat:
-+#endif
-+#if defined(__NR_fstatat64)
-+ case __NR_fstatat64:
-+#endif
-+#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
-+ if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
-+ && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
-+ return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
-+ reinterpret_cast<struct stat64 *>(args.args[2]));
-+ } else {
-+ errno = EACCES;
-+ return -1;
-+ }
-+ break;
-+#endif
-+ }
-+
-+ CrashSIGSYS_Handler(args, aux);
-+
-+ // Should never be reached.
-+ RAW_CHECK(false);
-+ return -ENOSYS;
-+}
-+
- bpf_dsl::ResultExpr CrashSIGSYS() {
- return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
- }
-@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
- return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
- }
-
-+bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
-+ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
-+}
-+
- void AllocateCrashKeys() {
- #if !defined(OS_NACL_NONSFI)
- if (seccomp_crash_key)
-diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
-+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
-@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
- // sched_setparam(), sched_setscheduler()
- SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
- void* aux);
-+// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
-+// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
-+SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
-+ void* aux);
-
- // Variants of the above functions for use with bpf_dsl.
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
-@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
- SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
-+SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
-
- // Allocates a crash key so that Seccomp information can be recorded.
- void AllocateCrashKeys();
-diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
---- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
-@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
-
- #endif // defined(MEMORY_SANITIZER)
-
-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
-+{
-+#if defined(__NR_fstat64)
-+ return syscall(__NR_fstat64, fd, buf);
-+#else
-+ return syscall(__NR_fstat, fd, buf);
-+#endif
-+}
-+
- } // namespace sandbox
-diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
---- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
-+++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
-@@ -17,6 +17,7 @@ struct sock_fprog;
- struct rlimit64;
- struct cap_hdr;
- struct cap_data;
-+struct stat64;
-
- namespace sandbox {
-
-@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
- const struct sigaction* act,
- struct sigaction* oldact);
-
-+// Recent glibc rewrites fstat to fstatat.
-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
-+
- } // namespace sandbox
-
- #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index fd971278..c8060e90 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -104,7 +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_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
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2021-12-24 23:57 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-12-24 23:57 UTC (permalink / raw
To: gentoo-commits
commit: 83411b823ced34db7cad8f19b7c4212b4af5ffe7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 06:43:59 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 23:55:51 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=83411b82
dev-qt/qtwebengine: Sync patches from Gentoo ebuild repo
- pdfium-system-lcms2 patch
- supposed systemwide-clang w/ glibc-2.34 fix
Bug: https://bugs.gentoo.org/828099
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...gine-5.15.2_p20211015-pdfium-system-lcms2.patch | 79 ++++++++++++++++++++++
...ngine-5.15.2_p20211210-sandbox-glibc-2.34.patch | 27 ++++++++
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 2 +
3 files changed, 108 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
new file mode 100644
index 00000000..b3c2ffb3
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
@@ -0,0 +1,79 @@
+Description: Use system lcms2
+Author: Sandro Knauß <hefee@debian.org>
+Origin: Debian
+Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
+Reviewed-by: Sandro Knauß <hefee@debian.org>
+Last-Update: 2021-03-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
+@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths
+ }
+ }
+
+-config("fx_lcms2_warnings") {
+- visibility = [ ":*" ]
+- if (is_clang) {
+- cflags = [
+- # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
+- # library doesn't appear to have this problem.
+- "-Wno-missing-braces",
+- ]
+- }
++import("//build/shim_headers.gni")
++
++shim_headers("lcms2_shim") {
++ root_path = "lcms/include"
++ headers = [
++ "lcms2.h",
++ "lcms2_plugin.h",
++ ]
+ }
+
+ source_set("fx_lcms2") {
+- configs -= [ "//build/config/compiler:chromium_code" ]
+- configs += [
+- "//build/config/compiler:no_chromium_code",
+- "//build/config/sanitizers:cfi_icall_generalize_pointers",
+- ":pdfium_third_party_config",
+-
+- # Must be after no_chromium_code for warning flags to be ordered correctly.
+- ":fx_lcms2_warnings",
+- ]
+- sources = [
+- "lcms/include/lcms2.h",
+- "lcms/include/lcms2_plugin.h",
+- "lcms/src/cmsalpha.c",
+- "lcms/src/cmscam02.c",
+- "lcms/src/cmscgats.c",
+- "lcms/src/cmscnvrt.c",
+- "lcms/src/cmserr.c",
+- "lcms/src/cmsgamma.c",
+- "lcms/src/cmsgmt.c",
+- "lcms/src/cmshalf.c",
+- "lcms/src/cmsintrp.c",
+- "lcms/src/cmsio0.c",
+- "lcms/src/cmsio1.c",
+- "lcms/src/cmslut.c",
+- "lcms/src/cmsmd5.c",
+- "lcms/src/cmsmtrx.c",
+- "lcms/src/cmsnamed.c",
+- "lcms/src/cmsopt.c",
+- "lcms/src/cmspack.c",
+- "lcms/src/cmspcs.c",
+- "lcms/src/cmsplugin.c",
+- "lcms/src/cmsps2.c",
+- "lcms/src/cmssamp.c",
+- "lcms/src/cmssm.c",
+- "lcms/src/cmstypes.c",
+- "lcms/src/cmsvirt.c",
+- "lcms/src/cmswtpnt.c",
+- "lcms/src/cmsxform.c",
+- ]
+- deps = [ "../core/fxcrt" ]
++ deps = [ ":lcms2_shim" ]
++ libs = ["lcms2"]
+ }
+
+ if (!build_with_chromium) {
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
new file mode 100644
index 00000000..aac512a3
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
@@ -0,0 +1,27 @@
+Patch taken from www-client/chromium:
+https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-glibc-2.34.patch
+
+Dropped parts already upstream.
+
+diff --git a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+index ca6b595..1c1ee42 100644
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -11,6 +11,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() {
+ // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
+ clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
+
+- char tls_buf[PTHREAD_STACK_MIN] = {0};
++ char tls_buf[PTHREAD_STACK_MIN];
++ memset(tls_buf, 0, PTHREAD_STACK_MIN);
+ tls = tls_buf;
+ #endif
+
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index f2b7c789..d7d70f98 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-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.2_p20211210-sandbox-glibc-2.34.patch" # bug 828099, systemwide-clang?
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
)
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2021-12-24 23:57 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-12-24 23:57 UTC (permalink / raw
To: gentoo-commits
commit: a6c5e4451941cb87c1fdd3121f36e2ba5f132648
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sat Jun 19 22:32:36 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 23:44:47 2021 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a6c5e445
dev-qt/qtwebengine: fix build with sys-devel/clang[default-libcxx]
See also: https://github.com/gentoo/gentoo/pull/21337
Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.15.2_p20210521-clang-libc++.patch | 10 ++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 5 +++++
2 files changed, 15 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch
new file mode 100644
index 00000000..fdcc7879
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch
@@ -0,0 +1,10 @@
+--- a/src/buildtools/gn.pro
++++ b/src/buildtools/gn.pro
+@@ -25,6 +25,7 @@
+ msvc:!clang_cl: gn_gen_args += --use-lto
+
+ gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args
++ gn_configure += --no-static-libstdc++
+ macos {
+ gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\"
+ }
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index c8411e17..f2b7c789 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -170,6 +170,11 @@ src_prepare() {
done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
fi
+ # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
+ if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
+
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2022-04-01 18:23 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2022-04-01 18:23 UTC (permalink / raw
To: gentoo-commits
commit: afba13087b9d6c2e5edb675882e147f8f1148588
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 1 18:22:53 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 18:23:36 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=afba1308
dev-qt/qtwebengine: Drop upstreamed patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ngine-5.15.2_p20211210-sandbox-glibc-2.34.patch | 27 ----------------------
dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 1 -
2 files changed, 28 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
deleted file mode 100644
index aac512a3..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch taken from www-client/chromium:
-https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-glibc-2.34.patch
-
-Dropped parts already upstream.
-
-diff --git a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-index ca6b595..1c1ee42 100644
---- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-@@ -11,6 +11,7 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <stdio.h>
-+#include <string.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() {
- // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
- clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
-
-- char tls_buf[PTHREAD_STACK_MIN] = {0};
-+ char tls_buf[PTHREAD_STACK_MIN];
-+ memset(tls_buf, 0, PTHREAD_STACK_MIN);
- tls = tls_buf;
- #endif
-
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
index 3f5a4cb4..8c44a498 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
@@ -106,7 +106,6 @@ 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.2_p20211210-sandbox-glibc-2.34.patch" # bug 828099, systemwide-clang?
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
)
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2022-04-05 17:07 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2022-04-05 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 07dfab4b3469b6455f543f156b66816602eaf14d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 5 15:36:00 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 17:07:12 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=07dfab4b
dev-qt/qtwebengine: Fix build with >=ffmpeg-5
Patch sourced from ArchLinux.
Closes: https://bugs.gentoo.org/831487
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtwebengine-5.15.3_p20220329-clang14.patch | 26 ++++
.../qtwebengine-5.15.3_p20220330-ffmpeg5.patch | 169 +++++++++++++++++++++
dev-qt/qtwebengine/metadata.xml | 12 +-
dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 6 +-
4 files changed, 204 insertions(+), 9 deletions(-)
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
index ed48544f..c1a98d09 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
@@ -1,3 +1,29 @@
+From 0825e7bc64e47d87e1f1026cc80c933550f114f5 Mon Sep 17 00:00:00 2001
+From: Dimitry Andric <dim@FreeBSD.org>
+Date: Mon, 14 Feb 2022 13:55:25 +0100
+Subject: www/qt5-webengine: fix build with clang 14
+
+Fixes compile error:
+
+In file included from gen/third_party/blink/renderer/platform/platform_jumbo_63.cc:8:
+src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:122:15: error: anonymous non-C-compatible type given name for linkage purposes by typedef declaration after its linkage was computed; add a tag name here to establish linkage prior to definition
+typedef struct {
+ ^
+ UTextWithBuffer
+src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:123:3: note: type is not C-compatible due to this member declaration
+ DISALLOW_NEW();
+ ^~~~~~~~~~~~~~
+src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h:40:2: note: expanded from macro 'DISALLOW_NEW'
+ public: \
+ ^~~~~~~
+src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:126:3: note: type is given name 'UTextWithBuffer' for linkage purposes by this typedef declaration
+} UTextWithBuffer;
+ ^
+
+PR: 261949
+Approved by: adridg (maintainer)
+MFH: 2022Q1
+
--- 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
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch
new file mode 100644
index 00000000..d85c1985
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch
@@ -0,0 +1,169 @@
+From 05f6ffbbce0a2aad01dc05d682cbe4a1ec44fad5 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 25 Jan 2022 10:51:58 +0000
+Subject: [PATCH] Fix build with ffmpeg 5
+
+---
+ chromium/media/ffmpeg/ffmpeg_common.h | 1 +
+ chromium/media/filters/audio_file_reader.cc | 2 +-
+ chromium/media/filters/ffmpeg_audio_decoder.cc | 2 +-
+ chromium/media/filters/ffmpeg_demuxer.cc | 12 ++++++------
+ chromium/media/filters/ffmpeg_glue.cc | 4 ----
+ chromium/media/filters/ffmpeg_video_decoder.cc | 2 +-
+ chromium/media/filters/media_file_checker.cc | 2 +-
+ .../video_coding/codecs/h264/h264_decoder_impl.cc | 2 +-
+ 8 files changed, 12 insertions(+), 15 deletions(-)
+
+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
+@@ -29,6 +29,7 @@ extern "C" {
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/channel_layout.h>
+ #include <libavutil/imgutils.h>
+ #include <libavutil/log.h>
+ #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
+@@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
+ }
+
+ bool AudioFileReader::OpenDecoder() {
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (codec) {
+ // MP3 decodes to S16P which we don't support, tell it to use S16 instead.
+ 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
+@@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
+ }
+ }
+
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (!codec ||
+ avcodec_open2(codec_context_.get(), codec, &codec_options) < 0) {
+ 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
+@@ -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
+ // (excludes all H26x codecs). The start time must be returned in PTS.
+- if (stream->first_dts != kNoFFmpegTimestamp &&
++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
+ stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
+ stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
+ stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
+ const base::TimeDelta first_pts =
+- ConvertFromTimeBase(stream->time_base, stream->first_dts);
++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
+ if (first_pts < start_time)
+ start_time = first_pts;
+ }
+@@ -408,11 +408,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ scoped_refptr<DecoderBuffer> buffer;
+
+ if (type() == DemuxerStream::TEXT) {
+- int id_size = 0;
++ size_t id_size = 0;
+ uint8_t* id_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
+
+- int settings_size = 0;
++ size_t settings_size = 0;
+ uint8_t* settings_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
+
+@@ -424,7 +424,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
+ side_data.data(), side_data.size());
+ } else {
+- int side_data_size = 0;
++ size_t side_data_size = 0;
+ uint8_t* side_data = av_packet_get_side_data(
+ packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
+
+@@ -485,7 +485,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
+ packet->size - data_offset);
+ }
+
+- int skip_samples_size = 0;
++ size_t skip_samples_size = 0;
+ const uint32_t* skip_samples_ptr =
+ reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
+ 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
+@@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
+ }
+
+ void FFmpegGlue::InitializeFFmpeg() {
+- av_register_all();
+ }
+
+ static void LogContainer(bool is_local_file,
+@@ -95,9 +94,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
+ // Enable fast, but inaccurate seeks for MP3.
+ format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
+
+- // Ensures we can read out various metadata bits like vp8 alpha.
+- format_context_->flags |= AVFMT_FLAG_KEEP_SIDE_DATA;
+-
+ // Ensures format parsing errors will bail out. From an audit on 11/2017, all
+ // instances were real failures. Solves bugs like http://crbug.com/710791.
+ 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
+@@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
+ if (decode_nalus_)
+ codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
+
+- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
+ if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
+ ReleaseFFmpegResources();
+ 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
+@@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
+ auto context = AVStreamToAVCodecContext(format_context->streams[i]);
+ if (!context)
+ continue;
+- AVCodec* codec = avcodec_find_decoder(cp->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
+ if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
+ auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
+ 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
+@@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
+ // a pointer |this|.
+ av_context_->opaque = this;
+
+- AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
++ const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
+ if (!codec) {
+ // This is an indication that FFmpeg has not been initialized or it has not
+ // been compiled/initialized with the correct set of codecs.
+--
+2.35.1
+
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 944fcbe0..0bc98db9 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -11,16 +11,12 @@
<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>
+ <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>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
<flag name="pipewire">Enable PipeWire support for WebRTC.</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="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>
</use>
<upstream>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
index 53315490..b755d163 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild
@@ -106,8 +106,8 @@ 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
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # fixes build with clang 14
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
)
qtwebengine_check-reqs() {
@@ -199,6 +199,10 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
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
+ fi
+
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2022-04-26 15:03 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2022-04-26 15:03 UTC (permalink / raw
To: gentoo-commits
commit: ce687067d9fd189ca0faab3c31dc5b8f4db0d00f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 14:59:32 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 14:59:32 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ce687067
dev-qt/qtwebengine: fix 6.3.0 build with system-icu
Closes: https://bugs.gentoo.org/838742
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
.../files/qtwebengine-6.3.0-system-icu.patch | 38 ++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild | 2 ++
2 files changed, 40 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch
new file mode 100644
index 00000000..1cb94de2
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch
@@ -0,0 +1,38 @@
+From 75f0f4eb1e4f2823c39fe27137f78ac2c10bc293 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Thu, 31 Mar 2022 19:45:39 +0200
+Subject: [FIXUP] Fix compilation with system ICU
+
+As of chromium 92.0.4480.0 after a set of fixes ending with a
+https://chromium-review.googlesource.com/c/chromium/src/+/2830820
+the need to override UCHAR_TYPE was dropped with the result that
+codebase is ready for default 'char16_t'. Override was already dropped
+for 98-based, which already builds fine for system ICU 70.1
+
+Task-number: QTBUG-100495
+Change-Id: I0e6d422f77b77015840647b52247f51736dd8a41
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/third_party/icu/BUILD.gn | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
+index d5b136168ef..269de02eaaa 100644
+--- a/src/3rdparty/chromium/third_party/icu/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+@@ -410,12 +410,6 @@ config("system_icu_config") {
+ "USING_SYSTEM_ICU=1",
+ "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+ ]
+-
+- if (is_win) {
+- defines += [ "UCHAR_TYPE=wchar_t" ]
+- } else {
+- defines += [ "UCHAR_TYPE=uint16_t" ]
+- }
+ }
+
+ if (use_system_icu) {
+--
+cgit v1.2.1
+
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
index 3642199e..23eed817 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
@@ -87,6 +87,8 @@ DEPEND="${RDEPEND}
media-libs/libglvnd
"
+PATCHES=( "${FILESDIR}/${PN}-6.3.0-system-icu.patch" ) # https://bugs.gentoo.org/838742
+
python_check_deps() {
has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2022-06-20 18:03 Jimi Huotari
0 siblings, 0 replies; 39+ messages in thread
From: Jimi Huotari @ 2022-06-20 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 5202ae3dc355b004b9996c7efa96652337bc6be5
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 9 14:02:45 2022 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:02:04 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5202ae3d
dev-qt/qtwebengine: add/adjust patches for qt6
Add a bug link to the system-icu fix, and an additional
patch to first QTBUG-103778 [1].
1. https://bugreports.qt.io/browse/QTBUG-103778
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
.../qtwebengine-6.3.0-fix-user-navigation.patch | 146 +++++++++++++++++++++
.../files/qtwebengine-6.3.0-system-icu.patch | 4 +
dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild | 5 +-
3 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.0-fix-user-navigation.patch b/dev-qt/qtwebengine/files/qtwebengine-6.3.0-fix-user-navigation.patch
new file mode 100644
index 00000000..4afc39a9
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.3.0-fix-user-navigation.patch
@@ -0,0 +1,146 @@
+Retrieved from:
+
+- https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=8d0bd4b1
+- https://bugreports.qt.io/browse/QTBUG-103778
+
+From 8d0bd4b1a18ff886f360e71942f95858b5995ba3 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Tue, 24 May 2022 16:56:41 +0200
+Subject: Fix local->remote user navigation
+
+Specifically allow user initiated navigation of the mainframe.
+
+Fixes: QTBUG-103778
+Change-Id: I4e3d6b4fb606bd0c3cf66e090fba3c97c8c535b4
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+(cherry picked from commit 2ba1f04b4589e5883a399b022b7795266c4d4646)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+ src/core/net/proxying_url_loader_factory_qt.cpp | 19 ++++++-
+ .../widgets/qwebenginepage/tst_qwebenginepage.cpp | 65 ++++++++++++++++++++++
+ 2 files changed, 81 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/net/proxying_url_loader_factory_qt.cpp b/src/core/net/proxying_url_loader_factory_qt.cpp
+index 39630cf2d..ba2051d60 100644
+--- a/src/core/net/proxying_url_loader_factory_qt.cpp
++++ b/src/core/net/proxying_url_loader_factory_qt.cpp
+@@ -280,10 +280,23 @@ void InterceptedRequest::Restart()
+
+ // Check if non-local access is allowed
+ if (!allow_remote_ && remote_access_) {
+- target_client_->OnComplete(network::URLLoaderCompletionStatus(net::ERR_NETWORK_ACCESS_DENIED));
+- delete this;
+- return;
++ bool granted_special_access = false;
++ switch (ui::PageTransition(request_.transition_type)) {
++ case ui::PAGE_TRANSITION_LINK:
++ case ui::PAGE_TRANSITION_TYPED:
++ if (blink::mojom::ResourceType(request_.resource_type) == blink::mojom::ResourceType::kMainFrame && request_.has_user_gesture)
++ granted_special_access = true; // allow normal explicit navigation
++ break;
++ default:
++ break;
++ }
++ if (!granted_special_access) {
++ target_client_->OnComplete(network::URLLoaderCompletionStatus(net::ERR_NETWORK_ACCESS_DENIED));
++ delete this;
++ return;
++ }
+ }
++
+ // Check if local access is allowed
+ if (!allow_local_ && local_access_) {
+ bool granted_special_access = false;
+diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+index 227f33c17..32f866810 100644
+--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
++++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+@@ -257,6 +257,8 @@ private Q_SLOTS:
+ void testChooseFilesParameters();
+ void fileSystemAccessDialog();
+
++ void localToRemoteNavigation();
++
+ private:
+ static QPoint elementCenter(QWebEnginePage *page, const QString &id);
+ static bool isFalseJavaScriptResult(QWebEnginePage *page, const QString &javaScript);
+@@ -328,6 +330,14 @@ void tst_QWebEnginePage::initTestCase()
+ QWebEngineUrlScheme echo("echo");
+ echo.setSyntax(QWebEngineUrlScheme::Syntax::Path);
+ QWebEngineUrlScheme::registerScheme(echo);
++
++ QWebEngineUrlScheme local("local");
++ local.setFlags(QWebEngineUrlScheme::LocalScheme);
++ QWebEngineUrlScheme::registerScheme(local);
++
++ QWebEngineUrlScheme remote("remote");
++ remote.setFlags(QWebEngineUrlScheme::CorsEnabled);
++ QWebEngineUrlScheme::registerScheme(remote);
+ }
+
+ void tst_QWebEnginePage::cleanupTestCase()
+@@ -5010,6 +5020,61 @@ void tst_QWebEnginePage::isSafeRedirect()
+ spy.clear();
+ }
+
++class LocalRemoteUrlSchemeHandler : public QWebEngineUrlSchemeHandler
++{
++public:
++ LocalRemoteUrlSchemeHandler(QObject *parent = nullptr)
++ : QWebEngineUrlSchemeHandler(parent)
++ {
++ }
++ ~LocalRemoteUrlSchemeHandler() = default;
++
++ void requestStarted(QWebEngineUrlRequestJob *job) override
++ {
++ QBuffer *buffer = new QBuffer(job);
++ buffer->setData("<html><body><a href='remote://test.html' id='link'>Click link</a></body></html>");
++ job->reply("text/html", buffer);
++ loaded = true;
++ }
++ bool loaded = false;
++};
++
++void tst_QWebEnginePage::localToRemoteNavigation()
++{
++ LocalRemoteUrlSchemeHandler local;
++ LocalRemoteUrlSchemeHandler remote;
++ QWebEngineProfile profile;
++ profile.installUrlSchemeHandler("local", &local);
++ profile.installUrlSchemeHandler("remote", &remote);
++
++ QWebEnginePage page(&profile);
++ QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool)));
++ QWebEngineView view;
++ view.resize(640, 480);
++ view.show();
++ view.setPage(&page);
++ page.setUrl(QUrl("local://test.html"));
++ QVERIFY(QTest::qWaitForWindowExposed(&view));
++ QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
++ QVERIFY(local.loaded);
++
++ // Should navigate:
++ QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, elementCenter(&page, "link"));
++ QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 20000);
++ QVERIFY(remote.loaded);
++ local.loaded = false;
++ remote.loaded = false;
++
++ page.setUrl(QUrl("local://test.html"));
++ QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 3, 20000);
++ QVERIFY(local.loaded && !remote.loaded);
++
++ // Should not navigate:
++ page.runJavaScript(QStringLiteral("document.getElementById(\"link\").click()"));
++ QTest::qWait(500);
++ QVERIFY(!remote.loaded);
++}
++
+ static QByteArrayList params = {QByteArrayLiteral("--use-fake-device-for-media-stream")};
+ W_QTEST_MAIN(tst_QWebEnginePage, params)
+
+--
+cgit v1.2.1
+
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch
index 1cb94de2..5cf41a25 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.3.0-system-icu.patch
@@ -1,3 +1,7 @@
+Retrieved from:
+
+- https://bugs.gentoo.org/show_bug.cgi?id=838742
+
From 75f0f4eb1e4f2823c39fe27137f78ac2c10bc293 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Thu, 31 Mar 2022 19:45:39 +0200
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
index 23eed817..26784071 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.0.ebuild
@@ -87,7 +87,10 @@ DEPEND="${RDEPEND}
media-libs/libglvnd
"
-PATCHES=( "${FILESDIR}/${PN}-6.3.0-system-icu.patch" ) # https://bugs.gentoo.org/838742
+PATCHES=(
+ "${FILESDIR}/${PN}-6.3.0-system-icu.patch" # https://bugs.gentoo.org/838742
+ "${FILESDIR}/${PN}-6.3.0-fix-user-navigation.patch" # https://bugreports.qt.io/browse/QTBUG-103778
+)
python_check_deps() {
has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2023-04-10 21:41 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2023-04-10 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 6904ad37f912c366851a0d548b6b83307dfa227b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 21:40:32 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 21:40:41 2023 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6904ad37
dev-qt/qtwebengine: Sync with Gentoo ebuild repo
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 3 +-
...qtwebengine-5.15.2-disable-fatal-warnings.patch | 12 --
| 12 --
...ine-5.15.2_p20210224-chromium-87-v8-icu68.patch | 192 ---------------------
.../qtwebengine-5.15.2_p20210224-disable-git.patch | 15 --
...gine-5.15.2_p20211015-pdfium-system-lcms2.patch | 79 ---------
.../qtwebengine-5.15.3_p20220329-clang14.patch | 42 -----
.../qtwebengine-5.15.3_p20220406-ffmpeg5.patch | 169 ------------------
...webengine-5.15.3_p20220406-gcc12-includes.patch | 32 ----
| 10 --
dev-qt/qtwebengine/qtwebengine-5.15.9.9999.ebuild | 26 +--
11 files changed, 6 insertions(+), 586 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index d169e66b..5f21aaa9 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,2 @@
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-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
deleted file mode 100644
index b0f5f3d3..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
-index cf990c79..910a88ca 100644
---- a/src/buildtools/config/common.pri
-+++ b/src/buildtools/config/common.pri
-@@ -26,6 +26,7 @@ gn_args += \
- skia_use_dawn=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/files/qtwebengine-5.15.2-extra_gn.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
deleted file mode 100644
index 0488122c..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
-index 3d6fda80e..3d0bc86fe 100644
---- a/src/core/gn_run.pro
-+++ b/src/core/gn_run.pro
-@@ -38,5 +38,6 @@ build_pass|!debug_and_release {
- }
-
-+ gn_args += $$(EXTRA_GN)
- gn_args = $$system_quote($$gn_args)
- gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
- gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
- gn_python = "--script-executable=$$pythonPathForSystem()"
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
deleted file mode 100644
index a6856975..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-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/files/qtwebengine-5.15.2_p20210224-disable-git.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
deleted file mode 100644
index c31e8970..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-disable-git.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
deleted file mode 100644
index b3c2ffb3..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Use system lcms2
-Author: Sandro Knauß <hefee@debian.org>
-Origin: Debian
-Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
-Reviewed-by: Sandro Knauß <hefee@debian.org>
-Last-Update: 2021-03-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
-@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths
- }
- }
-
--config("fx_lcms2_warnings") {
-- visibility = [ ":*" ]
-- if (is_clang) {
-- cflags = [
-- # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
-- # library doesn't appear to have this problem.
-- "-Wno-missing-braces",
-- ]
-- }
-+import("//build/shim_headers.gni")
-+
-+shim_headers("lcms2_shim") {
-+ root_path = "lcms/include"
-+ headers = [
-+ "lcms2.h",
-+ "lcms2_plugin.h",
-+ ]
- }
-
- source_set("fx_lcms2") {
-- configs -= [ "//build/config/compiler:chromium_code" ]
-- configs += [
-- "//build/config/compiler:no_chromium_code",
-- "//build/config/sanitizers:cfi_icall_generalize_pointers",
-- ":pdfium_third_party_config",
--
-- # Must be after no_chromium_code for warning flags to be ordered correctly.
-- ":fx_lcms2_warnings",
-- ]
-- sources = [
-- "lcms/include/lcms2.h",
-- "lcms/include/lcms2_plugin.h",
-- "lcms/src/cmsalpha.c",
-- "lcms/src/cmscam02.c",
-- "lcms/src/cmscgats.c",
-- "lcms/src/cmscnvrt.c",
-- "lcms/src/cmserr.c",
-- "lcms/src/cmsgamma.c",
-- "lcms/src/cmsgmt.c",
-- "lcms/src/cmshalf.c",
-- "lcms/src/cmsintrp.c",
-- "lcms/src/cmsio0.c",
-- "lcms/src/cmsio1.c",
-- "lcms/src/cmslut.c",
-- "lcms/src/cmsmd5.c",
-- "lcms/src/cmsmtrx.c",
-- "lcms/src/cmsnamed.c",
-- "lcms/src/cmsopt.c",
-- "lcms/src/cmspack.c",
-- "lcms/src/cmspcs.c",
-- "lcms/src/cmsplugin.c",
-- "lcms/src/cmsps2.c",
-- "lcms/src/cmssamp.c",
-- "lcms/src/cmssm.c",
-- "lcms/src/cmstypes.c",
-- "lcms/src/cmsvirt.c",
-- "lcms/src/cmswtpnt.c",
-- "lcms/src/cmsxform.c",
-- ]
-- deps = [ "../core/fxcrt" ]
-+ deps = [ ":lcms2_shim" ]
-+ libs = ["lcms2"]
- }
-
- if (!build_with_chromium) {
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
deleted file mode 100644
index c1a98d09..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220329-clang14.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0825e7bc64e47d87e1f1026cc80c933550f114f5 Mon Sep 17 00:00:00 2001
-From: Dimitry Andric <dim@FreeBSD.org>
-Date: Mon, 14 Feb 2022 13:55:25 +0100
-Subject: www/qt5-webengine: fix build with clang 14
-
-Fixes compile error:
-
-In file included from gen/third_party/blink/renderer/platform/platform_jumbo_63.cc:8:
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:122:15: error: anonymous non-C-compatible type given name for linkage purposes by typedef declaration after its linkage was computed; add a tag name here to establish linkage prior to definition
-typedef struct {
- ^
- UTextWithBuffer
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:123:3: note: type is not C-compatible due to this member declaration
- DISALLOW_NEW();
- ^~~~~~~~~~~~~~
-src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/allocator/allocator.h:40:2: note: expanded from macro 'DISALLOW_NEW'
- public: \
- ^~~~~~~
-src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc:126:3: note: type is given name 'UTextWithBuffer' for linkage purposes by this typedef declaration
-} UTextWithBuffer;
- ^
-
-PR: 261949
-Approved by: adridg (maintainer)
-MFH: 2022Q1
-
---- 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/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
deleted file mode 100644
index 15c19266..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 05f6ffbbce0a2aad01dc05d682cbe4a1ec44fad5 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Tue, 25 Jan 2022 10:51:58 +0000
-Subject: [PATCH] Fix build with ffmpeg 5
-
----
- chromium/media/ffmpeg/ffmpeg_common.h | 1 +
- chromium/media/filters/audio_file_reader.cc | 2 +-
- chromium/media/filters/ffmpeg_audio_decoder.cc | 2 +-
- chromium/media/filters/ffmpeg_demuxer.cc | 12 ++++++------
- chromium/media/filters/ffmpeg_glue.cc | 4 ----
- chromium/media/filters/ffmpeg_video_decoder.cc | 2 +-
- chromium/media/filters/media_file_checker.cc | 2 +-
- .../video_coding/codecs/h264/h264_decoder_impl.cc | 2 +-
- 8 files changed, 12 insertions(+), 15 deletions(-)
-
-diff --git a/chromium/media/ffmpeg/ffmpeg_common.h b/chromium/media/ffmpeg/ffmpeg_common.h
-index 2734a485cbd..70b1877a43c 100644
---- 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>
- #include <libavutil/avutil.h>
-+#include <libavutil/channel_layout.h>
- #include <libavutil/imgutils.h>
- #include <libavutil/log.h>
- #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/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() {
- }
-
- bool AudioFileReader::OpenDecoder() {
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (codec) {
- // MP3 decodes to S16P which we don't support, tell it to use S16 instead.
- 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/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) {
- }
- }
-
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (!codec ||
- avcodec_open2(codec_context_.get(), codec, &codec_options) < 0) {
- 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/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
- // (excludes all H26x codecs). The start time must be returned in PTS.
-- if (stream->first_dts != kNoFFmpegTimestamp &&
-+ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
- stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
- stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
- stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
- const base::TimeDelta first_pts =
-- ConvertFromTimeBase(stream->time_base, stream->first_dts);
-+ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
- if (first_pts < start_time)
- start_time = first_pts;
- }
-@@ -408,11 +408,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- scoped_refptr<DecoderBuffer> buffer;
-
- if (type() == DemuxerStream::TEXT) {
-- int id_size = 0;
-+ size_t id_size = 0;
- uint8_t* id_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
-
-- int settings_size = 0;
-+ size_t settings_size = 0;
- uint8_t* settings_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
-
-@@ -424,7 +424,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
- side_data.data(), side_data.size());
- } else {
-- int side_data_size = 0;
-+ size_t side_data_size = 0;
- uint8_t* side_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
-
-@@ -485,7 +485,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- packet->size - data_offset);
- }
-
-- int skip_samples_size = 0;
-+ size_t skip_samples_size = 0;
- const uint32_t* skip_samples_ptr =
- reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
- 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/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) {
- }
-
- void FFmpegGlue::InitializeFFmpeg() {
-- av_register_all();
- }
-
- static void LogContainer(bool is_local_file,
-@@ -95,9 +94,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
- // Enable fast, but inaccurate seeks for MP3.
- format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
-
-- // Ensures we can read out various metadata bits like vp8 alpha.
-- format_context_->flags |= AVFMT_FLAG_KEEP_SIDE_DATA;
--
- // Ensures format parsing errors will bail out. From an audit on 11/2017, all
- // instances were real failures. Solves bugs like http://crbug.com/710791.
- 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/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;
-
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
- ReleaseFFmpegResources();
- 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/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)
- continue;
-- AVCodec* codec = avcodec_find_decoder(cp->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
- if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
- auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
- 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/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;
-
-- AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
- if (!codec) {
- // This is an indication that FFmpeg has not been initialized or it has not
- // been compiled/initialized with the correct set of codecs.
---
-2.35.1
-
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
deleted file mode 100644
index cd476564..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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",
diff --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
deleted file mode 100644
index a319f521..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9.9999.ebuild
index 8a56fb8f..d592d822 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -27,11 +27,10 @@ else
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
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.8_p20230313-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 screencast +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -82,7 +81,6 @@ RDEPEND="
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse )
screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
@@ -102,17 +100,7 @@ BDEPEND="${PYTHON_DEPS}
ppc64? ( >=dev-util/gn-0.1807 )
"
-PATCHES=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${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
-)
+PATCHES=( "${WORKDIR}/${PN}-5.15.8_p20230313-patchset" )
qtwebengine_check-reqs() {
# bug #307861
@@ -205,10 +193,6 @@ src_prepare() {
fi
fi
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- 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
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
@@ -255,7 +239,7 @@ src_configure() {
$(qt_use kerberos webengine-kerberos)
$(qt_use pulseaudio)
$(usex screencast -webengine-webrtc-pipewire '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ -qt-ffmpeg # bug 831487
$(qt_use system-icu webengine-icu)
)
qt5-build_src_configure
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
@ 2024-05-30 12:56 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2024-05-30 12:56 UTC (permalink / raw
To: gentoo-commits
commit: 64be399ea0f981090e24749a3aba7b5caf17ef9f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 12:06:21 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 30 12:55:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=64be399e
dev-qt/qtwebengine: Fix build w/ ICU-75
Patch sourced from Arch Linux.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtwebengine-5.15.14_p20240510-icu-75.patch | 102 +++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild | 3 +
2 files changed, 105 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch
new file mode 100644
index 00000000..d17e4ae6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch
@@ -0,0 +1,102 @@
+Thanks to Arch Linux:
+https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/blob/main/qt5-webengine-icu-75.patch?ref_type=heads
+
+diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+index b511a58c5a8..abd78a74ead 100644
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -566,7 +566,7 @@ config("compiler") {
+ # Override Chromium's default for projects that wish to stay on C++11.
+ cflags_cc += [ "-std=${standard_prefix}++11" ]
+ } else {
+- cflags_cc += [ "-std=${standard_prefix}++14" ]
++ cflags_cc += [ "-std=${standard_prefix}++17" ]
+ }
+ } else if (!is_win && !is_nacl) {
+ if (target_os == "android") {
+diff --git a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
+index f03ba1e4ab4..b1495f7ae74 100644
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
+@@ -195,7 +195,7 @@ NumPartitionPagesPerSuperPage() {
+ //
+ // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on all
+ // platforms, as Chrome's requirement is C++14 as of 2020.
+-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
++#if 0
+ static constexpr size_t kAlignment =
+ std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
+ #else
+diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
+index 76e627d27a3..942435f44a0 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
++++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H264_SPS_PARSER_H_
+
+ #include "absl/types/optional.h"
++#include <cstdint>
+
+ namespace rtc {
+ class BitBuffer;
+diff --git a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
+index d6c31b06887..d8852dfd186 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
++++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H264_PPS_PARSER_H_
+
+ #include "absl/types/optional.h"
++#include <cstdint>
+
+ namespace rtc {
+ class BitBuffer;
+diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
+index 3b9971abae1..d4458038527 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
+@@ -13,6 +13,7 @@
+
+ #include <array>
+ #include <vector>
++#include <memory>
+
+ #include "absl/types/optional.h"
+ #include "api/array_view.h"
+diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
+index 345e45ce127..e686e5d691a 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
+@@ -12,6 +12,7 @@
+ #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
+
+ #include <limits>
++#include <cstdint>
+
+ #include "absl/types/optional.h"
+
+diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
+index 8fcc799b795..bc69ddcf18c 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
+@@ -15,6 +15,7 @@
+ #include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics.h"
+ #include "third_party/blink/renderer/core/page/scrolling/text_fragment_finder.h"
+ #include "third_party/blink/renderer/platform/text/text_boundaries.h"
++#include "absl/base/attributes.h"
+
+ namespace blink {
+
+diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
+index df506f0fae6..1de105fed4a 100644
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/options.h
+@@ -180,7 +180,7 @@
+ // absl::variant is a typedef of std::variant, use the feature macro
+ // ABSL_USES_STD_VARIANT.
+
+-#define ABSL_OPTION_USE_STD_VARIANT 2
++#define ABSL_OPTION_USE_STD_VARIANT 0
+
+
+ // ABSL_OPTION_USE_INLINE_NAMESPACE
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
index 19bc378b..b589d62e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
@@ -173,6 +173,9 @@ src_prepare() {
xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
if use system-icu; then
+ if has_version ">=dev-libs/icu-75.1"; then
+ eapply "${FILESDIR}/${PN}-5.15.14_p20240510-icu-75.patch" # too invasive to apply unconditionally
+ fi
# Sanity check to ensure that bundled copy of ICU is not used.
# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
^ permalink raw reply related [flat|nested] 39+ messages in thread
end of thread, other threads:[~2024-05-30 12:56 UTC | newest]
Thread overview: 39+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-24 23:57 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-05-30 12:56 Andreas Sturmlechner
2023-04-10 21:41 Andreas Sturmlechner
2022-06-20 18:03 Jimi Huotari
2022-04-26 15:03 Jimi Huotari
2022-04-05 17:07 Andreas Sturmlechner
2022-04-01 18:23 Andreas Sturmlechner
2021-12-24 23:57 Andreas Sturmlechner
2021-11-16 0:55 Jimi Huotari
2021-09-30 11:35 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-03-25 23:49 Andreas Sturmlechner
2020-02-08 20:35 Andreas Sturmlechner
2019-10-28 21:23 Andreas Sturmlechner
2019-10-28 21:23 Andreas Sturmlechner
2019-10-23 23:38 Andreas Sturmlechner
2019-10-19 22:43 Andreas Sturmlechner
2019-09-11 12:44 Andreas Sturmlechner
2019-05-01 9:26 Michael Palimaka
2019-03-06 20:55 Jimi Huotari
2018-12-18 18:55 Andreas Sturmlechner
2018-11-13 17:52 Andreas Sturmlechner
2018-10-17 16:21 Jimi Huotari
2018-08-24 22:58 Jimi Huotari
2018-08-16 12:20 Jimi Huotari
2018-07-25 19:22 Jimi Huotari
2018-07-25 11:55 Jimi Huotari
2018-06-20 15:29 Andreas Sturmlechner
2018-06-20 15:29 Andreas Sturmlechner
2018-06-20 15:29 Andreas Sturmlechner
2018-06-19 20:12 Jimi Huotari
2018-06-16 18:04 Andreas Sturmlechner
2018-02-09 10:46 Michael Palimaka
2018-02-07 10:30 Michael Palimaka
2017-12-10 1:48 Michael Palimaka
2017-12-05 11:25 Michael Palimaka
2017-06-04 11:55 Michael Palimaka
2017-06-01 14:16 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox