Accepting request 623921 from home:wolfi323:branches:KDE:Extra

- Update to 4.1.1: * See https://krita.org/en/item/krita-4-1-1-released/ * Fix loading PyKrita when using PyQt 5.11 (kde#396381) * Fix possible crashes with vector objects (kde#396145) * Fix an issue when resizing pixel brushes in the brush editor (kde#396136) * Don't show the unimplemented color picker button in the vector object tool properties docker (kde#389525) * Fix activation of the autosave time after a modify, save, modify cycle (kde#393266) * Fix out-of-range lookups in the cross-channel curve filter (kde#396244) * Fix an assert when pressing PageUp into the reference images layer * Avoid a crash when merging layers in isolated mode (kde#395981) * Fix loading files with a transformation mask that uses the box transformation filter (kde#395979) * Fix activating the transform tool if the Box transformation filter was selected (kde#395979) * Fix a crash when hiding the last visible channel (kde#395301) * Make it possible to load non-conforming GPL palettes like https://lospec.com/palette-list/endesga-16 * Simplify display of the warp transformation grid * Re-add the Invert Selection menu entry (kde#395764) * Use KFormat to show formatted numbers * Hide the color sliders config page * Don't pick colors from fully transparent reference images (kde#396358) * Fix a crash when embedding a reference image * Fix some problems when saving and loading reference images (kde#396143) * Fix the color picker tool not working on reference images (kde#396144) * Extend the panning range to include any reference images - Add fix-build-with-Qt5.6.patch to make it compile on Leap 42.3 (kde#396594) OBS-URL: https://build.opensuse.org/request/show/623921 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=79
2018-07-18 19:07:49 +00:00 · 2018-07-18 19:07:49 +00:00 · ff552b1792
commit ff552b1792
parent d976c8c1c3
5 changed files with 75 additions and 4 deletions
--- a/fix-build-with-Qt5.6.patch
+++ b/fix-build-with-Qt5.6.patch
@ -0,0 +1,28 @@
+From 55fcc4d4843c47802ad7f42cbc7a4b6c16fe6d23 Mon Sep 17 00:00:00 2001
+From: Boudewijn Rempt <boud@valdyas.org>
+Date: Tue, 17 Jul 2018 10:36:08 +0200
+Subject: Add #if QT_VERSION >= 0x050900 to the include for
+ QOperatingSystemVersion
+
+BUG:396594
+---
+ krita/main.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/krita/main.cc b/krita/main.cc
+index 8d2748d..dad540f 100644
+--- a/krita/main.cc
+++ b/krita/main.cc
+@@ -33,7 +33,9 @@
+ #include <QByteArray>
+ #include <QMessageBox>
+ 
+#if QT_VERSION >= 0x050900
+ #include <QOperatingSystemVersion>
+#endif
+ 
+ #include <time.h>
+ 
+-- 
+cgit v0.11.2
+
--- a/krita-4.1.0.tar.gz
+++ b/krita-4.1.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5
-size 241866017
--- a/krita-4.1.1.tar.gz
+++ b/krita-4.1.1.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3
+size 241945024
--- a/krita.changes
+++ b/krita.changes
@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Wed Jul 18 17:09:19 UTC 2018 - wbauer@tmo.at
+
+- Update to 4.1.1:
+  * See https://krita.org/en/item/krita-4-1-1-released/
+  * Fix loading PyKrita when using PyQt 5.11 (kde#396381)
+  * Fix possible crashes with vector objects (kde#396145)
+  * Fix an issue when resizing pixel brushes in the brush editor
+    (kde#396136)
+  * Don't show the unimplemented color picker button in the vector
+    object tool properties docker (kde#389525)
+  * Fix activation of the autosave time after a modify, save,
+    modify cycle (kde#393266)
+  * Fix out-of-range lookups in the cross-channel curve filter
+    (kde#396244)
+  * Fix an assert when pressing PageUp into the reference images
+    layer
+  * Avoid a crash when merging layers in isolated mode (kde#395981)
+  * Fix loading files with a transformation mask that uses the box
+    transformation filter (kde#395979)
+  * Fix activating the transform tool if the Box transformation
+    filter was selected (kde#395979)
+  * Fix a crash when hiding the last visible channel (kde#395301)
+  * Make it possible to load non-conforming GPL palettes like
+    https://lospec.com/palette-list/endesga-16
+  * Simplify display of the warp transformation grid
+  * Re-add the Invert Selection menu entry (kde#395764)
+  * Use KFormat to show formatted numbers
+  * Hide the color sliders config page
+  * Don't pick colors from fully transparent reference images
+    (kde#396358)
+  * Fix a crash when embedding a reference image
+  * Fix some problems when saving and loading reference images
+    (kde#396143)
+  * Fix the color picker tool not working on reference images
+    (kde#396144)
+  * Extend the panning range to include any reference images
+- Add fix-build-with-Qt5.6.patch to make it compile on Leap 42.3
+  (kde#396594)
+
 -------------------------------------------------------------------
 Wed Jun 27 14:21:16 UTC 2018 - wbauer@tmo.at

--- a/krita.spec
+++ b/krita.spec
@ -26,13 +26,15 @@
 %endif

 Name:           krita
-Version:        4.1.0
+Version:        4.1.1
 Release:        0
 Summary:        Digital Painting Application
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Graphics/Bitmap Editors
 Url:            http://www.krita.org/
 Source0:        http://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
+Patch:          fix-build-with-Qt5.6.patch
 # 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
 Patch1:         fix_libgif_5_0_build.patch
 BuildRequires:  Mesa-devel
@ -133,6 +135,7 @@ Development headers and libraries for Krita.

 %prep
 %setup -q -n krita-%{version}
+%patch -p1
 %if 0%{?suse_version} < 1320
 %patch1
 %endif