[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ba2af85078920c0523791faca18cb299626799af
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 17:56:49 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 18:14:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2af850

media-gfx/krita: 4.4.7 version bump

See also: https://krita.org/en/item/krita-4-4-7-released/

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/krita/Manifest                           |  1 +
 .../files/krita-4.4.5-pykrita-crash-on-exit.patch  | 49 ++++++----------------
 ...tch => krita-4.4.7-pykrita-crash-on-exit.patch} | 16 +------
 media-gfx/krita/krita-4.4.5-r1.ebuild              |  1 +
 .../{krita-4.4.5-r1.ebuild => krita-4.4.7.ebuild}  |  4 +-
 5 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 25e38181019..15f1fd23ee2 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 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
+DIST krita-4.4.7.tar.gz 254871508 BLAKE2B c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695 SHA512 b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5

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 1939c962815..12ebb2fa95a 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 <alvin@alvinhc.com>
-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 <dimula73@gmail.com>
+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 <kis_preference_set_registry.h>
- #include "pyqtpluginsettings.h"
- 
-+#include <QCoreApplication>
-+
- #include <Krita.h>
- 
- K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();)
-@@ -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.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
similarity index 73%
copy from media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
copy to media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
index 1939c962815..f896a3920ef 100644
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
@@ -7,8 +7,6 @@ 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
 ---
  plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)
@@ -26,7 +24,7 @@ index ef0e27eb65..66f552b007 100644
  #include <Krita.h>
  
  K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();)
-@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
+@@ -74,6 +76,12 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
      Q_FOREACH (Extension *extension, Krita::instance()->extensions()) {
          extension->setup();
      }
@@ -39,17 +37,5 @@ index ef0e27eb65..66f552b007 100644
  }
  
  KritaPyQtPlugin::~KritaPyQtPlugin()
- {
--    // XXX: With Qt 5.14, this crashes Krita on exit. See https://bugs.kde.org/show_bug.cgi?id=417465
--    //      So, for now, we just don't call finalize...
--#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.
- }
- 
- #include "plugin.moc"
 -- 
 GitLab
-

diff --git a/media-gfx/krita/krita-4.4.5-r1.ebuild b/media-gfx/krita/krita-4.4.5-r1.ebuild
index fe539d73926..5c4bd6209e5 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.5-r1.ebuild b/media-gfx/krita/krita-4.4.7.ebuild
similarity index 98%
copy from media-gfx/krita/krita-4.4.5-r1.ebuild
copy to media-gfx/krita/krita-4.4.7.ebuild
index fe539d73926..c80ed32f998 100644
--- a/media-gfx/krita/krita-4.4.5-r1.ebuild
+++ b/media-gfx/krita/krita-4.4.7.ebuild
@@ -13,7 +13,7 @@ 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"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -91,7 +91,7 @@ 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
+	"${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
 )
 
 pkg_setup() {