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 141B61382C5 for ; Tue, 16 Jun 2020 19:00:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54E7BE0976; Tue, 16 Jun 2020 19:00:43 +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 29F9BE0976 for ; Tue, 16 Jun 2020 19:00:43 +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 F03B134F06F for ; Tue, 16 Jun 2020 19:00:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F42E28F for ; Tue, 16 Jun 2020 19:00:07 +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: <1592333976.ebd2cc940f853c1d6aa9e0b20ef8970b75e51253.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/sigil/, app-text/sigil/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch app-text/sigil/sigil-1.2.1-r1.ebuild app-text/sigil/sigil-1.2.1.ebuild X-VCS-Directories: app-text/sigil/files/ app-text/sigil/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ebd2cc940f853c1d6aa9e0b20ef8970b75e51253 X-VCS-Branch: master Date: Tue, 16 Jun 2020 19:00:07 +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: 61c6701d-3bbe-485e-b98c-8feb4879cd06 X-Archives-Hash: 7f6dec1573c717d70fbbd056a1e1a97b commit: ebd2cc940f853c1d6aa9e0b20ef8970b75e51253 Author: Zamarin Arthur gmail com> AuthorDate: Tue Jun 16 17:49:23 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 16 18:59:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd2cc94 app-text/sigil: fix compatibility with qtwebengine-5.15.0 use upstream patch which fixes compatibility problems with qtwebengine-5.15.0 Closes: https://bugs.gentoo.org/728240 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Zamarin Arthur gmail.com> Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch | 22 ++++++++++++++++++++++ .../{sigil-1.2.1.ebuild => sigil-1.2.1-r1.ebuild} | 2 ++ 2 files changed, 24 insertions(+) diff --git a/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch b/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch new file mode 100644 index 00000000000..f15cfd4e963 --- /dev/null +++ b/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch @@ -0,0 +1,22 @@ +From 50280fae48717e76d56685bf0fda19783c8904e1 Mon Sep 17 00:00:00 2001 +From: Doug Massay +Date: Fri, 5 Jun 2020 20:25:41 -0400 +Subject: [PATCH] Fix Qt5.15.x behavior-change breakage + +--- + src/MainUI/MainWindow.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/MainUI/MainWindow.cpp b/src/MainUI/MainWindow.cpp +index 64202e113..de7e7f97f 100644 +--- a/src/MainUI/MainWindow.cpp ++++ b/src/MainUI/MainWindow.cpp +@@ -4289,7 +4289,7 @@ void MainWindow::ReadSettings() + web_settings->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false); + web_settings->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, false); + web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, (settings.remoteOn() == 1)); +- web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, false); ++ web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, true); + web_settings->setAttribute(QWebEngineSettings::PluginsEnabled, false); + web_settings->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false); + web_settings->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true); diff --git a/app-text/sigil/sigil-1.2.1.ebuild b/app-text/sigil/sigil-1.2.1-r1.ebuild similarity index 97% rename from app-text/sigil/sigil-1.2.1.ebuild rename to app-text/sigil/sigil-1.2.1-r1.ebuild index 6b67b65a382..e7b02c1eea7 100644 --- a/app-text/sigil/sigil-1.2.1.ebuild +++ b/app-text/sigil/sigil-1.2.1-r1.ebuild @@ -53,6 +53,8 @@ S="${WORKDIR}/Sigil-${PV}" DOCS=( ChangeLog.txt README.md ) +PATCHES=( "${FILESDIR}/${P}-qt5.15-fix.patch" ) + src_configure() { local mycmakeargs=( -DINSTALL_BUNDLED_DICTS=0