diff --git a/media-gfx/krita/krita-4.2.7.1.recipe b/media-gfx/krita/krita-4.2.8.2.recipe similarity index 97% rename from media-gfx/krita/krita-4.2.7.1.recipe rename to media-gfx/krita/krita-4.2.8.2.recipe index 0255eaa61..14a475518 100644 --- a/media-gfx/krita/krita-4.2.7.1.recipe +++ b/media-gfx/krita/krita-4.2.8.2.recipe @@ -6,9 +6,9 @@ layers and masks, group-based layer management, vector artwork support and switc HOMEPAGE="https://www.krita.org/" COPYRIGHT="2010-2019 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" -SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz" -CHECKSUM_SHA256="3ed29fd9d8e067def55e703fc55312815c21041d274727e228bdbe0478c09c3d" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/krita/${portVersion%.*}/krita-$portVersion.tar.gz" +CHECKSUM_SHA256="80f741fa11245ff20a99f529f5f62def17791f3ad2c9aec5c5cf5440ae1fcba7" SOURCE_DIR="krita-$portVersion" PATCHES="krita-$portVersion.patchset" ADDITIONAL_FILES="krita.rdef.in" diff --git a/media-gfx/krita/patches/krita-4.2.7.1.patchset b/media-gfx/krita/patches/krita-4.2.8.2.patchset similarity index 90% rename from media-gfx/krita/patches/krita-4.2.7.1.patchset rename to media-gfx/krita/patches/krita-4.2.8.2.patchset index e16e3a12c..c600e2e71 100644 --- a/media-gfx/krita/patches/krita-4.2.7.1.patchset +++ b/media-gfx/krita/patches/krita-4.2.8.2.patchset @@ -1,11 +1,11 @@ -From a9f8a63397cacc3f5ad0da2eca30e24c095e13d6 Mon Sep 17 00:00:00 2001 +From 17a83bd99486aa74a0890a03ef00c4e18a05d983 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 14 Oct 2019 00:06:41 +1000 +Date: Tue, 10 Dec 2019 20:04:06 +1000 Subject: Fix haiku build diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6eeb998..8a22768 100644 +index 2fb785a..87bc2be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -399,7 +399,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES @@ -18,7 +18,7 @@ index 6eeb998..8a22768 100644 find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras) diff --git a/krita/main.cc b/krita/main.cc -index 5077343..fb0a157 100644 +index 34898c3..bfa734b 100644 --- a/krita/main.cc +++ b/krita/main.cc @@ -73,6 +73,12 @@ @@ -53,7 +53,7 @@ index 5077343..fb0a157 100644 #else qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share")); #endif -@@ -538,6 +547,8 @@ extern "C" int main(int argc, char **argv) +@@ -543,6 +552,8 @@ extern "C" int main(int argc, char **argv) if (logUsage) { KisUsageLogger::close(); } @@ -170,21 +170,6 @@ index ab83086..e40c143 100644 #else return qApp->applicationDirPath() + "/../"; #endif -diff --git a/libs/widgetutils/kis_icon_utils.cpp b/libs/widgetutils/kis_icon_utils.cpp -index 408174f..7be9ee8 100644 ---- a/libs/widgetutils/kis_icon_utils.cpp -+++ b/libs/widgetutils/kis_icon_utils.cpp -@@ -29,8 +29,10 @@ - - #include - #if QT_VERSION >= 0x050900 -+#if !defined(Q_OS_HAIKU) - #define CACHE_ICONS - #endif -+#endif - - namespace KisIconUtils - { diff --git a/plugins/dockers/CMakeLists.txt b/plugins/dockers/CMakeLists.txt index 6952b67..58ecaae 100644 --- a/plugins/dockers/CMakeLists.txt @@ -199,5 +184,5 @@ index 6952b67..58ecaae 100644 endif() add_subdirectory(overview) -- -2.23.0 +2.24.0