From fd2a37e0a1323607436cae2f9168b7bd63ba0d3840c07d226b1cf400a93fb116 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 8 Jan 2019 12:01:51 +0000 Subject: [PATCH] Accepting request 663615 from home:wolfi323:branches:KDE:Extra - Add 0001-Fix-popup-palette-with-Qt-5.9.4.patch to work around a bug in Qt 5.9.4 that broke krita's popup palette on Leap 15.0 (boo#1120639) OBS-URL: https://build.opensuse.org/request/show/663615 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=92 --- 0001-Fix-popup-palette-with-Qt-5.9.4.patch | 33 ++++++++++++++++++++++ krita.changes | 7 +++++ krita.spec | 3 ++ 3 files changed, 43 insertions(+) create mode 100644 0001-Fix-popup-palette-with-Qt-5.9.4.patch diff --git a/0001-Fix-popup-palette-with-Qt-5.9.4.patch b/0001-Fix-popup-palette-with-Qt-5.9.4.patch new file mode 100644 index 0000000..d846299 --- /dev/null +++ b/0001-Fix-popup-palette-with-Qt-5.9.4.patch @@ -0,0 +1,33 @@ +From 959ce0c5514ea6456fca99a52b0d9b131f5b9353 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Tue, 8 Jan 2019 10:13:22 +0100 +Subject: [PATCH] Fix popup palette with Qt 5.9.4 +References: boo#1120639 +References: QTBUG-66803 + +This works around a regression in Qt 5.9.4 (fixed in 5.9.5) that causes +krita's popup palette to be cropped when the opacity is set to 1.0, by +setting it to 0.999 instead. +--- + libs/ui/kis_popup_palette.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libs/ui/kis_popup_palette.cpp b/libs/ui/kis_popup_palette.cpp +index bcb5301b6e..efa7647817 100644 +--- a/libs/ui/kis_popup_palette.cpp ++++ b/libs/ui/kis_popup_palette.cpp +@@ -611,7 +611,11 @@ void KisPopupPalette::paintEvent(QPaintEvent* e) + if(m_isRotatingCanvasIndicator || m_isZoomingCanvas) { + opacityChange->setOpacity(0.4); + } else { ++#if QT_VERSION == QT_VERSION_CHECK(5,9,4) ++ opacityChange->setOpacity(0.999); ++#else + opacityChange->setOpacity(1.0); ++#endif + } + + } +-- +2.16.4 + diff --git a/krita.changes b/krita.changes index 0bc9760..866abc2 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 8 09:23:29 UTC 2019 - wbauer@tmo.at + +- Add 0001-Fix-popup-palette-with-Qt-5.9.4.patch to work around a + bug in Qt 5.9.4 that broke krita's popup palette on Leap 15.0 + (boo#1120639) + ------------------------------------------------------------------- Thu Jan 3 11:01:20 UTC 2019 - wbauer@tmo.at diff --git a/krita.spec b/krita.spec index 5ab2f5e..1fa680c 100644 --- a/krita.spec +++ b/krita.spec @@ -39,6 +39,8 @@ Patch: fix_libgif_5_0_build.patch Patch1: Fix-building-against-exiv2-0.27.patch # PATCH-FIX-UPSTREAM Patch2: Fix-the-exiv2-fix.patch +# PATCH-FIX-OPENSUSE +Patch3: 0001-Fix-popup-palette-with-Qt-5.9.4.patch BuildRequires: Mesa-devel BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -140,6 +142,7 @@ Development headers and libraries for Krita. %endif %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # install translations to %%{_kf5_localedir} so they don't clash with the krita translations in calligra-l10n (KDE4 based)