From 9c0ff98bc8f310d90704fb6fdd0e1b7505cbd76f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 31 Jan 2019 21:06:31 +1000 Subject: [PATCH] Krita: bump version --- ...ta-4.1.3.recipe => krita-4.1.7.101.recipe} | 10 ++++--- ....1.3.patchset => krita-4.1.7.101.patchset} | 28 +++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) rename media-gfx/krita/{krita-4.1.3.recipe => krita-4.1.7.101.recipe} (95%) rename media-gfx/krita/patches/{krita-4.1.3.patchset => krita-4.1.7.101.patchset} (91%) diff --git a/media-gfx/krita/krita-4.1.3.recipe b/media-gfx/krita/krita-4.1.7.101.recipe similarity index 95% rename from media-gfx/krita/krita-4.1.3.recipe rename to media-gfx/krita/krita-4.1.7.101.recipe index 98c33b510..15a48856b 100644 --- a/media-gfx/krita/krita-4.1.3.recipe +++ b/media-gfx/krita/krita-4.1.7.101.recipe @@ -7,8 +7,9 @@ HOMEPAGE="https://www.krita.org/" COPYRIGHT="2010-2018 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" -SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz" -CHECKSUM_SHA256="bdbd867423f4823f5271fc9ce34ee05b653d4f95414d65fb055f94a27b33a434" +SOURCE_URI="https://download.kde.org/stable/krita/4.1.7/krita-$portVersion.tar.gz" +CHECKSUM_SHA256="5bc95baa3980b7d75eb6bf103f72344014eac7733fd8a0780a7ec87dc2826f5f" +SOURCE_DIR="krita-$portVersion" PATCHES="krita-$portVersion.patchset" ADDITIONAL_FILES="krita.rdef.in" @@ -79,7 +80,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules >= 5.47 + extra_cmake_modules >= 5.50 devel:eigen$secondaryArchSuffix devel:libboost_system$secondaryArchSuffix devel:libexiv2$secondaryArchSuffix @@ -122,12 +123,13 @@ BUILD_REQUIRES=" devel:liblcms2$secondaryArchSuffix devel:libopencolorio$secondaryArchSuffix devel:libpoppler${secondaryArchSuffix}_qt5 - devel:libQt5Core$secondaryArchSuffix >= 5.7 + devel:libQt5Core$secondaryArchSuffix >= 5.12 devel:libraw$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix cmd:python3 diff --git a/media-gfx/krita/patches/krita-4.1.3.patchset b/media-gfx/krita/patches/krita-4.1.7.101.patchset similarity index 91% rename from media-gfx/krita/patches/krita-4.1.3.patchset rename to media-gfx/krita/patches/krita-4.1.7.101.patchset index 479010b81..0268ba696 100644 --- a/media-gfx/krita/patches/krita-4.1.3.patchset +++ b/media-gfx/krita/patches/krita-4.1.7.101.patchset @@ -1,11 +1,11 @@ -From 482ae00914dfedb5ba9c1a52367b6e5f8dd6b59c Mon Sep 17 00:00:00 2001 +From 7bed7ddfbba7dbd500094b636d6c87a1e35bea40 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 28 Sep 2018 19:44:36 +0300 +Date: Thu, 31 Jan 2019 19:12:47 +1000 Subject: Fix haiku build diff --git a/CMakeLists.txt b/CMakeLists.txt -index 58d9014..06cf5eb 100644 +index a9cf3e2..00d010d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,7 +329,7 @@ set_package_properties(Qt5QuickWidgets PROPERTIES @@ -18,10 +18,10 @@ index 58d9014..06cf5eb 100644 find_package(Qt5 ${MIN_QT_VERSION} REQUIRED X11Extras) diff --git a/krita/main.cc b/krita/main.cc -index d0e9fea..ef39058 100644 +index dca2ee1..af0cd8e 100644 --- a/krita/main.cc +++ b/krita/main.cc -@@ -205,7 +205,7 @@ extern "C" int main(int argc, char **argv) +@@ -207,7 +207,7 @@ extern "C" int main(int argc, char **argv) } @@ -30,7 +30,7 @@ index d0e9fea..ef39058 100644 { QByteArray originalXdgDataDirs = qgetenv("XDG_DATA_DIRS"); if (originalXdgDataDirs.isEmpty()) { -@@ -214,6 +214,9 @@ extern "C" int main(int argc, char **argv) +@@ -216,6 +216,9 @@ extern "C" int main(int argc, char **argv) } qputenv("XDG_DATA_DIRS", QFile::encodeName(root + "share") + ":" + originalXdgDataDirs); } @@ -41,7 +41,7 @@ index d0e9fea..ef39058 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 a6bc47a..300cd8e 100644 +index daa5d88..88f8ea1 100644 --- a/libs/image/kis_image_config.cpp +++ b/libs/image/kis_image_config.cpp @@ -359,6 +359,8 @@ void KisImageConfig::setLazyFrameCreationEnabled(bool value) @@ -68,10 +68,10 @@ index a6bc47a..300cd8e 100644 MEMORYSTATUSEX status; status.dwLength = sizeof(status); diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt -index a231cb8..1c76898 100644 +index 2909398..bee2778 100644 --- a/libs/ui/CMakeLists.txt +++ b/libs/ui/CMakeLists.txt -@@ -435,7 +435,7 @@ if(UNIX) +@@ -432,7 +432,7 @@ if(UNIX) input/wintab/kis_tablet_support.cpp qtlockedfile/qtlockedfile_unix.cpp ) @@ -80,16 +80,16 @@ index a231cb8..1c76898 100644 set(kritaui_LIB_SRCS ${kritaui_LIB_SRCS} input/wintab/qxcbconnection_xi2.cpp -@@ -552,7 +552,7 @@ if (HAVE_KIO) - target_link_libraries(kritaui KF5::KIOCore) - endif() +@@ -543,7 +543,7 @@ if (HAVE_QT_MULTIMEDIA) + target_link_libraries(kritaui Qt5::Multimedia) + endif() -if (NOT WIN32 AND NOT APPLE) +if (NOT WIN32 AND NOT APPLE AND NOT HAIKU) target_link_libraries(kritaui ${X11_X11_LIB} ${X11_Xinput_LIB} ${XCB_LIBRARIES}) -@@ -563,11 +563,17 @@ if(APPLE) +@@ -554,11 +554,17 @@ if(APPLE) target_link_libraries(kritaui ${APPKIT_LIBRARY}) endif () @@ -185,5 +185,5 @@ index 9429916..b090ab1 100644 endif() add_subdirectory(overview) -- -2.19.0 +2.19.1