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

Krita: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2018-09-28 21:24:07 +03:00
parent 7a60c61106
commit 019af0356b
2 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-gfx/krita/krita-4.1.0.recipe → media-gfx/krita/krita-4.1.3.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-2018 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="78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5"
CHECKSUM_SHA256="bdbd867423f4823f5271fc9ce34ee05b653d4f95414d65fb055f94a27b33a434"
PATCHES="krita-$portVersion.patchset"
ADDITIONAL_FILES="krita.rdef.in"

53
media-gfx/krita/patches/krita-4.1.0.patchset → media-gfx/krita/patches/krita-4.1.3.patchset
View File

@@ -1,14 +1,14 @@
From 0412e03d13d0858b0548d87cad9b9687a8762b60 Mon Sep 17 00:00:00 2001
From 482ae00914dfedb5ba9c1a52367b6e5f8dd6b59c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 29 Jun 2018 21:43:43 +1000
Date: Fri, 28 Sep 2018 19:44:36 +0300
Subject: Fix haiku build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31b6a55..e81f2d0 100644
index 58d9014..06cf5eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,7 +327,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
@@ -329,7 +329,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
PURPOSE "Optionally used for the touch gui for Krita")
endif()
@@ -18,10 +18,10 @@ index 31b6a55..e81f2d0 100644
find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras)
diff --git a/krita/main.cc b/krita/main.cc
index 7add3ee..413aa4d 100644
index d0e9fea..ef39058 100644
--- a/krita/main.cc
+++ b/krita/main.cc
@@ -203,7 +203,7 @@ extern "C" int main(int argc, char **argv)
@@ -205,7 +205,7 @@ extern "C" int main(int argc, char **argv)
}
@@ -30,7 +30,7 @@ index 7add3ee..413aa4d 100644
{
QByteArray originalXdgDataDirs = qgetenv("XDG_DATA_DIRS");
if (originalXdgDataDirs.isEmpty()) {
@@ -212,6 +212,9 @@ extern "C" int main(int argc, char **argv)
@@ -214,6 +214,9 @@ extern "C" int main(int argc, char **argv)
}
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + originalXdgDataDirs);
}
@@ -41,7 +41,7 @@ index 7add3ee..413aa4d 100644
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
index a6bc47a..300cd8e 100644
--- a/libs/image/kis_image_config.cpp
+++ b/libs/image/kis_image_config.cpp
@@ -359,6 +359,8 @@ void KisImageConfig::setLazyFrameCreationEnabled(bool value)
@@ -52,8 +52,8 @@ index 014aef5..a705e5f 100644
+#include <OS.h>
#endif
#include <kis_debug.h>
@@ -389,6 +391,13 @@ int KisImageConfig::totalRAM()
int KisImageConfig::totalRAM()
@@ -387,6 +389,13 @@ int KisImageConfig::totalRAM()
if(!error) {
totalMemory = physmem >> 20;
}
@@ -68,10 +68,10 @@ index 014aef5..a705e5f 100644
MEMORYSTATUSEX status;
status.dwLength = sizeof(status);
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
index fe7af22..7a6fe44 100644
index a231cb8..1c76898 100644
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@ -430,7 +430,7 @@ if(UNIX)
@@ -435,7 +435,7 @@ if(UNIX)
input/wintab/kis_tablet_support.cpp
qtlockedfile/qtlockedfile_unix.cpp
)
@@ -80,7 +80,7 @@ index fe7af22..7a6fe44 100644
set(kritaui_LIB_SRCS
${kritaui_LIB_SRCS}
input/wintab/qxcbconnection_xi2.cpp
@@ -543,7 +543,7 @@ if (HAVE_KIO)
@@ -552,7 +552,7 @@ if (HAVE_KIO)
target_link_libraries(kritaui KF5::KIOCore)
endif()
@@ -89,7 +89,7 @@ index fe7af22..7a6fe44 100644
target_link_libraries(kritaui ${X11_X11_LIB}
${X11_Xinput_LIB}
${XCB_LIBRARIES})
@@ -554,11 +554,17 @@ if(APPLE)
@@ -563,11 +563,17 @@ if(APPLE)
target_link_libraries(kritaui ${APPKIT_LIBRARY})
endif ()
@@ -144,27 +144,18 @@ index be98d8b..8c94a5a 100644
void KisFloatingMessage::setShowOverParent(bool show)
diff --git a/libs/widgetutils/KoResourcePaths.cpp b/libs/widgetutils/KoResourcePaths.cpp
index 1ea1d30..8aff647 100644
index cdc926e..a91887a 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();
appdir.setPath(correctedPath);
appdir.cdUp();
return appdir.canonicalPath();
+ #elif defined(Q_OS_HAIKU)
+ return qApp->applicationDirPath() + "/";
#else
return qApp->applicationDirPath() + "/../";
#endif
#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
@@ -194,5 +185,5 @@ index 9429916..b090ab1 100644
endif()
add_subdirectory(overview)
--
2.16.4
2.19.0