From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA5C0138334 for ; Wed, 11 Sep 2019 12:44:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D977BE0996; Wed, 11 Sep 2019 12:44:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B337AE0996 for ; Wed, 11 Sep 2019 12:44:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0940D34B057 for ; Wed, 11 Sep 2019 12:44:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B0E1785 for ; Wed, 11 Sep 2019 12:44:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1568205448.71741eaa85e8cac49adef366366edfe89b723a04.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild X-VCS-Directories: dev-qt/qtwebengine/ dev-qt/qtwebengine/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 71741eaa85e8cac49adef366366edfe89b723a04 X-VCS-Branch: master Date: Wed, 11 Sep 2019 12:44:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6016f2e5-ea1f-4cb7-8cc0-c0900d649f2b X-Archives-Hash: b740ed5b136ad66ee22c2e430cb88922 commit: 71741eaa85e8cac49adef366366edfe89b723a04 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 11 12:37:28 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 gentoo.org> ...webrtc-missing-header-w-linux-headers-5.2.patch | 26 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 12 +++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --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 +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 +--- + 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 + + 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