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

Krita: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2018-06-29 23:21:29 +10:00
parent 9d4d13942c
commit 75652c450b
2 changed files with 102 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media-gfx/krita/krita-4.0.2.recipe → media-gfx/krita/krita-4.1.0.recipe
View File

@@ -6,13 +6,13 @@ layers and masks, group-based layer management, vector artwork support and switc
HOMEPAGE="https://www.krita.org/" HOMEPAGE="https://www.krita.org/"
COPYRIGHT="2010-2018 KDE Organisation" COPYRIGHT="2010-2018 KDE Organisation"
LICENSE="GNU LGPL v2" LICENSE="GNU LGPL v2"
REVISION="3" REVISION="1"
SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz" SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz"
CHECKSUM_SHA256="8e013b09ec38dbf2d0401a74e868749b9d60e66d89094dc7fc2c51f48d8ad68c" CHECKSUM_SHA256="78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5"
ADDITIONAL_FILES="krita.rdef.in" ADDITIONAL_FILES="krita.rdef.in"
PATCHES="krita-$portVersion.patchset" PATCHES="krita-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64" ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86"
PROVIDES=" PROVIDES="
@@ -130,7 +130,7 @@ BUILD_PREREQUIRES="
cmd:cmake cmd:cmake
cmd:g++$secondaryArchSuffix cmd:g++$secondaryArchSuffix
cmd:make cmd:make
cmd:python2 cmd:python3
cmd:pkg_config$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix
" "

236
media-gfx/krita/patches/krita-4.0.2.patchset → media-gfx/krita/patches/krita-4.1.0.patchset
View File

