Accepting request 658672 from KDE:Extra

OBS-URL: https://build.opensuse.org/request/show/658672
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krita?expand=0&rev=31

fix-build-with-Qt5.6.patch

@@ -1,35 +0,0 @@
-From ff3194528deea13562422cad0d0ad83248fd63d2 Mon Sep 17 00:00:00 2001
-From: Boudewijn Rempt <boud@valdyas.org>
-Date: Fri, 12 Oct 2018 12:33:37 +0200
-Subject: Fix build with Qt 5.6
-
-BUG:399677
----
- libs/flake/text/KoSvgTextChunkShape.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libs/flake/text/KoSvgTextChunkShape.cpp b/libs/flake/text/KoSvgTextChunkShape.cpp
-index 86c7747..ea8e521 100644
---- a/libs/flake/text/KoSvgTextChunkShape.cpp
-+++ b/libs/flake/text/KoSvgTextChunkShape.cpp
-@@ -701,7 +701,7 @@ Result hasPreviousSibling(KoXmlNode node)
-                         return hasPreviousSibling(node) == FoundNothing ? FoundNothing : FoundSpace;
-                     }
- 
--                    return text[text.size() - 1] != " " ? FoundText : FoundSpace;
-+                    return text[text.size() - 1] != ' ' ? FoundText : FoundSpace;
-                 }
-             }
-         }
-@@ -732,7 +732,7 @@ Result hasNextSibling(KoXmlNode node)
-                 }
- 
-                 if (!text.isEmpty()) {
--                    return text[0] != " " ? FoundText : FoundSpace;
-+                    return text[0] != ' ' ? FoundText : FoundSpace;
-                 }
-             }
-         }
--- 
-cgit v0.11.2
-

krita-4.1.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20603393afcb093a4c5fdf4a799d556600195a7b1e3db80a7003dce622bac8af
-size 243929094

krita-4.1.7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c16ec0dd23cdf20e9dd4d34ebabcf5bdb06a825bd6fe2c7196d6777279bdabd0
+size 243969623

krita.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Thu Dec 13 12:16:31 UTC 2018 - wbauer@tmo.at
+
+- Update to 4.1.7: (4.1.6 has been skipped)
+  * See https://krita.org/en/item/krita-4-1-7-released/
+  * Remove news feed widget, it could cause problems with WiFi
+    connections because Qt's network manager class checks the wifi
+    settings all the time (QTBUG-46015, QTBUG-40332)
+  * Work around a bug in Qt 5.12 that would cause an instant crash
+    when using a tablet
+  * Fix showing wrongly that there is no audio support in the
+    animation timeline audio menu
+  * Don't hang when trying to load recent files thumbnails for
+    files in a location that's no longer accessible (kde#401939)
+  * Remember whether anti-aliasing was enabled in selection tools
+    (kde#401730)
+  * Add a shortcut to activate the text tool (kde#401655)
+  * Make the toolbars movable again
+  * Make Select by Color Range check the entire image (kde#346138)
+  * Enable HiDPI support by default: the problems with the canvas
+    scaling have been solved
+  * Allow krita to import more than file at a time when started
+    from a file manager (kde#401476)
+  * Fix using the scrollwheel in comboboxes on Linux (kde#399379)
+  * Fix the calculation of Average Desaturation (kde#400493)
+  * Do not crash when exporting Compositions (kde#400627)
+  * Make the move tool show the correct cursor in all modes
+  * Let the move tool move invisible layers
+  * Fix a crash in the artistic color selector (kde#399860)
+- Drop fix-build-with-Qt5.6.patch, merged upstream
+- Remove no longer used kio-devel build requirement
+
 -------------------------------------------------------------------
 Fri Oct 12 12:07:02 UTC 2018 - wbauer@tmo.at
 

krita.spec

@@ -26,7 +26,7 @@
 %endif
 
 Name:           krita
-Version:        4.1.5
+Version:        4.1.7
 Release:        0
 Summary:        Digital Painting Application
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -35,8 +35,6 @@ Url:            http://www.krita.org/
 Source0:        http://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.gz
 # PATCH-FIX-OPENSUSE fix_libgif_5_0_build.patch -- Trivial fix to make Krita link against libgif 5.0.x in openSUSE Leap 42.3
 Patch:          fix_libgif_5_0_build.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         fix-build-with-Qt5.6.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  OpenColorIO-devel
 BuildRequires:  OpenEXR-devel
@@ -60,7 +58,6 @@ BuildRequires:  kcrash-devel
 BuildRequires:  kguiaddons-devel
 BuildRequires:  ki18n-devel
 BuildRequires:  kiconthemes-devel
-BuildRequires:  kio-devel
 BuildRequires:  kitemmodels-devel
 BuildRequires:  kitemviews-devel
 BuildRequires:  kwidgetsaddons-devel
@@ -137,7 +134,6 @@ Development headers and libraries for Krita.
 %if 0%{?suse_version} < 1320
 %patch
 %endif
-%patch1 -p1
 
 %build
 # install translations to %%{_kf5_localedir} so they don't clash with the krita translations in calligra-l10n (KDE4 based)