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 76402138334 for ; Wed, 31 Oct 2018 19:29:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1452BE090A; Wed, 31 Oct 2018 19:29:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C52A8E090A for ; Wed, 31 Oct 2018 19:29:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 78BFA335C9F for ; Wed, 31 Oct 2018 19:29:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D032D440 for ; Wed, 31 Oct 2018 19:29:49 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1541013845.141357aad041fd74e847dbd07af29b09159022b1.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 141357aad041fd74e847dbd07af29b09159022b1 X-VCS-Branch: master Date: Wed, 31 Oct 2018 19:29:49 +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-Archives-Salt: feb5e9b5-f7bf-46dd-8e58-e4a69c4f5265 X-Archives-Hash: 23b226125cafd14f1c89b5490c61aa81 commit: 141357aad041fd74e847dbd07af29b09159022b1 Author: Jimi Huotari gentoo org> AuthorDate: Wed Oct 31 19:20:50 2018 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Wed Oct 31 19:24:05 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=141357aa dev-qt/qtwebengine: sync with the main Gentoo repo tree - Add patch for GCC-8 (https://bugs.gentoo.org/657124). - Remove 'net-libs/libsrtp' DEPEND (https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c290ff). Signed-off-by: Jimi Huotari gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../qtwebengine/files/qtwebengine-5.9.6-gcc8.patch | 24 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 4 ++-- dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 3 ++- dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 4 ++-- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 3 ++- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch new file mode 100644 index 00000000..ba6a49fd --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch @@ -0,0 +1,24 @@ +From: Fedora +Subject: Fix build for 32-bit platforms + +Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source? +https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch + +diff -up chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h +--- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400 ++++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 +@@ -18,7 +18,13 @@ + #endif + + // Like the C++11 |alignof| operator. +-#if __cplusplus >= 201103L ++#if defined(__GNUC__) && __GNUC__ >= 8 ++// GCC 8 has changed the alignof operator to return the minimal alignment ++// required by the target ABI, instead of the preferred alignment. ++// This means that on 32-bit x86, it will return 4 instead of 8. ++// Use __alignof__ instead to avoid this. ++#define MOJO_ALIGNOF(type) __alignof__(type) ++#elif __cplusplus >= 201103L + #define MOJO_ALIGNOF(type) alignof(type) + #elif defined(__GNUC__) + #define MOJO_ALIGNOF(type) __alignof__(type) diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild index c3ed341b..57fa9ada 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.11.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 @@ -40,7 +40,6 @@ RDEPEND=" media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus - net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap @@ -80,6 +79,7 @@ DEPEND="${RDEPEND} " PATCHES+=( + "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild index 4a62001c..2a34a526 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild @@ -40,7 +40,6 @@ RDEPEND=" media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus - net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap @@ -79,6 +78,8 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " +PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124 + src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild index 65a2d764..2b521acd 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.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 @@ -38,7 +38,6 @@ RDEPEND=" media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus - net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap @@ -81,6 +80,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch" "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" + "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 ) src_prepare() { diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 4a62001c..2a34a526 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -40,7 +40,6 @@ RDEPEND=" media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus - net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap @@ -79,6 +78,8 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " +PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124 + src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )