summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD11
-rw-r--r--krita-libraw-0.19.patch54
-rw-r--r--replace-code.patch4
4 files changed, 13 insertions, 72 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 79b407310d91..0c3102f4e0ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = krita-minimal
pkgdesc = Edit and paint images (less KDE dependencies)
- pkgver = 4.1.1
- pkgrel = 3
+ pkgver = 4.1.5
+ pkgrel = 1
url = https://krita.org
arch = x86_64
license = GPL3
@@ -42,19 +42,17 @@ pkgbase = krita-minimal
optdepends = krita-plugin-gmic: G'MIC plugin
optdepends = python-pyqt5: for the Python plugins
optdepends = libheif: HEIF filter
- provides = krita=4.1.1
+ provides = krita=4.1.5
conflicts = calligra-krita
conflicts = krita-l10n
conflicts = krita
- source = https://download.kde.org/stable/krita/4.1.1/krita-4.1.1.tar.gz
- source = https://download.kde.org/stable/krita/4.1.1/krita-4.1.1.tar.gz.sig
- source = krita-libraw-0.19.patch
+ source = https://download.kde.org/stable/krita/4.1.5/krita-4.1.5.tar.gz
+ source = https://download.kde.org/stable/krita/4.1.5/krita-4.1.5.tar.gz.sig
source = replace-code.patch
validpgpkeys = 05D00A8B73A686789E0A156858B9596C722EA3BD
- sha256sums = 5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3
+ sha256sums = 20603393afcb093a4c5fdf4a799d556600195a7b1e3db80a7003dce622bac8af
sha256sums = SKIP
- sha256sums = 975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab
- sha256sums = 1e076c7de3ee1bd6622cd40d227d0c687170b410f0e297f78f97e0b7f7270d6d
+ sha256sums = 3cf0c0b134687e784d66c6103b2bf78a559a0b698e746b5803a6d7419098315f
pkgname = krita-minimal
diff --git a/PKGBUILD b/PKGBUILD
index e61d97770e57..fbd2c1d2eab6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
_pkgname=krita
pkgname="${_pkgname}-minimal"
-pkgver=4.1.1
-pkgrel=3
+pkgver=4.1.5
+pkgrel=1
pkgdesc='Edit and paint images (less KDE dependencies)'
arch=(x86_64)
url='https://krita.org'
@@ -22,18 +22,15 @@ optdepends=('poppler-qt5: PDF filter'
provides=("${_pkgname}=${pkgver}")
conflicts=(calligra-krita krita-l10n "${_pkgname}")
source=("https://download.kde.org/stable/krita/$pkgver/${_pkgname}-$pkgver.tar.gz"{,.sig}
- 'krita-libraw-0.19.patch'
'replace-code.patch')
-sha256sums=('5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3'
+sha256sums=('20603393afcb093a4c5fdf4a799d556600195a7b1e3db80a7003dce622bac8af'
'SKIP'
- '975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab'
- '1e076c7de3ee1bd6622cd40d227d0c687170b410f0e297f78f97e0b7f7270d6d')
+ '3cf0c0b134687e784d66c6103b2bf78a559a0b698e746b5803a6d7419098315f')
validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation@krita.org>
prepare() {
mkdir -p build
cd "${_pkgname}-$pkgver"
- patch -p1 -i ../krita-libraw-0.19.patch # Remove features no longer available in libraw 0.19
patch -Np1 -i '../replace-code.patch'
}
diff --git a/krita-libraw-0.19.patch b/krita-libraw-0.19.patch
deleted file mode 100644
index 4cca709f1d8f..000000000000
--- a/krita-libraw-0.19.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-index 1c761f8563..cdf5b507ec 100644
---- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-@@ -375,40 +375,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
- raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
- break;
- }
-- case RawDecodingSettings::LINENR:
-- {
-- // (100 - 1000) => (0.001 - 0.02) conversion.
-- raw.imgdata.params.linenoise = m_parent->m_rawDecodingSettings.NRThreshold * 2.11E-5 + 0.00111111;
-- raw.imgdata.params.cfaline = true;
-- break;
-- }
--
-- case RawDecodingSettings::IMPULSENR:
-- {
-- // (100 - 1000) => (0.005 - 0.05) conversion.
-- raw.imgdata.params.lclean = m_parent->m_rawDecodingSettings.NRThreshold * 5E-5;
-- raw.imgdata.params.cclean = m_parent->m_rawDecodingSettings.NRChroThreshold * 5E-5;
-- raw.imgdata.params.cfa_clean = true;
-- break;
-- }
- default: // No Noise Reduction
- {
- raw.imgdata.params.threshold = 0;
- raw.imgdata.params.fbdd_noiserd = 0;
-- 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;
- break;
- }
- }
-
-- // 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];
--
- // Exposure Correction before interpolation.
- raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
- raw.imgdata.params.exp_shift = m_parent->m_rawDecodingSettings.expoCorrectionShift;
-@@ -461,8 +435,6 @@ 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;
-- raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine;
-- raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses;
-
- //-------------------------------------------------------------------------------------------
-
diff --git a/replace-code.patch b/replace-code.patch
index 2387f63926f4..407478ad27d7 100644
--- a/replace-code.patch
+++ b/replace-code.patch
@@ -1,8 +1,8 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -263,1 +263,0 @@
+@@ -266,1 +266,0 @@
- GuiAddons
-@@ -267,1 +266,0 @@
+@@ -270,1 +269,0 @@
- WindowSystem
--- a/libs/widgets/CMakeLists.txt
+++ a/libs/widgets/CMakeLists.txt