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 BBE69138334 for ; Mon, 28 Oct 2019 21:23:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9280E0918; Mon, 28 Oct 2019 21:23:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 ABE79E0918 for ; Mon, 28 Oct 2019 21:23:58 +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 4FC5834C4CB for ; Mon, 28 Oct 2019 21:23:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48F7388A for ; Mon, 28 Oct 2019 21:23:55 +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: <1572288010.4d6d86125f464a5834917f3e932ba71cfa4b41ea.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.12.5-icu-65.patch dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.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: 4d6d86125f464a5834917f3e932ba71cfa4b41ea X-VCS-Branch: master Date: Mon, 28 Oct 2019 21:23:55 +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: 0382b156-ce0c-4838-a2e1-2077172138ea X-Archives-Hash: 9c0e7090f49b4541bf68fbea11002c0c commit: 4d6d86125f464a5834917f3e932ba71cfa4b41ea Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 28 18:38:32 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 28 18:40:10 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4d6d8612 dev-qt/qtwebengine: Sync with ${PN}-5.12.5-icu-65.patch from Gentoo repo Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ine-5.13.1-icu-65.patch => qtwebengine-5.12.5-icu-65.patch} | 10 +--------- dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch similarity index 76% rename from dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch rename to dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch index b5df6c8f..d7fdaebd 100644 --- a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch +++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch @@ -3,15 +3,7 @@ From: Kirill Burtsev Date: Fri, 23 Aug 2019 15:09:25 +0200 Subject: Fix compilation with system ICU -1. system_icu_config is missing default type for UCHAR_TYPE, that causes -a mismatch of types all over Chromium. uint16_t is defined as a base type -under linux in chromium/build/linux/unbundle/icu.gn. -Necessary constructions were lost during recent refactorings, -and seems to be restored in later chromium > 77. - -2. Update shim headers - -3. ICU upstream now requires that ICU4C API macros are used with a +ICU upstream now requires that ICU4C API macros are used with a trailing semicolon. - https://unicode-org.atlassian.net/browse/ICU-20601 diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild index c6a04c51..39f64d63 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild @@ -79,10 +79,10 @@ DEPEND="${RDEPEND} " PATCHES+=( + "${FILESDIR}/${PN}-5.12.5-icu-65.patch" "${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960 - "${FILESDIR}/${P}-icu-65.patch" # QTBUG-76963, 5.13 branch: - "${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch" + "${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch" # bug 693668, upstream(?) TODO: "${FILESDIR}/${P}-no-kcrash-reporting.patch" )