summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD17
-rw-r--r--replace-code.patch12
3 files changed, 23 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 37770f46474..869e69ce1ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = krita-minimal
pkgdesc = Edit and paint images (less KDE dependencies)
- pkgver = 3.3.3
+ pkgver = 4.0.0
pkgrel = 1
url = https://krita.org
arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = krita-minimal
makedepends = vc
makedepends = poppler-qt5
makedepends = opencolorio
+ makedepends = python-pyqt5
depends = karchive
depends = kcompletion
depends = kcoreaddons
@@ -27,24 +28,24 @@ pkgbase = krita-minimal
depends = fftw
depends = curl
depends = boost-libs
+ depends = giflib
depends = hicolor-icon-theme
optdepends = poppler-qt5: PDF filter
optdepends = ffmpeg: to save animations
optdepends = opencolorio: for the LUT docker
optdepends = krita-plugin-gmic: G'MIC plugin
- provides = krita=3.3.3
+ optdepends = python-pyqt5: for the Python plugins
+ provides = krita=4.0.0
conflicts = calligra-krita
conflicts = krita-l10n
conflicts = krita
- replaces = calligra-krita
- replaces = krita-l10n
- source = https://download.kde.org/stable/krita/3.3.3/krita-3.3.3.tar.gz
- source = https://download.kde.org/stable/krita/3.3.3/krita-3.3.3.tar.gz.sig
+ source = https://download.kde.org/stable/krita/4.0.0/krita-4.0.0.tar.gz
+ source = https://download.kde.org/stable/krita/4.0.0/krita-4.0.0.tar.gz.sig
source = replace-code.patch
validpgpkeys = 05D00A8B73A686789E0A156858B9596C722EA3BD
- sha256sums = bec04e3392e9b311477c5c6a50e2201b43a3afda91d9b24a0fc8e3399585865d
+ sha256sums = 5ff1925361c65e5a8ca6949035ef3d1291488b63f0f473dbf62bf70a525d0336
sha256sums = SKIP
- sha256sums = 8526f1ae1ad03c824d8d87a7bc54e25dcbb6509306171c8dd022016a59061986
+ sha256sums = 57419930facc06d6d3b5cc30dfec6d6a78977925175bb10165ef2bbe033244ba
pkgname = krita-minimal
diff --git a/PKGBUILD b/PKGBUILD
index c910ad21ebf..548f2f56308 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,27 @@
_pkgname=krita
pkgname="${_pkgname}-minimal"
-pkgver=3.3.3
+pkgver=4.0.0
pkgrel=1
pkgdesc='Edit and paint images (less KDE dependencies)'
arch=(x86_64)
url='https://krita.org'
license=(GPL3)
-depends=(karchive kcompletion kcoreaddons ki18n kitemviews qt5-svg
- kitemmodels gsl libraw exiv2 openexr fftw curl boost-libs hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools python boost eigen vc poppler-qt5 opencolorio)
+depends=(karchive kcompletion kcoreaddons ki18n kitemviews qt5-svg kitemmodels
+ gsl libraw exiv2 openexr fftw curl boost-libs giflib hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools python boost eigen vc poppler-qt5 opencolorio python-pyqt5)
optdepends=('poppler-qt5: PDF filter'
'ffmpeg: to save animations'
'opencolorio: for the LUT docker'
- "krita-plugin-gmic: G'MIC plugin")
+ "krita-plugin-gmic: G'MIC plugin"
+ 'python-pyqt5: for the Python plugins')
provides=("${_pkgname}=${pkgver}")
conflicts=(calligra-krita krita-l10n "${_pkgname}")
-replaces=(calligra-krita krita-l10n)
source=("https://download.kde.org/stable/krita/$pkgver/${_pkgname}-$pkgver.tar.gz"{,.sig}
'replace-code.patch')
-sha256sums=('bec04e3392e9b311477c5c6a50e2201b43a3afda91d9b24a0fc8e3399585865d'
+sha256sums=('5ff1925361c65e5a8ca6949035ef3d1291488b63f0f473dbf62bf70a525d0336'
'SKIP'
- '8526f1ae1ad03c824d8d87a7bc54e25dcbb6509306171c8dd022016a59061986')
+ '57419930facc06d6d3b5cc30dfec6d6a78977925175bb10165ef2bbe033244ba')
validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation@krita.org>
prepare() {
@@ -34,7 +34,6 @@ prepare() {
build() {
cd build
cmake "../${_pkgname}-$pkgver" \
- -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_DISABLE_FIND_PACKAGE_KF5KIO=TRUE \
diff --git a/replace-code.patch b/replace-code.patch
index 8572d912c96..eaaf87583af 100644
--- a/replace-code.patch
+++ b/replace-code.patch
@@ -1,19 +1,19 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -219,1 +219,0 @@
+@@ -268,1 +268,0 @@
- GuiAddons
-@@ -223,1 +222,0 @@
+@@ -272,1 +271,0 @@
- WindowSystem
--- a/libs/widgets/CMakeLists.txt
+++ a/libs/widgets/CMakeLists.txt
-@@ -102,1 +102,1 @@
+@@ -103,1 +103,1 @@
-target_link_libraries(kritawidgets kritaodf kritaflake kritapigment kritawidgetutils Qt5::PrintSupport KF5::CoreAddons KF5::ConfigGui KF5::GuiAddons KF5::WidgetsAddons KF5::ConfigCore KF5::Completion)
+target_link_libraries(kritawidgets kritaodf kritaflake kritapigment kritawidgetutils Qt5::PrintSupport KF5::CoreAddons KF5::ConfigGui KF5::WidgetsAddons KF5::ConfigCore KF5::Completion)
--- a/libs/widgetutils/CMakeLists.txt
+++ b/libs/widgetutils/CMakeLists.txt
-@@ -117,1 +117,0 @@
+@@ -120,1 +120,0 @@
- KF5::GuiAddons
-@@ -119,1 +118,0 @@
+@@ -122,1 +121,0 @@
- KF5::WindowSystem
--- a/libs/widgetutils/config/kcolorscheme.cpp
+++ b/libs/widgetutils/config/kcolorscheme.cpp
@@ -223,7 +223,7 @@
+++ b/libs/ui/widgets/KoDualColorButton.cpp
@@ -22,1 +22,0 @@
-#include <kcolormimedata.h>
-@@ -35,2 +34,40 @@
+@@ -37,2 +36,40 @@
#include <QApplication>
+
+#include <qmimedata.h>