diff --git a/fix-build-with-Qt5.6.patch b/fix-build-with-Qt5.6.patch index 5b5d7be..aec0adb 100644 --- a/fix-build-with-Qt5.6.patch +++ b/fix-build-with-Qt5.6.patch @@ -1,28 +1,26 @@ -From 55fcc4d4843c47802ad7f42cbc7a4b6c16fe6d23 Mon Sep 17 00:00:00 2001 +From 90852da0a2ce60fe3ddaff819f2634ed55dbe943 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 +Date: Thu, 27 Sep 2018 10:09:47 +0200 +Subject: Fix building with Qt 5.6 -BUG:396594 +BUG:399130 --- - krita/main.cc | 2 ++ - 1 file changed, 2 insertions(+) + libs/ui/tool/KisToolChangesTracker.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -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 +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() -+#if QT_VERSION >= 0x050900 - #include -+#endif - - #include + 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); + } + void KisToolChangesTracker::reset() -- cgit v0.11.2 diff --git a/fix-build-with-dcraw-0.19.patch b/fix-build-with-dcraw-0.19.patch deleted file mode 100644 index d708389..0000000 --- a/fix-build-with-dcraw-0.19.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 3b7d0f2cbf66b06e12c57be26b262b71d8030d1a Mon Sep 17 00:00:00 2001 -From: Boudewijn Rempt -Date: Fri, 31 Aug 2018 11:04:18 +0200 -Subject: Fix build with dcraw 0.19 - -Port of https://phabricator.kde.org/D15132 ---- - .../impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 +++++++ - .../3rdparty/libkdcraw/src/rawdecodingsettings.h | 28 ++++++++++++---------- - 2 files changed, 24 insertions(+), 12 deletions(-) - -diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp -index 1c761f8..adc26d2 100644 ---- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp -+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp -@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD - raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0); - break; - } -+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) - case RawDecodingSettings::LINENR: - { - // (100 - 1000) => (0.001 - 0.02) conversion. -@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD - raw.imgdata.params.cfa_clean = true; - break; - } -+#endif - default: // No Noise Reduction - { - raw.imgdata.params.threshold = 0; - raw.imgdata.params.fbdd_noiserd = 0; -+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) - raw.imgdata.params.linenoise = 0; - raw.imgdata.params.cfaline = false; - raw.imgdata.params.lclean = 0; - raw.imgdata.params.cclean = 0; - raw.imgdata.params.cfa_clean = false; -+#endif - break; - } - } - -+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) - // Chromatic aberration correction. - raw.imgdata.params.ca_correc = m_parent->m_rawDecodingSettings.enableCACorrection; - raw.imgdata.params.cared = m_parent->m_rawDecodingSettings.caMultiplier[0]; - raw.imgdata.params.cablue = m_parent->m_rawDecodingSettings.caMultiplier[1]; -+#endif - - // Exposure Correction before interpolation. - raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection; -@@ -461,8 +467,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD - - raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations; - raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl; -+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) - raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine; - raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses; -+#endif - - //------------------------------------------------------------------------------------------- - -diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/rawdecodingsettings.h b/plugins/impex/raw/3rdparty/libkdcraw/src/rawdecodingsettings.h -index 6d7c106..5916fb2 100644 ---- a/plugins/impex/raw/3rdparty/libkdcraw/src/rawdecodingsettings.h -+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/rawdecodingsettings.h -@@ -54,8 +54,6 @@ public: - - /** RAW decoding Interpolation methods - * -- * NOTE: from original dcraw demosaic -- * - * Bilinear: use high-speed but low-quality bilinear - * interpolation (default - for slow computer). In this method, - * the red value of a non-red pixel is computed as the average of -@@ -71,37 +69,38 @@ public: - * AHD: use Adaptive Homogeneity-Directed interpolation. - * This method selects the direction of interpolation so as to - * maximize a homogeneity metric, thus typically minimizing color artifacts. -+ * DCB: DCB interpolation (see http://www.linuxphoto.org/html/dcb.html for details) - * -- * NOTE: from GPL2 demosaic pack. -+ * NOTE: from GPL2/GPL3 demosaic packs - will not work with libraw>=0.19 - * -- * DCB: DCB interpolation (see http://www.linuxphoto.org/html/dcb.html for details) - * PL_AHD: modified AHD interpolation (see http://sites.google.com/site/demosaicalgorithms/modified-dcraw - * for details). - * AFD: demosaicing through 5 pass median filter from PerfectRaw project. - * VCD: VCD interpolation. - * VCD_AHD: mixed demosaicing between VCD and AHD. - * LMMSE: LMMSE interpolation from PerfectRaw. -- * -- * NOTE: from GPL3 demosaic pack. -- * - * AMAZE: AMaZE interpolation and color aberration removal from RawTherapee project. -+ * -+ * NOTE: for libraw>=0.19 only -+ * -+ * DHT: DHT interpolation. -+ * AAHD: Enhanced Adaptative AHD interpolation. - */ - enum DecodingQuality - { -- // from original dcraw demosaic - BILINEAR = 0, - VNG = 1, - PPG = 2, - AHD = 3, -- // Extended demosaicing method from GPL2 demosaic pack - DCB = 4, - PL_AHD = 5, - AFD = 6, - VCD = 7, - VCD_AHD = 8, - LMMSE = 9, -- // Extended demosaicing methods from GPL3 demosaic pack -- AMAZE = 10 -+ AMAZE = 10, -+ DHT = 11, -+ AAHD = 12 - }; - - /** White balances alternatives -@@ -261,6 +260,7 @@ public: - int NRThreshold; - - /** Turn on chromatic aberrations correction -+ * @deprecated does not work with libraw>=0.19 - */ - bool enableCACorrection; - -@@ -268,6 +268,7 @@ public: - * - caMultiplier[0] = amount of correction on red-green axis. - * - caMultiplier[1] = amount of correction on blue-yellow axis. - * - Both values set to 0.0 = automatic CA correction. -+ * @deprecated does not work with libraw>=0.19 - */ - double caMultiplier[2]; - -@@ -334,17 +335,20 @@ public: - /// For VCD_AHD interpolation. - - /** Turn on the EECI refine for VCD Demosaicing. -+ * @deprecated does not work with libraw>=0.19 - */ - bool eeciRefine; - - /** Use edge-sensitive median filtering for artifact supression after VCD demosaicing. - * 0 : disable (default) - * 1-10 : median filter passes. -+ * @deprecated does not work with libraw>=0.19 - */ - int esMedPasses; - - /** For IMPULSENR Noise reduction. Set the amount of Chrominance impulse denoise. -- Null value disable NR. Range is between 100 and 1000. -+ * Null value disable NR. Range is between 100 and 1000. -+ * @deprecated does not work with libraw>=0.19 - */ - int NRChroThreshold; - --- -cgit v0.11.2 - diff --git a/krita-4.1.1.tar.gz b/krita-4.1.1.tar.gz deleted file mode 100644 index 8098b8a..0000000 --- a/krita-4.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3 -size 241945024 diff --git a/krita-4.1.3.tar.gz b/krita-4.1.3.tar.gz new file mode 100644 index 0000000..e443228 --- /dev/null +++ b/krita-4.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdbd867423f4823f5271fc9ce34ee05b653d4f95414d65fb055f94a27b33a434 +size 243979838 diff --git a/krita.changes b/krita.changes index 3ac1812..68dca0f 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,142 @@ +------------------------------------------------------------------- +Thu Sep 27 08:09:31 UTC 2018 - wbauer@tmo.at + +- Update to 4.1.3: (4.1.2 has been skipped) + * See https://krita.org/en/item/krita-4-1-3-released/ + * Add a workaround for loading broken files with negative frame + ids (kde#395378) + * Delete existing frame files only within exported range + (kde#377354) + * Fix a problem of Insert Hold Frames action. We should also + "offset" empty cell to make sure the expanding works correctly. + (kde#396848) + * Fix an assert when trying to export a PNG image sequence + (kde#398608) + * Fix updates when switching frame on a layer with scalar channel + * Use user-selected color label for the auto-created animation + frames (kde#394072) + * saving of the multiple frames insertion/removal options to the + config + * Improvements to support for various file formats + * Fix an assert if an imported SVG file links to non-existent + color profile (kde#398576) + * Fix backward compatibility of adjustment curves. Older versions + supported fewer adjustable channels, so we can no longer assume + the count in configuration data to matches exactly. (kde#396625) + * Fix saving layers with layer styles (kde#396224) + * Let Krita save all the kinds of layers into PSD (in rasterized way) + (kde#399002) + * PNG Export: convert to rgb, if the image isn't rgb or gray + (kde#398241) + * Remove fax-related tiff options. In fax mode tiff can store + only 1 bit per channel images, which Krita doesn't support. So + just remove these options from the GUI (kde#398548) + * Add a shortcut for the threshold filter (kde#383818) + * Fix Burn filter to work in 16-bit color space (kde#387102) + * Make color difference threshold for color labels higher + * Restore the shortcut for the invert filters + * Remove hardcoded brush size limit for the Quick Brush (kde#376085) + * Fix rotation direction when the transformed piece is mirrored + (kde#398928) + * Make Stamp brush preview be scaled correctly (kde#399065) + * Add a workaround for tablets not reporting tablet events in + hover mode (kde#363284) + * Do not reset text style when selecting something in text editor + * Fix saving line breaks when the text is not left aligned + (kde#395769) + * Fix reference image cache update conditions (kde#397208) + * Fix build with dcraw 0.19 + * Disable pixel grid action of opengl is disabled (kde#388903) + * Fix painting of selection decoration over grids (kde#362662) + * Fix to/fromLab16/Rgb16 methods of the Alpha color space + * Fix undo in the cloned KisDocument (kde#398730) + * Automatically avoid conflicts between color labels and system + colors + * Fix cursor jumps in the Layer Properties dialog (kde#398958) + * Fix resetting active tool when moving layers above vector + layers (kde#398095) + * Fix selecting of the layer after undoing Flatten Image (kde#398814) + * Fix showing two nodes when converting to a Filter Mask + * Fix updates of Clone Layers when the nodes are updated with + subtree walker + * a spurious assert in layer cloning (kde#398788) + * Fix a memory access problem in KisExifIO + * Fix memory access problems in KisExifIo + * Show metadata in the dublin core page of the metadata editor. + The editor plugin is still broken, with dates not working, + bools not working, but now at least a string one has entered + is shown again. (kde#396672) + * SegFault in LibKis Node mergeDown (kde#397043) + * apidox for Node.position() (kde#393035) + * Add modified() getter to the Document class (kde#397320) + * Add resetCache() Python API to FileLayer (kde#398740) + * Fix memory management of the Filter's InfoObject (kde#392183) + * Fix setting file path of the file layer through python API + (kde#398740) + * Make sure we wait for the filter to be done + * Fix saving a fixed bundle under the original name + * Fix "stroke selection" to work with local selections (kde#398007) + * Fix a crash when moving a vector shape selection when it is an + overlay + * Fix crash when converting a shape selection shape into a shape + selection + * Fix crash when undoing removing of a selection mask + * Fix rounded rectangular selection to actually work (kde#397806) + * Fix selection default bounds when loading old type of + adjustment layers + * Stroke Selection: don't try to add a shape just because a + layer doesn't have a paint device (kde#398015) + * Fix color picking from reference images. Desaturation now + affects the picked color, and reference images are ignored for + picking if hidden. + * Fix connection points on cage transform (kde#396788) + * Fix minor UIX issues in the move tool: + 1) adds an explicit frame when the move stroke is in progress + 2) Ctrl+Z now cancels the stroke if there is nothing to undo + (kde#392014) + * Fix offset in Move Tool in the end of the drag + * Fix shift modifier in Curve Selection Tool. The modifier of the + point clicked the last should define the selection mode. For + selection tools we just disable shift+click "path-close" + shortcut of the base path tool. (kde#397932) + * Move tool crops the bounding area by exact bounds + * Reduce aliasing in reference images (kde#396257) + * Add the default shortcut for the close action: when opening Krita + with an image, the close document shortcut was not available. + * FEATURE: Add a hidden config option to lock all dockers in place + * Fix KMainWindow saving incorrect widget settings + * Fix broken buddy: Scale to New Size’s Alt-F points to Alt-T + (kde#396948) + * Fix http link color in KritaBlender.colors: The link are now + visible on the startup page of Krita and were dark blue, exact + same value as the background making the frame hard to read. + Switching them to bright cyan improves the situation. + * Fix loading the template icons + * Fix the offset dialog giving inaccurate offsets (kde#397218) + * Make color label selector handle mouse release events (kde#394072) + * Remember the last opened settings page in the preferences dialog + * Remember the last used filter bookmark + * Remove the shortcut for wraparound mode: It's still available + from the menu and could be put on the toolbar, or people could + assign a shortcut, but having it on by default makes life too + hard for people who are trying to support our users. + * Remove the shortcuts from the mdi window's system menu's + actions. The Close Window action can now have a custom shortcut, + and there are no conflicts with hidden actions any more. + (kde#398729, kde#375524, kde#352205) + * Set color scheme hint for compositor. This is picked up by KWin + and sets the palette on the decoration and window frame, + ensuring a unified look. + * Show a canvas message when entering wraparound mode + * Show the zoom widget when switching documents (kde#398099) + * Use KSqueezedTextLabel for the pattern name in the pattern + docker and brush editor (kde#398958) + * sort the colorspace depth combobox +- Update fix-build-with-Qt5.6.patch to fix a new compilation + problem with Qt 5.6 (kde#399130), the previous one is fixed in + this release +- Drop fix-build-with-dcraw-0.19.patch, merged upstream + ------------------------------------------------------------------- Fri Aug 31 10:53:09 UTC 2018 - wbauer@tmo.at diff --git a/krita.spec b/krita.spec index 6901dc9..f203e8b 100644 --- a/krita.spec +++ b/krita.spec @@ -26,19 +26,17 @@ %endif Name: krita -Version: 4.1.1 +Version: 4.1.3 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 +Patch: fix_libgif_5_0_build.patch # PATCH-FIX-UPSTREAM -Patch2: fix-build-with-dcraw-0.19.patch +Patch1: fix-build-with-Qt5.6.patch BuildRequires: Mesa-devel BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel @@ -136,11 +134,10 @@ Development headers and libraries for Krita. %prep %setup -q -n krita-%{version} -%patch -p1 %if 0%{?suse_version} < 1320 -%patch1 +%patch %endif -%patch2 -p1 +%patch1 -p1 %build # install translations to %%{_kf5_localedir} so they don't clash with the krita translations in calligra-l10n (KDE4 based)