haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Krita: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-10-14 20:47:30 +10:00
parent 28eb9b2842
commit e4a51550bd
2 changed files with 52 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media-gfx/krita/krita-4.1.8.recipe → media-gfx/krita/krita-4.2.7.1.recipe
View File

@@ -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"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz"
CHECKSUM_SHA256="0476c9e2279f0ae690c2ed02e1aa9c3d491943643f9859355a02657318bd5940"
CHECKSUM_SHA256="28218030edca9dfa1c7e255401ca6fc8fe0e5329f7611cfc196e35746d312086"
SOURCE_DIR="krita-$portVersion"
PATCHES="krita-$portVersion.patchset"
ADDITIONAL_FILES="krita.rdef.in"
@@ -28,6 +28,7 @@ REQUIRES="
lib:libfftw3$secondaryArchSuffix
lib:libgif$secondaryArchSuffix >= 7
lib:libgsl$secondaryArchSuffix
lib:libhalf$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libilmimf$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
@@ -74,6 +75,7 @@ REQUIRES="
lib:libQt5Svg$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libquazip5$secondaryArchSuffix
lib:libraw$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -88,6 +90,7 @@ BUILD_REQUIRES="
devel:libfftw3$secondaryArchSuffix
devel:libgif$secondaryArchSuffix >= 7
devel:libgsl$secondaryArchSuffix
devel:libhalf$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libilmimf$secondaryArchSuffix
devel:libKF5Archive$secondaryArchSuffix
@@ -125,6 +128,7 @@ BUILD_REQUIRES="
devel:libpng16$secondaryArchSuffix
devel:libpoppler${secondaryArchSuffix}_qt5
devel:libQt5Core$secondaryArchSuffix >= 5.13
devel:libquazip5$secondaryArchSuffix
devel:libraw$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -147,7 +151,7 @@ BUILD()
-DCMAKE_BUILD_TYPE=release \
-DBUILD_TESTING=FALSE \
-DHIDE_SAFE_ASSERTS=TRUE \
-DOPENEXR_INCLUDE_DIR=/system/$relativeIncludeDir/OpenEXR \
-DOPENEXR_INCLUDE_DIR:PATH=/system/$relativeIncludeDir/OpenEXR \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
make $jobArgs

104
media-gfx/krita/patches/krita-4.1.8.patchset → media-gfx/krita/patches/krita-4.2.7.1.patchset
View File

