summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-09-28 08:17:07 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-09-28 08:17:07 +0100
commit5a165c60b9b8c4847067cb83b4be7da785d01f93 (patch)
tree166b01591366d3479084ea774c888bc84aaa8d4f /dev-qt/qtwebengine
parenta5b65c81168c90928784a1e92cda84ed5d6b9eb3 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r--dev-qt/qtwebengine/Manifest8
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch29
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch30
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch33
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch88
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild138
-rw-r--r--dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild1
7 files changed, 91 insertions, 236 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 968ef0f4076d..024fb9af4a8e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,13 +1,9 @@
AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f
AUX qtwebengine-5.12.0-nouveau-disable-gpu.patch 3740 BLAKE2B fc2745ba0e3ac264d2f59ede3628f6d4d94db8f175c4cf68444e5dabb5fd0266957c804da7e0e761d8f39ddbe2781ae023aef8db1a907907e7db116b48a8cd11 SHA512 fe407c7907e6e9dd09be6e53f4c560ab453e5081fbbac4392b29fdb32cfccd1157e6a9ed2c7839b1aeda2088309e124b7130963175472a660ea46807299e8d9a
-AUX qtwebengine-5.12.4-bump-V8-patchlevel.patch 1003 BLAKE2B 44dd0aaa31a51f62d164b436f1938dd49cc1e82628410b4091c9e58ecdb64be2e74fd6850fcaf9728e62c1a3b583080780d5301ef54ad4b5f839d8f9c77580a1 SHA512 e0a1154124135dbffe2f8872d797f602e0817a35bbaec60850fb4f5ab2aecd8a5f47e2df1bc34ce3057b0ba5131882ce6b3347f6f6ab74bd59cb3bcc4d334127
-AUX qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch 1355 BLAKE2B 2778cba49d0d942ea09b65936a24de7b49392b9f477b018934984896dfe8f5d40beebc58648e6f0304bf43ba9762f125f2178b1351ef45abe502a24784930a5b SHA512 6eeade86772715f58771f7c6114b67d79b8696ddb84ce180ee5b4c5619488372eeab6d5b6b3104c79505a13c39143205dac9537ca7ef97ed7d91fa2d1a648ff0
-AUX qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch 1429 BLAKE2B 8156e6ea24b87994343be6b1a4488f4ebc1c336c4546c677f05c4cd93e908b1f066a84e0e735ecddf28596b9793138d1d2d5802ee022860e1e5f979783c87502 SHA512 cbec12f2e557a3fcf9c3f1fb93a44ea26a5a18dc5e919eafa62947acddbf1ebb0cef9a2c957ec1ac3ae47bb13abc60cccfbbe710af34f8a703ee5e035e0ba196
AUX qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch 858 BLAKE2B 4e29db8a650c5babc64b6c17dd0669a4fbdf1a200e2a7dc7938acba665ceaa051eceb07e80159cf23ed7df455a520a5966a47a61b59fe5b449e37af7597a16ca SHA512 f6835ddf259455ed5383be5c16a9313e64121810398df74d8658ba2da5866cf6ffa079d57b2e055d79b9c7eef15e504c19c107f4b09764354de94fb6b5d0bebb
+AUX qtwebengine-5.12.5-pulseaudio-13.patch 5034 BLAKE2B 12bce7933a58472dfad4581fa8e949d3326c32f307af73bcac054a94759cd5163d97c5ceb326ea1924d086022b9d316d45a4fbed81483eddcfe1c7ba91d708f3 SHA512 7160583ba150812d6e860550a0b7b9f53ae157679025e41aca6e1b0e5186549ecd49d70724ef84ff9d58abf65b598df44f3c54a456ffb1698d96159db2778811
DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
-DIST qtwebengine-everywhere-src-5.12.4.tar.xz 249328292 BLAKE2B e76d4f0c7081bd4ccbfb8a7eba6e0ef8280b4558bf545eb76bcf87ca03c79912e9e095f7bbdb30693f6ffc2dee61db7a4308cc072d92d78773082b3df238d0b2 SHA512 312c584222ed5e7183af2be8a4f42b84c7fed18c3d4b080bc32bed1bd5c7dc88c9752deaf7afc1b4d9fcd02c8c8a013d32d5be2e7635fec2c085cdbe81998de8
DIST qtwebengine-everywhere-src-5.12.5.tar.xz 249295448 BLAKE2B 3bbb9ea44ed58127a251b0dc5bd2681b9efbe4709b0c493940c85cedcbf668fe58ae2440c4afbb1e579cd69e504aa7efedd44519823ffed40444d8b3382362e8 SHA512 b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6cee8a3ef9174b50b767e373379c6a18d14db4426ac53a8c27d2d7b222826df
EBUILD qtwebengine-5.12.3.ebuild 3542 BLAKE2B a230a593aa0a95c94696d4a6590b1794d5c4d9f44793738d88e430225e199e48fc86692866c521cec4e304544a5eac5730ca5dbd734358d690a908d9bfe4fcf4 SHA512 ce2e2d11960cdfc6ad1997c9e749e503f17d9b7b07b2b0c793664f17fa53b36c2ed23d416e939eeae39a3e4f834c58d24512d7936af8081b4d3e127127cc455d
-EBUILD qtwebengine-5.12.4.ebuild 3603 BLAKE2B 1c974b639f15c66438e3733c922e6dfc397b7ec7f171a6e6cc5e5a3cb4d58666737c8d020c54069c864101e908db5a1b56f0dd3077b0a5d6f838442e24294219 SHA512 331b5ffcdb6317925f0f1d6a930efe655e7a19e01aa1a3570d913c53a523d2f2209b826835a6e459da2918a66430cd821a58d23e981319dabcf42ea77ec0e852
-EBUILD qtwebengine-5.12.5.ebuild 3419 BLAKE2B 70dbc7ed63f73737a15b22dc5ad71cf4aa5194b136454c24947a66ef7eb928cc54946377c23e24e883de28de648ef8f5536d96e01d825ecd0cb98a76d4307e38 SHA512 f499ffb7616247c6d959c6fa6853cb67aa451a860e86e39c9c989a476fc0c4b87f25e4c10b2c34e6597bba9b407597b570f3a70b1e9aef09333c2ec4b03b76f1
+EBUILD qtwebengine-5.12.5.ebuild 3472 BLAKE2B 8eb7034676e3b3df2c26d2f3dc18822f04945d50df390d37ac62d95a54f3e1e50731f52a1ed73d7b139ac03edc07b79b42ac55fd6d882236750b83077b91f624 SHA512 a8ae6a1dd33581421b858c3317c50a753408d274b33fc70669e638d73bfeefe30df9b30453ed489ba51df90cc3b20b0a6c6041a49a7143826cfc68006415d083
MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch
deleted file mode 100644
index 90bcfc3027f4..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6f3c15d2319ca11c2e31076292f5733baf64d991 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Tue, 18 Jun 2019 10:29:48 +0200
-Subject: [PATCH 2/3] Bump V8 patch level
-
-Otherwise it might use outdated script caches.
-
-Change-Id: I839c6a11c3e1991f232972ad2d87fe6318256307
-Fixes: QTBUG-72532
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- src/3rdparty/chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/v8/include/v8-version.h b/src/3rdparty/chromium/v8/include/v8-version.h
-index 3e703039517..8dacc30c340 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 6
- #define V8_MINOR_VERSION 9
- #define V8_BUILD_NUMBER 427
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
-
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
---
-2.21.0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch
deleted file mode 100644
index 11b637422694..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2323dc924a3b107647f9e5f0bdbcfc44b9713195 Mon Sep 17 00:00:00 2001
-From: Michal Klocek <michal.klocek@qt.io>
-Date: Thu, 20 Jun 2019 09:09:53 +0200
-Subject: [PATCH 3/3] Fix segfaults with arm 32bit on metrics
-
-Gcc 6 seems to misscompile pair's template constructor
-in std::map emplace, use converting move constructor instead.
-
-Fixes: QTBUG-75097
-Change-Id: Ia50dc9eadb58f713432c0228a4a5aed73b275f32
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc b/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
-index 6685a5816db..5c5380e007e 100644
---- a/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
-+++ b/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc
-@@ -23,7 +23,7 @@ UkmEntryBuilderBase::~UkmEntryBuilderBase() = default;
-
- void UkmEntryBuilderBase::SetMetricInternal(uint64_t metric_hash,
- int64_t value) {
-- entry_->metrics.emplace(metric_hash, value);
-+ entry_->metrics.emplace(std::make_pair(metric_hash, value));
- }
-
- void UkmEntryBuilderBase::Record(UkmRecorder* recorder) {
---
-2.21.0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch
deleted file mode 100644
index 4e3ef674c32d..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e8eec84aac0dc626770a483d503f7b16ab0dbe70 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Fri, 7 Jun 2019 14:18:23 +0200
-Subject: [PATCH 1/3] Fix changing should_override_user_agent_in_new_tabs_
-
-It wouldn't be updated if the custom user-agent didn't change.
-
-Change-Id: Ic31ef485e2cb84903f9b48cb9ad5f9f1a723eb92
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
----
- src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-index a2659263737..4c127f835d6 100644
---- a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-+++ b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc
-@@ -1230,11 +1230,11 @@ WebUI* WebContentsImpl::GetCommittedWebUI() const {
-
- void WebContentsImpl::SetUserAgentOverride(const std::string& override,
- bool override_in_new_tabs) {
-+ should_override_user_agent_in_new_tabs_ = override_in_new_tabs;
-+
- if (GetUserAgentOverride() == override)
- return;
-
-- should_override_user_agent_in_new_tabs_ = override_in_new_tabs;
--
- renderer_preferences_.user_agent_override = override;
-
- // Send the new override string to the renderer.
---
-2.21.0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch
new file mode 100644
index 000000000000..1e57f0ed8349
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch
@@ -0,0 +1,88 @@
+From 7ac85fb4cc6f44a21761a591ac497ae3d6bf966d Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Mon, 23 Sep 2019 13:49:53 +0200
+Subject: [PATCH] Fix building with pulseaudio 13
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+The function signature changed though the ABI stayed the same.
+
+Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876
+Fixes: QTBUG-77037
+Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
+---
+ src/3rdparty/chromium/media/audio/pulse/pulse.sigs | 16 ++++++++--------
+ src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment | 11 +++++++++++
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/src/3rdparty/chromium/media/audio/pulse/pulse.sigs b/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+index 8b5888786a9..daaeb149c13 100644
+--- a/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
++++ b/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
+ pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
+ pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
+ pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
+-pa_context_state_t pa_context_get_state(pa_context* c);
++pa_context_state_t pa_context_get_state(const_pa_context_ptr c);
+ pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
+ pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
+ void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
+-pa_operation_state_t pa_operation_get_state(pa_operation* o);
++pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o);
+ void pa_context_unref(pa_context* c);
+ void pa_operation_unref(pa_operation* o);
+ int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
+@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
+ int pa_stream_disconnect(pa_stream* s);
+ int pa_stream_drop(pa_stream *p);
+ pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
+-uint32_t pa_stream_get_device_index(pa_stream* s);
++uint32_t pa_stream_get_device_index(const_pa_stream_ptr s);
+ int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
+-pa_stream_state_t pa_stream_get_state(pa_stream* p);
++pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p);
+ pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map);
+ pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
+ pa_proplist* pa_proplist_new(void);
+-int pa_proplist_contains(pa_proplist* p, const char* key);
++int pa_proplist_contains(const_pa_proplist_ptr p, const char* key);
+ void pa_proplist_free(pa_proplist* p);
+-const char* pa_proplist_gets(pa_proplist* p, const char* key);
++const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key);
+ int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
+-size_t pa_stream_readable_size(pa_stream *p);
++size_t pa_stream_readable_size(const_pa_stream_ptr p);
+ int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
+ void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
+ void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
+ int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
+ void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
+ void pa_stream_unref(pa_stream* s);
+-int pa_context_errno(pa_context *c);
++int pa_context_errno(const_pa_context_ptr c);
+ const char* pa_strerror(int error);
+ pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v);
+diff --git a/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment b/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
+index 2a2d3e7552b..cdaa841b29f 100644
+--- a/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
++++ b/src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment
+@@ -5,4 +5,15 @@ extern "C" {
+
+ #include <pulse/pulseaudio.h>
+
++#if PA_MAJOR > 12
++typedef const pa_context* const_pa_context_ptr;
++typedef const pa_operation* const_pa_operation_ptr;
++typedef const pa_proplist* const_pa_proplist_ptr;
++typedef const pa_stream* const_pa_stream_ptr;
++#else
++typedef pa_context* const_pa_context_ptr;
++typedef pa_operation* const_pa_operation_ptr;
++typedef pa_proplist* const_pa_proplist_ptr;
++typedef pa_stream* const_pa_stream_ptr;
++#endif
+ }
+--
+2.16.3
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
deleted file mode 100644
index 2390a80c8e8d..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 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
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-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"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtcore-${PV}
- ~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
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
- media-libs/libwebp:=
- media-libs/mesa[egl,X(+)]
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${PV} )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-60.2:= )
- widgets? (
- ~dev-qt/qtdeclarative-${PV}[widgets]
- ~dev-qt/qtwidgets-${PV}
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=app-arch/gzip-1.7
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES+=(
- "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
- "${FILESDIR}/${P}-fix-should_override_user_agent_in_new_tabs.patch"
- "${FILESDIR}/${P}-bump-V8-patchlevel.patch" # QTBUG-72532
- "${FILESDIR}/${P}-fix-arm-32bit-segfaults.patch" # QTBUG-75097
- # QTBUG-76963, not yet upstream:
- "${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch"
-)
-
-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
- fi
-
- # bug 620444 - ensure local headers are used
- 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 pulseaudio webengine-pulseaudio src/core/config/linux.pri
-
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -opus
- -printing-and-pdf
- -webp
- $(usex alsa '-alsa' '')
- $(usex bindist '' '-proprietary-codecs')
- $(usex pulseaudio '-pulseaudio' '')
- $(usex system-ffmpeg '-ffmpeg' '')
- $(usex system-icu '-webengine-icu' '')
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 601472
- 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.12.5.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
index b4df6e1f7ec7..6e11493a7ab9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
@@ -80,6 +80,7 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
+ "${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
# QTBUG-76963, not yet upstream:
"${FILESDIR}/${PN}-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch"
)