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

Krita: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-08-12 23:57:28 +10:00
parent eeb069fa1a
commit dc4b9fb91a
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media-gfx/krita/krita-4.4.2.recipe → media-gfx/krita/krita-4.4.7.recipe
View File

@@ -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-2020 KDE Organisation"
COPYRIGHT="2010-2021 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="9696aec56e759f3e1c22952ca17efdcac97003239f515f570ad9f07e36cb9792"
CHECKSUM_SHA256="23a7c5c4f44271153977215764fbc6bd36fd32e1a292bbd3686097a69e0b4519"
SOURCE_DIR="krita-$portVersion"
PATCHES="krita-$portVersion.patchset
krita-openexr3.patch"
@@ -89,7 +89,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.77
extra_cmake_modules$secondaryArchSuffix >= 5.80
devel:eigen$secondaryArchSuffix
devel:libboost_system$secondaryArchSuffix >= 1.70.0
devel:libexiv2$secondaryArchSuffix

44
media-gfx/krita/patches/krita-4.4.2.patchset → media-gfx/krita/patches/krita-4.4.7.patchset
View File

@@ -1,14 +1,14 @@
From 2f754e5336e8091cd523a84c661c2bf0009bfad8 Mon Sep 17 00:00:00 2001
From 6d943009205788e75b387d66014d807f4bf3e212 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 18 Feb 2021 21:55:32 +1000
Date: Thu, 12 Aug 2021 23:22:59 +1000
Subject: Fix for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4066011..2d1bd27 100644
index d2aaadf..1200ef2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -414,7 +414,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
@@ -419,7 +419,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
PURPOSE "Optionally used for the touch gui for Krita")
endif()
@@ -18,10 +18,10 @@ index 4066011..2d1bd27 100644
find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras)
diff --git a/krita/main.cc b/krita/main.cc
index 7750ba7..3e7122d 100644
index 74eb200..667fadf 100644
--- a/krita/main.cc
+++ b/krita/main.cc
@@ -346,6 +346,9 @@ extern "C" int main(int argc, char **argv)
@@ -353,6 +353,9 @@ extern "C" int main(int argc, char **argv)
qputenv("GST_PLUGIN_SCANNER", appimageMountDir + QFile::encodeName("/usr/lib/gstreamer-1.0/gst-plugin-scanner"));
}
}
@@ -31,7 +31,7 @@ index 7750ba7..3e7122d 100644
#else
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share"));
#endif
@@ -514,6 +517,12 @@ extern "C" int main(int argc, char **argv)
@@ -521,6 +524,12 @@ extern "C" int main(int argc, char **argv)
}
@@ -44,7 +44,7 @@ index 7750ba7..3e7122d 100644
#if defined HAVE_KCRASH
KCrash::initialize();
#elif defined USE_DRMINGW
@@ -669,6 +678,8 @@ extern "C" int main(int argc, char **argv)
@@ -676,6 +685,8 @@ extern "C" int main(int argc, char **argv)
if (logUsage) {
KisUsageLogger::close();
}
@@ -88,10 +88,10 @@ index a7688a6..54f8da1 100644
<file alias="light_configure-toolbars.svg">light_configure.svg</file>
<file>light_dialog-cancel.svg</file>
diff --git a/libs/image/kis_image_config.cpp b/libs/image/kis_image_config.cpp
index 908659b..a0e71d0 100644
index a59517b..57e88fb 100644
--- a/libs/image/kis_image_config.cpp
+++ b/libs/image/kis_image_config.cpp
@@ -396,6 +396,8 @@ void KisImageConfig::setLazyFrameCreationEnabled(bool value)
@@ -400,6 +400,8 @@ void KisImageConfig::setLazyFrameCreationEnabled(bool value)
#elif defined Q_OS_MACOS
#include <sys/types.h>
#include <sys/sysctl.h>
@@ -100,7 +100,7 @@ index 908659b..a0e71d0 100644
#endif
int KisImageConfig::totalRAM()
@@ -424,6 +426,13 @@ int KisImageConfig::totalRAM()
@@ -428,6 +430,13 @@ int KisImageConfig::totalRAM()
if(!error) {
totalMemory = physmem >> 20;
}
@@ -115,7 +115,7 @@ index 908659b..a0e71d0 100644
MEMORYSTATUSEX status;
status.dwLength = sizeof(status);
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
index 87bea6e..4f89092 100644
index 4876489..55c7f58 100644
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@ -610,7 +610,7 @@ if (HAVE_QT_MULTIMEDIA)
@@ -147,7 +147,7 @@ index 87bea6e..4f89092 100644
endif()
diff --git a/libs/ui/KisApplication.cpp b/libs/ui/KisApplication.cpp
index 6a41004..152b810 100644
index 7ca7809..9d69ec7 100644
--- a/libs/ui/KisApplication.cpp
+++ b/libs/ui/KisApplication.cpp
@@ -164,7 +164,7 @@ KisApplication::KisApplication(const QString &key, int &argc, char **argv)
@@ -159,7 +159,7 @@ index 6a41004..152b810 100644
if (!styles.contains(style()->objectName().toLower())) {
Q_FOREACH (const QString & style, styles) {
if (!setStyle(style)) {
@@ -423,9 +423,10 @@ bool KisApplication::start(const KisApplicationArguments &args)
@@ -419,9 +419,10 @@ bool KisApplication::start(const KisApplicationArguments &args)
KoHashGeneratorProvider::instance()->setGenerator("MD5", new KisMD5Generator());
KConfigGroup group(KSharedConfig::openConfig(), "theme");
@@ -172,7 +172,7 @@ index 6a41004..152b810 100644
ResetStarting resetStarting(d->splashScreen, args.filenames().count()); // remove the splash when done
Q_UNUSED(resetStarting);
diff --git a/libs/ui/KisMainWindow.cpp b/libs/ui/KisMainWindow.cpp
index 4cda654..9f088e7 100644
index bb68c6c..e52b6b3 100644
--- a/libs/ui/KisMainWindow.cpp
+++ b/libs/ui/KisMainWindow.cpp
@@ -279,9 +279,9 @@ public:
@@ -198,7 +198,7 @@ index 4cda654..9f088e7 100644
d->windowStateConfig = KSharedConfig::openConfig()->group("MainWindow");
setStandardToolBarMenuEnabled(true);
@@ -764,8 +765,9 @@ void KisMainWindow::slotThemeChanged()
@@ -776,8 +777,9 @@ void KisMainWindow::slotThemeChanged()
{
// save theme changes instantly
KConfigGroup group( KSharedConfig::openConfig(), "theme");
@@ -209,7 +209,7 @@ index 4cda654..9f088e7 100644
// reload action icons!
Q_FOREACH (QAction *action, actionCollection()->actions()) {
KisIconUtils::updateIcon(action);
@@ -2549,7 +2551,9 @@ void KisMainWindow::configChanged()
@@ -2561,7 +2563,9 @@ void KisMainWindow::configChanged()
#endif
KConfigGroup group( KSharedConfig::openConfig(), "theme");
@@ -219,7 +219,7 @@ index 4cda654..9f088e7 100644
d->actionManager()->updateGUI();
QString s = cfg.getMDIBackgroundColor();
@@ -2774,14 +2778,14 @@ void KisMainWindow::createActions()
@@ -2786,14 +2790,14 @@ void KisMainWindow::createActions()
d->showDocumentInfo = actionManager->createAction("file_documentinfo");
connect(d->showDocumentInfo, SIGNAL(triggered(bool)), this, SLOT(slotDocumentInfo()));
@@ -250,7 +250,7 @@ index f0a1a9d..26af04c 100644
addPage(page);
m_shortcutSettings = new ShortcutSettingsTab(vbox);
diff --git a/libs/ui/widgets/kis_floating_message.cpp b/libs/ui/widgets/kis_floating_message.cpp
index c99ff05..0d954ed 100644
index 85714a5..7bffe86 100644
--- a/libs/ui/widgets/kis_floating_message.cpp
+++ b/libs/ui/widgets/kis_floating_message.cpp
@@ -130,6 +130,7 @@ KisFloatingMessage::KisFloatingMessage(const QString &message, QWidget *parent,
@@ -260,7 +260,7 @@ index c99ff05..0d954ed 100644
+#ifndef Q_OS_HAIKU
m_icon = KisIconUtils::loadIcon("krita").pixmap(256, 256).toImage();
setWindowFlags(Qt::FramelessWindowHint | Qt::ToolTip);
setWindowFlags(Qt::FramelessWindowHint | Qt::ToolTip | Qt::WindowTransparentForInput);
@@ -141,6 +142,7 @@ KisFloatingMessage::KisFloatingMessage(const QString &message, QWidget *parent,
m_timer.setSingleShot( true );
connect(&m_timer, SIGNAL(timeout()), SLOT(startFade()));
@@ -286,7 +286,7 @@ index c99ff05..0d954ed 100644
void KisFloatingMessage::setShowOverParent(bool show)
diff --git a/libs/widgetutils/KoResourcePaths.cpp b/libs/widgetutils/KoResourcePaths.cpp
index 7070cf8..b8a004c 100644
index b165d17..5a9c555 100644
--- a/libs/widgetutils/KoResourcePaths.cpp
+++ b/libs/widgetutils/KoResourcePaths.cpp
@@ -127,6 +127,8 @@ QString getInstallationPrefix() {
@@ -312,5 +312,5 @@ index db5e216..49b098e 100644
endif()
add_subdirectory(overview)
--
2.30.0
2.30.2