diff --git a/media-gfx/krita/krita-4.1.7.101.recipe b/media-gfx/krita/krita-4.1.8.recipe similarity index 93% rename from media-gfx/krita/krita-4.1.7.101.recipe rename to media-gfx/krita/krita-4.1.8.recipe index f6e73429c..c8c1b91a4 100644 --- a/media-gfx/krita/krita-4.1.7.101.recipe +++ b/media-gfx/krita/krita-4.1.8.recipe @@ -4,11 +4,11 @@ for digital painting and animation purposes. It features a low-distract UI, high OpenGL accelerated canvas, color management support, advanced brush engine, non-destructive \ layers and masks, group-based layer management, vector artwork support and switchable customization profiles." HOMEPAGE="https://www.krita.org/" -COPYRIGHT="2010-2018 KDE Organisation" +COPYRIGHT="2010-2019 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" -SOURCE_URI="https://download.kde.org/stable/krita/4.1.7/krita-$portVersion.tar.gz" -CHECKSUM_SHA256="5bc95baa3980b7d75eb6bf103f72344014eac7733fd8a0780a7ec87dc2826f5f" +SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz" +CHECKSUM_SHA256="0476c9e2279f0ae690c2ed02e1aa9c3d491943643f9859355a02657318bd5940" SOURCE_DIR="krita-$portVersion" PATCHES="krita-$portVersion.patchset" ADDITIONAL_FILES="krita.rdef.in" @@ -80,7 +80,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules >= 5.50 + extra_cmake_modules >= 5.55 devel:eigen$secondaryArchSuffix devel:libboost_system$secondaryArchSuffix devel:libexiv2$secondaryArchSuffix @@ -122,8 +122,9 @@ BUILD_REQUIRES=" devel:libKF5XmlGui$secondaryArchSuffix devel:liblcms2$secondaryArchSuffix devel:libopencolorio$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix devel:libpoppler${secondaryArchSuffix}_qt5 - devel:libQt5Core$secondaryArchSuffix >= 5.12 + devel:libQt5Core$secondaryArchSuffix >= 5.13 devel:libraw$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -146,6 +147,7 @@ BUILD() -DCMAKE_BUILD_TYPE=release \ -DBUILD_TESTING=FALSE \ -DHIDE_SAFE_ASSERTS=TRUE \ + -DOPENEXR_INCLUDE_DIR=/system/$relativeIncludeDir/OpenEXR \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake make $jobArgs diff --git a/media-gfx/krita/patches/krita-4.1.7.101.patchset b/media-gfx/krita/patches/krita-4.1.8.patchset similarity index 80% rename from media-gfx/krita/patches/krita-4.1.7.101.patchset rename to media-gfx/krita/patches/krita-4.1.8.patchset index 0268ba696..38c9a6d0f 100644 --- a/media-gfx/krita/patches/krita-4.1.7.101.patchset +++ b/media-gfx/krita/patches/krita-4.1.8.patchset @@ -1,14 +1,14 @@ -From 7bed7ddfbba7dbd500094b636d6c87a1e35bea40 Mon Sep 17 00:00:00 2001 +From fb283fca167a2872183be51ffcb833ab2e1473d9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 31 Jan 2019 19:12:47 +1000 +Date: Tue, 4 Jun 2019 23:23:32 +1000 Subject: Fix haiku build diff --git a/CMakeLists.txt b/CMakeLists.txt -index a9cf3e2..00d010d 100644 +index 09f6f01..ff979e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -329,7 +329,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES +@@ -339,7 +339,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES PURPOSE "Optionally used for the touch gui for Krita") endif() @@ -18,10 +18,10 @@ index a9cf3e2..00d010d 100644 find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras) diff --git a/krita/main.cc b/krita/main.cc -index dca2ee1..af0cd8e 100644 +index 398fa33..ca8f2df 100644 --- a/krita/main.cc +++ b/krita/main.cc -@@ -207,7 +207,7 @@ extern "C" int main(int argc, char **argv) +@@ -210,7 +210,7 @@ extern "C" int main(int argc, char **argv) } @@ -30,7 +30,7 @@ index dca2ee1..af0cd8e 100644 { QByteArray originalXdgDataDirs = qgetenv("XDG_DATA_DIRS"); if (originalXdgDataDirs.isEmpty()) { -@@ -216,6 +216,9 @@ extern "C" int main(int argc, char **argv) +@@ -219,6 +219,9 @@ extern "C" int main(int argc, char **argv) } qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + originalXdgDataDirs); } @@ -68,19 +68,10 @@ index daa5d88..88f8ea1 100644 MEMORYSTATUSEX status; status.dwLength = sizeof(status); diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt -index 2909398..bee2778 100644 +index 03327af..283f475 100644 --- a/libs/ui/CMakeLists.txt +++ b/libs/ui/CMakeLists.txt -@@ -432,7 +432,7 @@ if(UNIX) - input/wintab/kis_tablet_support.cpp - qtlockedfile/qtlockedfile_unix.cpp - ) -- if(NOT APPLE) -+ if(NOT APPLE AND NOT HAIKU) - set(kritaui_LIB_SRCS - ${kritaui_LIB_SRCS} - input/wintab/qxcbconnection_xi2.cpp -@@ -543,7 +543,7 @@ if (HAVE_QT_MULTIMEDIA) +@@ -545,7 +545,7 @@ if (HAVE_QT_MULTIMEDIA) target_link_libraries(kritaui Qt5::Multimedia) endif() @@ -89,7 +80,7 @@ index 2909398..bee2778 100644 target_link_libraries(kritaui ${X11_X11_LIB} ${X11_Xinput_LIB} ${XCB_LIBRARIES}) -@@ -554,11 +554,17 @@ if(APPLE) +@@ -556,11 +556,17 @@ if(APPLE) target_link_libraries(kritaui ${APPKIT_LIBRARY}) endif () @@ -185,5 +176,42 @@ index 9429916..b090ab1 100644 endif() add_subdirectory(overview) -- -2.19.1 +2.21.0 + + +From 55bfee14678987585560d0fb261f49727a38d7d9 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 18 Aug 2019 19:34:07 +1000 +Subject: Workaround for crash on exit + + +diff --git a/krita/main.cc b/krita/main.cc +index ca8f2df..09eac67 100644 +--- a/krita/main.cc ++++ b/krita/main.cc +@@ -69,6 +69,12 @@ + #endif + #endif + ++#if defined Q_OS_HAIKU ++#include ++#include ++#include ++#endif ++ + #if defined HAVE_KCRASH + #include + #elif defined USE_DRMINGW +@@ -452,6 +458,8 @@ extern "C" int main(int argc, char **argv) + QSettings kritarc(configPath + QStringLiteral("/kritadisplayrc"), QSettings::IniFormat); + kritarc.setValue("canvasState", "OPENGL_SUCCESS"); + } +- ++#if defined Q_OS_HAIKU ++ kill(::getpid(), SIGKILL); ++#endif + return state; + } +-- +2.21.0