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

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

commit:     89c10a643b2a5c5de926b94dddbd124d69b492b8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  5 20:25:32 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 20:26:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c10a64

media-gfx/krita: Fix build w/ LTO

Closes: https://bugs.gentoo.org/922520
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/krita/files/krita-5.1.5-lto.patch | 58 +++++++++++++++++++++++++++++
 media-gfx/krita/krita-5.1.5.ebuild          |  1 +
 2 files changed, 59 insertions(+)

diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch b/media-gfx/krita/files/krita-5.1.5-lto.patch
new file mode 100644
index 000000000000..0cccee5be00e
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-lto.patch
@@ -0,0 +1,58 @@
+From 2c4dd042df1518d67c117ced08c5a2f3729c3193 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Tue, 30 Jan 2024 15:30:53 +0100
+Subject: [PATCH] Possibly fix ODR violation in the transform tool strategies
+
+BUG:480520
+
+
+(cherry picked from commit e33c7d7d533d5289c3a37007f8cf574af5bc7102)
+---
+ plugins/tools/tool_transform2/kis_free_transform_strategy.cpp  | 2 ++
+ .../tool_transform2/kis_perspective_transform_strategy.cpp     | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+index 49486b6bd7c..8a63bce74e3 100644
+--- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
++++ b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+@@ -23,6 +23,7 @@
+ #include "kis_algebra_2d.h"
+ 
+ 
++namespace {
+ enum StrokeFunction {
+     ROTATE = 0,
+     MOVE,
+@@ -41,6 +42,7 @@ enum StrokeFunction {
+     MOVECENTER,
+     PERSPECTIVE
+ };
++}
+ 
+ struct KisFreeTransformStrategy::Private
+ {
+diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+index ad1d9ffe4d3..bca5b51e13f 100644
+--- a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
++++ b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+@@ -23,7 +23,7 @@
+ #include "kis_transform_utils.h"
+ #include "kis_free_transform_strategy_gsl_helpers.h"
+ 
+-
++namespace {
+ enum StrokeFunction {
+     DRAG_HANDLE = 0,
+     DRAG_X_VANISHING_POINT,
+@@ -43,6 +43,7 @@ enum HandleIndexes {
+     HANDLE_MIDDLE_RIGHT,
+     HANDLE_COUNT,
+ };
++}
+ 
+ struct KisPerspectiveTransformStrategy::Private
+ {
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild
index 283b2c2e7a76..3c49122dc318 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
 	"${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
 	"${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
+	"${FILESDIR}/${P}-lto.patch" # bug 922520
 )
 
 pkg_setup() {