[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     fecf0bc327c7b831f9eb1fcedb018240b88af21a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 22:32:47 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 14:19:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fecf0bc3

dev-qt/qtwebengine: Drop obsolete patch, already upstreamed in 5.12.5

Fix applied in slightly different place, upstream commit
6e2562dd1efff2b96848e8ec166e8c233029d6cc

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...webrtc-missing-header-w-linux-headers-5.2.patch | 26 ----------------------
 dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild       |  2 --
 2 files changed, 28 deletions(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
deleted file mode 100644
index 8acd0b0d06c..00000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/physicalsocketserver.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.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.12.5.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
index 6e11493a7ab..e2ece0cda96 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
@@ -81,8 +81,6 @@ 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"
 )
 
 src_prepare() {