@@ -1,14 +1,14 @@
From fb283fca167a2872183be51ffcb833ab2e1473d9 Mon Sep 17 00:00:00 2001
From a9f8a63397cacc3f5ad0da2eca30e24c095e13d6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 4 Jun 2019 23:23:32 +1000
Date: Mon, 14 Oct 2019 00:06:41 +1000
Subject: Fix haiku build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09f6f01..ff979e1 100644
index 6eeb998..8a22768 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,7 +339,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
@@ -399,7 +399,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
PURPOSE "Optionally used for the touch gui for Krita")
endif()
@@ -18,10 +18,23 @@ index 09f6f01..ff979e1 100644
find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras)
diff --git a/krita/main.cc b/krita/main.cc
index 398fa33..ca8f2df 100644
index 5077343..fb0a157 100644
--- a/krita/main.cc
+++ b/krita/main.cc
@@ -210,7 +210,7 @@ extern "C" int main(int argc, char **argv)
@@ -73,6 +73,12 @@
#include <QLibrary>
#endif
+#if defined Q_OS_HAIKU
+#include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
+#endif
+
#if defined HAVE_KCRASH
#include <kcrash.h>
#elif defined USE_DRMINGW
@@ -251,7 +257,7 @@ extern "C" int main(int argc, char **argv)
}
@@ -30,7 +43,7 @@ index 398fa33..ca8f2df 100644
{
QByteArray originalXdgDataDirs = qgetenv("XDG_DATA_DIRS");
if (originalXdgDataDirs.isEmpty()) {
@@ -219,6 +219,9 @@ extern "C" int main(int argc, char **argv)
@@ -260,6 +266,9 @@ extern "C" int main(int argc, char **argv)
}
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + originalXdgDataDirs);
}
@@ -40,12 +53,22 @@ index 398fa33..ca8f2df 100644
#else
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share"));
#endif
@@ -538,6 +547,8 @@ extern "C" int main(int argc, char **argv)
if (logUsage) {
KisUsageLogger::close();
}
-
+#if defined Q_OS_HAIKU
+ kill(::getpid(), SIGKILL);
+#endif
return state;
}
diff --git a/libs/image/kis_image_config.cpp b/libs/image/kis_image_config.cpp
index daa5d88..88f8ea1 100644
index ab4550d..979a5f1 100644
--- a/libs/image/kis_image_config.cpp
+++ b/libs/image/kis_image_config.cpp
@@ -359,6 +359,8 @@ void KisImageConfig::setLazyFrameCreationEnabled(bool value)
#elif defined Q_OS_OSX
@@ -396,6 +396,8 @@ void KisImageConfig::setLazyFrameCreationEnabled(bool value)
#elif defined Q_OS_MACOS
#include <sys/types.h>
#include <sys/sysctl.h>
+#elif defined Q_OS_HAIKU
@@ -53,7 +76,7 @@ index daa5d88..88f8ea1 100644
#endif
int KisImageConfig::totalRAM()
@@ -387,6 +389,13 @@ int KisImageConfig::totalRAM()
@@ -424,6 +426,13 @@ int KisImageConfig::totalRAM()
if(!error) {
totalMemory = physmem >> 20;
}
@@ -68,19 +91,19 @@ index daa5d88..88f8ea1 100644
MEMORYSTATUSEX status;
status.dwLength = sizeof(status);
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
index 03327af..283f475 100644
index 6915acb..ff598ed 100644
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@ -545,7 +545,7 @@ if (HAVE_QT_MULTIMEDIA)
@@ -568,7 +568,7 @@ if (HAVE_QT_MULTIMEDIA)
target_link_libraries(kritaui Qt5::Multimedia)
endif()
-if (NOT WIN32 AND NOT APPLE)
+if (NOT WIN32 AND NOT APPLE AND NOT HAIKU)
target_link_libraries(kritaui ${X11_X11_LIB}
${X11_Xinput_LIB}
${XCB_LIBRARIES})
@@ -556,11 +556,17 @@ if(APPLE)
${X11_Xinput_LIB})
endif()
@@ -578,11 +578,17 @@ if(APPLE)
target_link_libraries(kritaui ${APPKIT_LIBRARY})
endif ()
@@ -100,7 +123,7 @@ index 03327af..283f475 100644
endif()
diff --git a/libs/ui/widgets/kis_floating_message.cpp b/libs/ui/widgets/kis_floating_message.cpp
index be98d8b..8c94a5a 100644
index 86e248c..f1b55b0 100644
--- a/libs/ui/widgets/kis_floating_message.cpp
+++ b/libs/ui/widgets/kis_floating_message.cpp
@@ -129,6 +129,7 @@ KisFloatingMessage::KisFloatingMessage(const QString &message, QWidget *parent,
@@ -108,7 +131,7 @@ index be98d8b..8c94a5a 100644
, m_alignment(alignment)
{
+#ifndef Q_OS_HAIKU
m_icon = KisIconUtils::loadIcon("calligrakrita").pixmap(256, 256).toImage();
m_icon = KisIconUtils::loadIcon("krita").pixmap(256, 256).toImage();
setWindowFlags(Qt::FramelessWindowHint | Qt::ToolTip);
@@ -139,6 +140,7 @@ KisFloatingMessage::KisFloatingMessage(const QString &message, QWidget *parent,
@@ -135,7 +158,7 @@ index be98d8b..8c94a5a 100644
void KisFloatingMessage::setShowOverParent(bool show)
diff --git a/libs/widgetutils/KoResourcePaths.cpp b/libs/widgetutils/KoResourcePaths.cpp
index cdc926e..a91887a 100644
index ab83086..e40c143 100644
--- a/libs/widgetutils/KoResourcePaths.cpp
+++ b/libs/widgetutils/KoResourcePaths.cpp
@@ -127,6 +127,8 @@ QString getInstallationPrefix() {
@@ -163,10 +186,10 @@ index 408174f..7be9ee8 100644
namespace KisIconUtils
{
diff --git a/plugins/dockers/CMakeLists.txt b/plugins/dockers/CMakeLists.txt
index 9429916..b090ab1 100644
index 6952b67..58ecaae 100644
--- a/plugins/dockers/CMakeLists.txt
+++ b/plugins/dockers/CMakeLists.txt
@@ -12,7 +12,7 @@ add_subdirectory(compositiondocker)
@@ -14,7 +14,7 @@ add_subdirectory(compositiondocker)
add_subdirectory(patterndocker)
add_subdirectory(griddocker)
add_subdirectory(arrangedocker)
@@ -176,42 +199,5 @@ index 9429916..b090ab1 100644
endif()
add_subdirectory(overview)
--
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 <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
+#endif
+
#if defined HAVE_KCRASH
#include <kcrash.h>
#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
2.23.0