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 to 4.1.8 version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-08-18 20:13:59 +10:00
parent 0cf7c7b8e7
commit 13ccc056e0
2 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
media-gfx/krita/patches/krita-4.1.7.101.patchset → media-gfx/krita/patches/krita-4.1.8.patchset
View File

@@ -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 <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