diff --git a/digikam.changes b/digikam.changes index 0fb6830..7ad5aa2 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 1 22:42:22 UTC 2018 - wbauer@tmo.at + +- Add fix-black-Welcome-page-by-clicking-on-a-link.patch to fix + the Welcome page getting black when clicking on a link that opens + a new browser window (with QtWebEngine) + ------------------------------------------------------------------- Wed Oct 31 16:48:54 UTC 2018 - wbauer@tmo.at diff --git a/digikam.spec b/digikam.spec index 9e0d969..76f60c7 100644 --- a/digikam.spec +++ b/digikam.spec @@ -34,6 +34,8 @@ Patch2: 0002-Revert-replace-obsolete-qSort-function.patch Patch3: Lower-minimum-exiv2-version.patch # PATCH-FEATURE-UPSTREAM Patch4: Add-QtWebEngine-support.patch +# PATCH-FIX-UPSTREAM +Patch5: fix-black-Welcome-page-by-clicking-on-a-link.patch #This pulls in QWebEngine, which is not available on ppc64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64 BuildRequires: akonadi-contact-devel @@ -189,6 +191,7 @@ The main digikam libraries that are being shared between showfoto and digikam %patch3 -p1 %endif %patch4 -p1 +%patch5 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') diff --git a/fix-black-Welcome-page-by-clicking-on-a-link.patch b/fix-black-Welcome-page-by-clicking-on-a-link.patch new file mode 100644 index 0000000..3388127 --- /dev/null +++ b/fix-black-Welcome-page-by-clicking-on-a-link.patch @@ -0,0 +1,25 @@ +From 60721615dd9af2b81dacce06adaa7e31d56eee32 Mon Sep 17 00:00:00 2001 +From: Maik Qualmann +Date: Sat, 1 Dec 2018 16:34:41 +0100 +Subject: fix black Welcome page by clicking on a link REVIEW: D17276 + +--- + core/app/views/welcomepageview_qwebengine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/app/views/welcomepageview_qwebengine.cpp b/core/app/views/welcomepageview_qwebengine.cpp +index 2dfe2c6..d4ee8c5 100644 +--- a/core/app/views/welcomepageview_qwebengine.cpp ++++ b/core/app/views/welcomepageview_qwebengine.cpp +@@ -115,7 +115,7 @@ WelcomePageView::~WelcomePageView() + + void WelcomePageView::slotUrlOpen(const QUrl& url) + { +- WebBrowserDlg* const browser = new WebBrowserDlg(url, this); ++ WebBrowserDlg* const browser = new WebBrowserDlg(url, qApp->activeWindow()); + browser->show(); + } + +-- +cgit v0.11.2 +