From ff552b1792641c9d5732ef321d1d01002e1a867ade539e89a4e521dc4b8a933b Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 18 Jul 2018 19:07:49 +0000 Subject: [PATCH] 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 --- fix-build-with-Qt5.6.patch | 28 ++++++++++++++++++++++++++ krita-4.1.0.tar.gz | 3 --- krita-4.1.1.tar.gz | 3 +++ krita.changes | 40 ++++++++++++++++++++++++++++++++++++++ krita.spec | 5 ++++- 5 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 fix-build-with-Qt5.6.patch delete mode 100644 krita-4.1.0.tar.gz create mode 100644 krita-4.1.1.tar.gz diff --git a/fix-build-with-Qt5.6.patch b/fix-build-with-Qt5.6.patch new file mode 100644 index 0000000..5b5d7be --- /dev/null +++ b/fix-build-with-Qt5.6.patch @@ -0,0 +1,28 @@ +From 55fcc4d4843c47802ad7f42cbc7a4b6c16fe6d23 Mon Sep 17 00:00:00 2001 +From: Boudewijn Rempt +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 + #include + ++#if QT_VERSION >= 0x050900 + #include ++#endif + + #include + +-- +cgit v0.11.2 + diff --git a/krita-4.1.0.tar.gz b/krita-4.1.0.tar.gz deleted file mode 100644 index e198ac3..0000000 --- a/krita-4.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5 -size 241866017 diff --git a/krita-4.1.1.tar.gz b/krita-4.1.1.tar.gz new file mode 100644 index 0000000..8098b8a --- /dev/null +++ b/krita-4.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3 +size 241945024 diff --git a/krita.changes b/krita.changes index 1de825e..aec6119 100644 --- 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 diff --git a/krita.spec b/krita.spec index 4d0dfd7..3c2d614 100644 --- 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