gentoo auto-resync : 05:02:2024 - 23:43:10

3 files changed, 61 insertions, 1 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8ae17720991f..9bf57c9431d0 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,9 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
 AUX krita-5.1.5-libjxl-0.9.patch 4162 BLAKE2B 410bf2fe6ce56771a0d2ae9fcbdeae2eb34252628a2989d225c91d43b33e01ad8a77b3caa733d5e9c0ea10dc6def83407b397cfceccc431ad8b38d6f36993525 SHA512 851110f6a91dbea530105aea477d7629491ed527f5bb198032b4741b026643a34bf22681dd35944d299dff5242dc917e2f0a096914628b7337a1821795b02323
+AUX krita-5.1.5-lto.patch 1759 BLAKE2B 45fb3eb096bf61e767b2db682dad325261d17d894ec9e2e3cb0cef14c99a6c1fa4148bde7884e1e4fd5f30b036175a0da15291c961ace846e12a1e91947844b0 SHA512 81519ad76faeee65bc6f2c07585574bdbf66479adc7983f0968a09c5516e4e9da884c875c8175663c5de2cead104c2477ff3c90b9de20b0da4d80bb8fd86b090
 AUX krita-5.1.5-ocio-2.3.0.patch 1669 BLAKE2B 17ee793479946ca07788afb109ca338c3cd9ace486b2c7443ce850cc229766eb09d7b6608337c4d8ae7a7e24d633e233d36551253c3012042062a9d5c3b0fe4f SHA512 dc88f9e1b9836d8c8bc08731ac1878c3a35d4ebbd4cc361a1a4e7b59c5217709b4e207001b18a617ef4f8881a2608b548e14d383aa9db798f13acd2be02df925
 AUX krita-5.1.5-sip-6.8.patch 770 BLAKE2B b63fb65ffc4ea733e8698b255b5531ff55299ec8f7cd6c153f50faaf938795618c675a7c6fbf33c1f7225c8dddaec806a9fbd6f88b621ebcff52eb13aacc0479 SHA512 5f21376508c603ca33447119ad9fa492e83992f74314cd59053f270d2020a540b4c6708b67028a7567b9db460a6fbc0aa842020b4fe5b7d4be4265d2dc78ceff
 DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
 DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
-EBUILD krita-5.1.5.ebuild 3738 BLAKE2B 7b8babd8ef6125296cbe63bc590d7e219a6fc370556e37c688a845680d5c45486fb96f3448693c427c317cf9c5395bc1645c160c8da2e582e303086ec4cf3db7 SHA512 dfaa3005baa6f79b101d74eef6988875a38612b17dcd2178efa4064b4fca1e2184d70e9d8837143b4f431d1cfcdf0c548813a06b3c0b72449a49b13676dfd842
+EBUILD krita-5.1.5.ebuild 3781 BLAKE2B 85e1d82f55bb0f3d603ad0808b27223fa87cbcaeda3809356175389164a7cd82b477e4172b01bd5b16a22bed57f5815d953c8c997a3890f09797a3b859a5c83a SHA512 26a1f265e436b79e0ce48eaa0bbffa2555c54c8139b48167e3b2b0c0a4acf231c6767066d0c71b1755b63c09033da142250061fd9a2b75cd16855ec143ebf4ef
 MISC metadata.xml 647 BLAKE2B 38b83c96bc3e88c491faccb089e507ca5a9455a91dc9615994152d1e95ae00a0f82b8b6f3f959e20ff7af3907326996be6849abe0bcd8cfe666912b9e68d3584 SHA512 477562e4be9a68b7eb45520da3d709f39fbe7bff9ca936e61bd0aa80b157672566875d604ed926b646a7f60c7695e4915f63a526e762be79070f30728af4db40
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() {