mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
Krita: bump version
This commit is contained in:
@@ -8,7 +8,7 @@ COPYRIGHT="2010-2020 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="d071887c73bffbdc179054826b9752f5e5ab43fdcd9ffdd0402e9ab2ceee4bda"
|
||||
CHECKSUM_SHA256="fc5f8376e4712c26178688284aeaf2fa1d48473535ed5b214297178a1fe9278f"
|
||||
SOURCE_DIR="krita-$portVersion"
|
||||
PATCHES="krita-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="krita.rdef.in"
|
||||
@@ -1,14 +1,14 @@
|
||||
From 596318462a9f7aa9d65e1fdcf51e4885cc139c2f Mon Sep 17 00:00:00 2001
|
||||
From 8efae06743f1b685f59847db22a99b3b0edd2eda Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 21 Jun 2020 00:02:51 +1000
|
||||
Date: Thu, 15 Oct 2020 11:45:23 +1000
|
||||
Subject: Fix haiku build
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a5c75ad..c32f689 100644
|
||||
index 60a5b88..f0c59ad 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -404,7 +404,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
|
||||
@@ -408,7 +408,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES
|
||||
PURPOSE "Optionally used for the touch gui for Krita")
|
||||
endif()
|
||||
|
||||
@@ -18,12 +18,12 @@ index a5c75ad..c32f689 100644
|
||||
find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras)
|
||||
|
||||
diff --git a/krita/main.cc b/krita/main.cc
|
||||
index f0297e0..ac6b45b 100644
|
||||
index c1f492a..5c09734 100644
|
||||
--- a/krita/main.cc
|
||||
+++ b/krita/main.cc
|
||||
@@ -310,6 +310,9 @@ extern "C" int main(int argc, char **argv)
|
||||
@@ -333,6 +333,9 @@ extern "C" int main(int argc, char **argv)
|
||||
qputenv("GST_PLUGIN_SCANNER", appimageMountDir + QFile::encodeName("/usr/lib/gstreamer-1.0/gst-plugin-scanner"));
|
||||
}
|
||||
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + originalXdgDataDirs);
|
||||
}
|
||||
+#elif defined(Q_OS_HAIKU)
|
||||
+ qputenv("KRITA_PLUGIN_PATH", QFile::encodeName(root + "lib"));
|
||||
@@ -31,7 +31,7 @@ index f0297e0..ac6b45b 100644
|
||||
#else
|
||||
qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share"));
|
||||
#endif
|
||||
@@ -449,6 +452,12 @@ extern "C" int main(int argc, char **argv)
|
||||
@@ -472,6 +475,12 @@ extern "C" int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ index f0297e0..ac6b45b 100644
|
||||
#if defined HAVE_KCRASH
|
||||
KCrash::initialize();
|
||||
#elif defined USE_DRMINGW
|
||||
@@ -601,6 +610,8 @@ extern "C" int main(int argc, char **argv)
|
||||
@@ -627,6 +636,8 @@ extern "C" int main(int argc, char **argv)
|
||||
if (logUsage) {
|
||||
KisUsageLogger::close();
|
||||
}
|
||||
@@ -82,10 +82,10 @@ index 455b423..460691e 100644
|
||||
MEMORYSTATUSEX status;
|
||||
status.dwLength = sizeof(status);
|
||||
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
|
||||
index ce5311e..c478cb7 100644
|
||||
index 823bb10..5f34b40 100644
|
||||
--- a/libs/ui/CMakeLists.txt
|
||||
+++ b/libs/ui/CMakeLists.txt
|
||||
@@ -591,7 +591,7 @@ if (HAVE_QT_MULTIMEDIA)
|
||||
@@ -609,7 +609,7 @@ if (HAVE_QT_MULTIMEDIA)
|
||||
target_link_libraries(kritaui Qt5::Multimedia)
|
||||
endif()
|
||||
|
||||
@@ -94,7 +94,7 @@ index ce5311e..c478cb7 100644
|
||||
target_link_libraries(kritaui ${X11_X11_LIB}
|
||||
${X11_Xinput_LIB})
|
||||
endif()
|
||||
@@ -601,11 +601,17 @@ if(APPLE)
|
||||
@@ -619,11 +619,17 @@ if(APPLE)
|
||||
target_link_libraries(kritaui ${APPKIT_LIBRARY})
|
||||
endif ()
|
||||
|
||||
@@ -176,5 +176,5 @@ index db5e216..49b098e 100644
|
||||
endif()
|
||||
add_subdirectory(overview)
|
||||
--
|
||||
2.27.0
|
||||
2.28.0
|
||||
|
||||
Reference in New Issue
Block a user