@@ -1,27 +1,77 @@
From e0315b4d609f7df499da0df72d7c983571bcfc83 Mon Sep 17 00:00:00 2001 From 8e1f56e954955e22cb1e98f3ec02be844646d1d6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 14 Apr 2018 22:32:58 +1000 Date: Fri, 29 Jun 2018 21:43:43 +1000
Subject: Fix build for Haiku Subject: Fix haiku build
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index e109cd4..639a471 100644 index 31b6a55..e81f2d0 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -331,7 +331,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES @@ -327,7 +327,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
PURPOSE "Optionally used for the touch gui for Krita") PURPOSE "Optionally used for the touch gui for Krita")
endif()
-if (NOT WIN32 AND NOT APPLE) -if (NOT WIN32 AND NOT APPLE)
+if (NOT WIN32 AND NOT APPLE AND NOT HAIKU) +if (NOT WIN32 AND NOT APPLE AND NOT HAIKU)
find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras) find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras)
diff --git a/krita/main.cc b/krita/main.cc
index 7add3ee..413aa4d 100644
--- a/krita/main.cc
+++ b/krita/main.cc
@@ -203,7 +203,7 @@ extern "C" int main(int argc, char **argv)
}
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX)
{
QByteArray originalXdgDataDirs = qgetenv("XDG_DATA_DIRS");
if (originalXdgDataDirs.isEmpty()) {
@@ -212,6 +212,9 @@ extern "C" int main(int argc, char **argv)
}
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + originalXdgDataDirs);
}
+#elif defined(Q_OS_HAIKU)
+ qputenv("KRITA_PLUGIN_PATH", QFile::encodeName(root + "lib"));
+ qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + qgetenv("XDG_DATA_DIRS"));
#else
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share"));
#endif
diff --git a/libs/image/kis_image_config.cpp b/libs/image/kis_image_config.cpp
index 014aef5..a705e5f 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
#include <sys/types.h>
#include <sys/sysctl.h>
+#elif defined Q_OS_HAIKU
+#include <OS.h>
#endif
#include <kis_debug.h>
@@ -389,6 +391,13 @@ int KisImageConfig::totalRAM()
if(!error) {
totalMemory = physmem >> 20;
}
+#elif defined Q_OS_HAIKU
+ system_info info;
+ error = get_system_info(&info) == B_OK?0:1;
+ if (!error) {
+ uint64_t size = (info.max_pages * B_PAGE_SIZE);
+ totalMemory = size >> 20;
+ }
#elif defined Q_OS_WIN
MEMORYSTATUSEX status;
status.dwLength = sizeof(status);
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
index 72e8e67..e17dca4 100644 index fe7af22..7a6fe44 100644
--- a/libs/ui/CMakeLists.txt --- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt +++ b/libs/ui/CMakeLists.txt
@@ -421,7 +421,7 @@ if(UNIX) @@ -430,7 +430,7 @@ if(UNIX)
input/wintab/kis_tablet_support.cpp input/wintab/kis_tablet_support.cpp
qtlockedfile/qtlockedfile_unix.cpp qtlockedfile/qtlockedfile_unix.cpp
) )
@@ -30,7 +80,7 @@ index 72e8e67..e17dca4 100644
set(kritaui_LIB_SRCS set(kritaui_LIB_SRCS
${kritaui_LIB_SRCS} ${kritaui_LIB_SRCS}
input/wintab/qxcbconnection_xi2.cpp input/wintab/qxcbconnection_xi2.cpp
@@ -532,7 +532,7 @@ if (HAVE_KIO) @@ -543,7 +543,7 @@ if (HAVE_KIO)
target_link_libraries(kritaui KF5::KIOCore) target_link_libraries(kritaui KF5::KIOCore)
endif() endif()
@@ -39,7 +89,7 @@ index 72e8e67..e17dca4 100644
target_link_libraries(kritaui ${X11_X11_LIB} target_link_libraries(kritaui ${X11_X11_LIB}
${X11_Xinput_LIB} ${X11_Xinput_LIB}
${XCB_LIBRARIES}) ${XCB_LIBRARIES})
@@ -543,11 +543,17 @@ if(APPLE) @@ -554,11 +554,17 @@ if(APPLE)
target_link_libraries(kritaui ${APPKIT_LIBRARY}) target_link_libraries(kritaui ${APPKIT_LIBRARY})
endif () endif ()
@@ -54,125 +104,10 @@ index 72e8e67..e17dca4 100644
# Add VSync disable workaround # Add VSync disable workaround
-if(NOT WIN32 AND NOT APPLE) -if(NOT WIN32 AND NOT APPLE)
+if(NOT WIN32 AND NOT APPLE AND NOT HAIKU) +if(NOT WIN32 AND NOT APPLE NOT HAIKU)
target_link_libraries(kritaui ${CMAKE_DL_LIBS} Qt5::X11Extras) target_link_libraries(kritaui ${CMAKE_DL_LIBS} Qt5::X11Extras)
endif() endif()
diff --git a/plugins/dockers/CMakeLists.txt b/plugins/dockers/CMakeLists.txt
index d9cd652..f433578 100644
--- a/plugins/dockers/CMakeLists.txt
+++ b/plugins/dockers/CMakeLists.txt
@@ -12,7 +12,7 @@ add_subdirectory(compositiondocker)
add_subdirectory(patterndocker)
add_subdirectory(griddocker)
add_subdirectory(arrangedocker)
-if(HAVE_OCIO)
+if(HAVE_OCIO AND NOT HAIKU)
add_subdirectory(lut)
endif()
add_subdirectory(overview)
--
2.16.2
From 29e574a53ea4a3578cb961e1d2b8816ea539d3ff Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 14 Apr 2018 22:33:47 +1000
Subject: Fix paths
diff --git a/krita/main.cc b/krita/main.cc
index 5357fe4..1836c72 100644
--- a/krita/main.cc
+++ b/krita/main.cc
@@ -195,7 +195,7 @@ extern "C" int main(int argc, char **argv)
}
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX)
{
QByteArray originalXdgDataDirs = qgetenv("XDG_DATA_DIRS");
if (originalXdgDataDirs.isEmpty()) {
@@ -204,6 +204,9 @@ extern "C" int main(int argc, char **argv)
}
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + originalXdgDataDirs);
}
+#elif defined(Q_OS_HAIKU)
+ qputenv("KRITA_PLUGIN_PATH", QFile::encodeName(root + "lib"));
+ qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + qgetenv("XDG_DATA_DIRS"));
#else
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share"));
#endif
diff --git a/libs/widgetutils/KoResourcePaths.cpp b/libs/widgetutils/KoResourcePaths.cpp
index 1ea1d30..c90011e 100644
--- a/libs/widgetutils/KoResourcePaths.cpp
+++ b/libs/widgetutils/KoResourcePaths.cpp
@@ -115,7 +115,7 @@ QString getInstallationPrefix() {
debugWidgetUtils << ">>>>>>>>>>>" << bundlePath;
return bundlePath;
#else
- #ifdef Q_OS_QWIN
+ #if defined(Q_OS_QWIN)
QDir appdir(qApp->applicationDirPath());
// Corrects for mismatched case errors in path (qtdeclarative fails to load)
@@ -127,6 +127,8 @@ QString getInstallationPrefix() {
appdir.setPath(correctedPath);
appdir.cdUp();
return appdir.canonicalPath();
+ #elif defined(Q_OS_HAIKU)
+ return qApp->applicationDirPath() + "/";
#else
return qApp->applicationDirPath() + "/../";
#endif
--
2.16.2
From 8397a2ba5ec2f51b355615b8ebe7d4833b4239a2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 14 Apr 2018 22:34:16 +1000
Subject: Add memory size detection for Haiku platform
diff --git a/libs/image/kis_image_config.cpp b/libs/image/kis_image_config.cpp
index 6663aad..25b7143 100644
--- a/libs/image/kis_image_config.cpp
+++ b/libs/image/kis_image_config.cpp
@@ -352,6 +352,8 @@ void KisImageConfig::setLazyFrameCreationEnabled(bool value)
#elif defined Q_OS_OSX
#include <sys/types.h>
#include <sys/sysctl.h>
+#elif defined Q_OS_HAIKU
+#include <OS.h>
#endif
#include <kis_debug.h>
@@ -382,6 +384,13 @@ int KisImageConfig::totalRAM()
if(!error) {
totalMemory = physmem >> 20;
}
+#elif defined Q_OS_HAIKU
+ system_info info;
+ error = get_system_info(&info) == B_OK?0:1;
+ if (!error) {
+ uint64_t size = (info.max_pages * B_PAGE_SIZE);
+ totalMemory = size >> 20;
+ }
#elif defined Q_OS_WIN
MEMORYSTATUSEX status;
status.dwLength = sizeof(status);
--
2.16.2
From ec9c6dbd83ca22a466837d91f7e3f5c5a7a14c60 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 14 Apr 2018 22:34:40 +1000
Subject: Disable floating windows
diff --git a/libs/ui/widgets/kis_floating_message.cpp b/libs/ui/widgets/kis_floating_message.cpp diff --git a/libs/ui/widgets/kis_floating_message.cpp b/libs/ui/widgets/kis_floating_message.cpp
index be98d8b..8c94a5a 100644 index be98d8b..8c94a5a 100644
--- a/libs/ui/widgets/kis_floating_message.cpp --- a/libs/ui/widgets/kis_floating_message.cpp
@@ -208,18 +143,30 @@ index be98d8b..8c94a5a 100644
} }
void KisFloatingMessage::setShowOverParent(bool show) void KisFloatingMessage::setShowOverParent(bool show)
-- diff --git a/libs/widgetutils/KoResourcePaths.cpp b/libs/widgetutils/KoResourcePaths.cpp
2.16.2 index 1ea1d30..8aff647 100644
--- a/libs/widgetutils/KoResourcePaths.cpp
+++ b/libs/widgetutils/KoResourcePaths.cpp
From e6628215aa0bdfb5549c08dff00891ad07c1e678 Mon Sep 17 00:00:00 2001 @@ -115,7 +115,7 @@ QString getInstallationPrefix() {
From: Gerasim Troeglazov <3dEyes@gmail.com> debugWidgetUtils << ">>>>>>>>>>>" << bundlePath;
Date: Sat, 14 Apr 2018 23:27:31 +1000 return bundlePath;
Subject: Disable icon cache #else
- #ifdef Q_OS_QWIN
+ #if defined(Q_OS_QWIN)
QDir appdir(qApp->applicationDirPath());
// Corrects for mismatched case errors in path (qtdeclarative fails to load)
@@ -127,6 +127,8 @@ QString getInstallationPrefix() {
appdir.setPath(correctedPath);
appdir.cdUp();
return appdir.canonicalPath();
+ #elif defined(Q_OS_HAIKU)
+ return qApp->applicationDirPath() + "/";
#else
return qApp->applicationDirPath() + "/../";
#endif
diff --git a/libs/widgetutils/kis_icon_utils.cpp b/libs/widgetutils/kis_icon_utils.cpp diff --git a/libs/widgetutils/kis_icon_utils.cpp b/libs/widgetutils/kis_icon_utils.cpp
index fdec007..89a5e83 100644 index 408174f..7be9ee8 100644
--- a/libs/widgetutils/kis_icon_utils.cpp --- a/libs/widgetutils/kis_icon_utils.cpp
+++ b/libs/widgetutils/kis_icon_utils.cpp +++ b/libs/widgetutils/kis_icon_utils.cpp
@@ -29,8 +29,10 @@ @@ -29,8 +29,10 @@
@@ -233,6 +180,19 @@ index fdec007..89a5e83 100644
namespace KisIconUtils namespace KisIconUtils
{ {
diff --git a/plugins/dockers/CMakeLists.txt b/plugins/dockers/CMakeLists.txt
index 9429916..b090ab1 100644
--- a/plugins/dockers/CMakeLists.txt
+++ b/plugins/dockers/CMakeLists.txt
@@ -12,7 +12,7 @@ add_subdirectory(compositiondocker)
add_subdirectory(patterndocker)
add_subdirectory(griddocker)
add_subdirectory(arrangedocker)
-if(HAVE_OCIO)
+if(HAVE_OCIO AND NOT HAIKU)
add_subdirectory(lut)
endif()
add_subdirectory(overview)
-- --
2.16.2 2.16.4