From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Aug 2021 07:02:28 +0100 Subject: gentoo resync : 11.08.2021 --- media-gfx/krita/Manifest | 7 +- .../files/krita-4.4.5-pykrita-crash-on-exit.patch | 49 +++----- .../files/krita-4.4.7-pykrita-crash-on-exit.patch | 41 +++++++ media-gfx/krita/krita-4.4.5-r1.ebuild | 1 + media-gfx/krita/krita-4.4.7.ebuild | 129 +++++++++++++++++++++ 5 files changed, 189 insertions(+), 38 deletions(-) create mode 100644 media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch create mode 100644 media-gfx/krita/krita-4.4.7.ebuild (limited to 'media-gfx/krita') diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index b4bd9f4962d6..b3c1a0c738b1 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,7 +1,10 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5 -AUX krita-4.4.5-pykrita-crash-on-exit.patch 2029 BLAKE2B 82b5146f25165416ac6e3f2ea46315e87bf53f5b34a3c3820bddd2e975f782e945db6f985a5fa347a8a2f644e15ea7f60854ea0874f1a71e213819aaea70c454 SHA512 9848301759c51724c3bd2f9c67f38073e6043d3bbeb8c557fe7ab6261c9664f97215ab602808f6c495cf7a23c6e91f19823b3d3cdac8f135ff878dc0fd63a653 +AUX krita-4.4.5-pykrita-crash-on-exit.patch 1197 BLAKE2B bebb54df49f02056acc43232bcebf6c98a6e93fb7b28fdb6450ebc0b882f0fed13f24ab13b8227de99effea00ae29b7752b17bb07e1bec0a0fd9c4acbcc874f2 SHA512 bfa7cb10c8f81ac119bacfaaec7207a71a5cdd45cf53270f8edbd8164af790ee931b24f6caacf3c66e44a7984503b7c90b0bd80447e1fb2ed680da92893a76d1 +AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4 -EBUILD krita-4.4.5-r1.ebuild 3498 BLAKE2B 157ab6af565cfe24f58b871aff9e067ab5613cd953d2556c18d7023f372b6c4ff601b078ad4d9e69b2c39e553a7f75e71f09a23f695e7a64174625ba787442a3 SHA512 c33a0d672f8a1b844e93c034a23399322a82116c3721f3e52b6b519802a700d121a5fa458ec5d752670bd9e0e39f87d3a23f764e9e7df9b8c91acb14a70df7dd +DIST krita-4.4.7.tar.gz 254871508 BLAKE2B c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695 SHA512 b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5 +EBUILD krita-4.4.5-r1.ebuild 3566 BLAKE2B 2ed6de5f9a8cf257d63397647621c51b716a1be2e5147ab1e22d4b698acc026b1ed1b5b09ba4ca45a6deaa7e53de87bb28b9ef1ae92a5c5c6f052d5f5863fa41 SHA512 004b3e83eb730b8212c9c50134e378e36cbf60cabfa7672a29c139b512daf2f73ab214cf8685f73e257b2dd0aec7d8b0f69c6a5db78f0ce08329a0098af10c7e +EBUILD krita-4.4.7.ebuild 3511 BLAKE2B 26a779a209dfc361e5f80b44b266eadca7af2f9c2f6f0b9ef6db88f87e40afdc9fbca812bd9029bf9f192cd2962ef45eef96659d950f6771311454af84ef5293 SHA512 3618ebb0d61ed181ddb11b7ea614e7f0721d63c50c7fe674c3aa2517cd8fadfd30bca6a63b1c056e6bdc6dbe6c2651e57f86e80dc64be8413ec03fe4294166c0 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch index 1939c962815e..12ebb2fa95a7 100644 --- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch +++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch @@ -1,42 +1,18 @@ -From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001 -From: Alvin Wong -Date: Sat, 19 Jun 2021 16:29:45 +0800 -Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash +From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001 +From: Dmitry Kazakov +Date: Tue, 3 Aug 2021 11:57:33 +0300 +Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit -Suspecting that we can't have Python clean up its QObject's inside -QCoreApplication's destructor, but must be done before it. - -BUG: 417465 - -* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a +CCBUG:417465 --- - plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) + plugins/extensions/pykrita/plugin/plugin.cpp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp -index ef0e27eb65..66f552b007 100644 +index 028798e2f4..cc06c07fbe 100644 --- a/plugins/extensions/pykrita/plugin/plugin.cpp +++ b/plugins/extensions/pykrita/plugin/plugin.cpp -@@ -13,6 +13,8 @@ - #include - #include "pyqtpluginsettings.h" - -+#include -+ - #include - - K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin();) -@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &) - Q_FOREACH (Extension *extension, Krita::instance()->extensions()) { - extension->setup(); - } -+ -+ // This ensures that QObject's owned by Python are destructed before -+ // the destructor of QCoreApplication is called, in order to prevent -+ // a crash on exit. -+ // See https://bugs.kde.org/show_bug.cgi?id=417465 -+ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); }); - } +@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &) KritaPyQtPlugin::~KritaPyQtPlugin() { @@ -45,11 +21,12 @@ index ef0e27eb65..66f552b007 100644 -#if QT_VERSION < QT_VERSION_CHECK(5,14,0) - PyKrita::finalize(); -#endif -+ // Don't call PyKrita::finalize here, because that can result in a crash -+ // deep inside Qt. ++ /// XXX: Don't call PyKrita::finalize here, because that can result in a crash ++ /// deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465 ++ ++ // PyKrita::finalize(); } #include "plugin.moc" -- GitLab - diff --git a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch new file mode 100644 index 000000000000..f896a3920efc --- /dev/null +++ b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch @@ -0,0 +1,41 @@ +From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001 +From: Alvin Wong +Date: Sat, 19 Jun 2021 16:29:45 +0800 +Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash + +Suspecting that we can't have Python clean up its QObject's inside +QCoreApplication's destructor, but must be done before it. + +BUG: 417465 +--- + plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp +index ef0e27eb65..66f552b007 100644 +--- a/plugins/extensions/pykrita/plugin/plugin.cpp ++++ b/plugins/extensions/pykrita/plugin/plugin.cpp +@@ -13,6 +13,8 @@ + #include + #include "pyqtpluginsettings.h" + ++#include ++ + #include + + K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin();) +@@ -74,6 +76,12 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &) + Q_FOREACH (Extension *extension, Krita::instance()->extensions()) { + extension->setup(); + } ++ ++ // This ensures that QObject's owned by Python are destructed before ++ // the destructor of QCoreApplication is called, in order to prevent ++ // a crash on exit. ++ // See https://bugs.kde.org/show_bug.cgi?id=417465 ++ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); }); + } + + KritaPyQtPlugin::~KritaPyQtPlugin() +-- +GitLab diff --git a/media-gfx/krita/krita-4.4.5-r1.ebuild b/media-gfx/krita/krita-4.4.5-r1.ebuild index fe539d739267..5c4bd6209e5d 100644 --- a/media-gfx/krita/krita-4.4.5-r1.ebuild +++ b/media-gfx/krita/krita-4.4.5-r1.ebuild @@ -92,6 +92,7 @@ PATCHES=( "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch "${FILESDIR}"/${PN}-4.4.2-quazip1.patch "${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465 + "${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # git master ) pkg_setup() { diff --git a/media-gfx/krita/krita-4.4.7.ebuild b/media-gfx/krita/krita-4.4.7.ebuild new file mode 100644 index 000000000000..c80ed32f9980 --- /dev/null +++ b/media-gfx/krita/krita-4.4.7.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{8,9,10} ) +KFMIN=5.74.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org python-single-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz + https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/" + +LICENSE="GPL-3" +SLOT="5" +IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# bug 630508 +RESTRICT+=" test" + +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:= + dev-libs/quazip:0= + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + ') + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + color-management? ( =media-libs/opencolorio-1* ) + fftw? ( sci-libs/fftw:3.0= ) + gif? ( media-libs/giflib ) + gsl? ( sci-libs/gsl:= ) + jpeg? ( virtual/jpeg:0 ) + heif? ( media-libs/libheif:= ) + openexr? ( + media-libs/ilmbase:= + =dev-qt/qtmultimedia-${QTMIN}:5 ) + raw? ( media-libs/libraw:= ) + tiff? ( media-libs/tiff:0 ) +" +DEPEND="${RDEPEND} + vc? ( >=dev-libs/vc-1.1.0 ) +" +BDEPEND=" + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch + "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch + "${FILESDIR}"/${PN}-4.4.2-quazip1.patch + "${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die +} + +src_configure() { + # Prevent sandbox violation from FindPyQt5.py module + # See Gentoo-bug 655918 + addpredict /dev/dri + + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged + $(cmake_use_find_package color-management OCIO) + $(cmake_use_find_package fftw FFTW3) + $(cmake_use_find_package gif GIF) + $(cmake_use_find_package gsl GSL) + $(cmake_use_find_package heif HEIF) + $(cmake_use_find_package jpeg JPEG) + $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package qtmedia Qt5Multimedia) + $(cmake_use_find_package raw LibRaw) + $(cmake_use_find_package tiff TIFF) + $(cmake_use_find_package vc Vc) + ) + + ecm_src_configure +} -- cgit v1.2.3