public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/sigil/, app-text/sigil/files/
Date: Tue, 16 Jun 2020 19:00:07 +0000 (UTC)	[thread overview]
Message-ID: <1592333976.ebd2cc940f853c1d6aa9e0b20ef8970b75e51253.asturm@gentoo> (raw)

commit:     ebd2cc940f853c1d6aa9e0b20ef8970b75e51253
Author:     Zamarin Arthur <arthurzam <AT> gmail <DOT> com>
AuthorDate: Tue Jun 16 17:49:23 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <arthurzam <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 <douglaslmassay@gmail.com>
+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


             reply	other threads:[~2020-06-16 19:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-16 19:00 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-08-23 18:22 [gentoo-commits] repo/gentoo:master commit in: app-text/sigil/, app-text/sigil/files/ Joonas Niilola
2018-06-06 14:55 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1592333976.ebd2cc940f853c1d6aa9e0b20ef8970b75e51253.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox