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> ...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 <[email protected]> +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 <[email protected]> +--- + 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
