diff --git a/fix-build-with-Qt5.6.patch b/fix-build-with-Qt5.6.patch index aec0adb..9faf1bf 100644 --- a/fix-build-with-Qt5.6.patch +++ b/fix-build-with-Qt5.6.patch @@ -1,26 +1,35 @@ -From 90852da0a2ce60fe3ddaff819f2634ed55dbe943 Mon Sep 17 00:00:00 2001 +From ff3194528deea13562422cad0d0ad83248fd63d2 Mon Sep 17 00:00:00 2001 From: Boudewijn Rempt -Date: Thu, 27 Sep 2018 10:09:47 +0200 -Subject: Fix building with Qt 5.6 +Date: Fri, 12 Oct 2018 12:33:37 +0200 +Subject: Fix build with Qt 5.6 -BUG:399130 +BUG:399677 --- - libs/ui/tool/KisToolChangesTracker.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + libs/flake/text/KoSvgTextChunkShape.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/libs/ui/tool/KisToolChangesTracker.cpp b/libs/ui/tool/KisToolChangesTracker.cpp -index 6f4e30d..b817754 100644 ---- a/libs/ui/tool/KisToolChangesTracker.cpp -+++ b/libs/ui/tool/KisToolChangesTracker.cpp -@@ -52,7 +52,7 @@ void KisToolChangesTracker::requestUndo() +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; + } - KisToolChangesTrackerDataSP KisToolChangesTracker::lastState() const - { -- return !m_d->undoStack.isEmpty() ? m_d->undoStack.last() : 0; -+ return !m_d->undoStack.isEmpty() ? m_d->undoStack.last() : static_cast>(0); - } +- return text[text.size() - 1] != " " ? FoundText : FoundSpace; ++ return text[text.size() - 1] != ' ' ? FoundText : FoundSpace; + } + } + } +@@ -732,7 +732,7 @@ Result hasNextSibling(KoXmlNode node) + } - void KisToolChangesTracker::reset() + if (!text.isEmpty()) { +- return text[0] != " " ? FoundText : FoundSpace; ++ return text[0] != ' ' ? FoundText : FoundSpace; + } + } + } -- cgit v0.11.2 diff --git a/krita-4.1.3.tar.gz b/krita-4.1.3.tar.gz deleted file mode 100644 index e443228..0000000 --- a/krita-4.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdbd867423f4823f5271fc9ce34ee05b653d4f95414d65fb055f94a27b33a434 -size 243979838 diff --git a/krita-4.1.5.tar.gz b/krita-4.1.5.tar.gz new file mode 100644 index 0000000..21961da --- /dev/null +++ b/krita-4.1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20603393afcb093a4c5fdf4a799d556600195a7b1e3db80a7003dce622bac8af +size 243929094 diff --git a/krita.changes b/krita.changes index 68dca0f..34bb1c2 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Fri Oct 12 12:07:02 UTC 2018 - wbauer@tmo.at + +- Update to 4.1.5: (4.1.4 has been skipped) + * See https://krita.org/en/item/krita-4-1-5-released/ + * Associate Krita with .ico files + * Auto-update the device pixel ration when changing screens + * Disable autoscrolling for the pan tool + * Disable drag & drop in the recent documents list (kde#399397) + * Disable zoom-in/out actions when editing text in rich-text mode + (kde#399157) + * Do not add template files to recent documents list (kde#398877) + * Do not allow creating masks on locked layers (kde#399145) + * Do not close the settings dialog when pressing enter while + searching for a shortcut (kde#399116) + * Fill polyline shapes if some fill style was selected + (kde#399135) + * Fix Tangent Normal paintop to work with 16 and 32 bit floating + point images (kde#398826) + * Fix a blending issue with the color picker when picking a color + for the first time (kde#394399) + * Fix a problem with namespaces when loading SVG + * Fix an assert when right-clicking the animation timeline + (kde#399435) + * Fix autohiding the color selector popup + * Fix canvas scaling in hidpi mode (kde#360541) + * Fix deleting canvas input settings shortcuts (kde#385662) + * Fix loading multiline text with extra mark-up (kde#399227) + * Fix loading of special unicode whitespace characters + (kde#392710) + * Fix loading the alpha channel from Photoshop TIFF files + (kde#376950) + * Fix missing shortcut from Fill Tool tooltip (kde#399111) + * Fix projection update after undoing create layer (kde#399575) + * Fix saving layer lock, alpha lock and alpha inheritance + (kde#399513) + * Fix saving the location of audio source files in .kra files + * Fix selections and transform tool overlay when Mirror Axis is + active (kde#395222) + * Fix setting active session after creating a new one + * Fix showing the color selector popup in hover mode + * Fix the ctrl-w close window shortcut on Windows (kde#399339) + * Fix the overview docker (kde#396922, kde#384033) + * Fix the shift-I color selector shortcut + * Fix unsuccessful restoring of a session blocking Krita from + closing (kde#399203) + * Import SVG files as vector layers instead of pixel layers + (kde#399166) + * Improve spacing between canvas input setting categories + * Make Krita merge layers correctly if the order of selecting + layers is not top-down (kde#399146) + * Make it possible to select the SVG text tool text has been + moved inside an hidden group and then made visible again + (kde#395412) + * Make the color picker pick the alpha channel value correctly + (kde#399169) + * Prevent opening filter dialogs on non-editable layers + (kde#398915) + * Reset the brush preset selection docker on creating a new + document (kde#399340) + * Support fractional display scaling factors + * Update color history after fill (kde#379199) +- Update fix-build-with-Qt5.6.patch yet again to fix a new + compilation error with Qt 5.6 (kde#399677), the previous one is + fixed in this release + ------------------------------------------------------------------- Thu Sep 27 08:09:31 UTC 2018 - wbauer@tmo.at diff --git a/krita.spec b/krita.spec index f203e8b..1387979 100644 --- a/krita.spec +++ b/krita.spec @@ -26,7 +26,7 @@ %endif Name: krita -Version: 4.1.3 +Version: 4.1.5 Release: 0 Summary: Digital Painting Application License: GPL-2.0-or-later AND LGPL-2.1-or-later