gentoo auto-resync : 18:02:2025 - 00:14:44

4 files changed, 82 insertions, 2 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 81e4ffdff5e7..b27513a45566 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index b7e2efa2288f..00575f05a277 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,7 @@
 AUX kwin-6.3.0-crashfix.patch 850 BLAKE2B f6e6174142806aee84d51b9a854dcbe8fc712b8beb95d7b1fbeee8f9a974c9d9e1e62125971c7467d0f95971f52258fdc6261e1e02a435f7b78698b52afda1f4 SHA512 93a862124a234e76c039028b5712487f3e36a5dc3a37f5112ebc6d95131d36dd227e88010f9aebf644fb2a8759395e3bf2a89603333651d4d8a23291f21178ca
+AUX kwin-6.3.0-lto.patch 2844 BLAKE2B 28a7123e6e12f23a08e689b50ec5ce5a2883c00c27703634f8484a4e62ef983d27dfdab5a696b655cbc85f2ddce61052e6e9d8a8e024afd4b5600a7951b77a0e SHA512 2ebcc9b68cb89b3f751dbc8d5998c3f515a2bb268242734ef3f0ff2b1e29c263915e9412165109636a323d784cc3763f097184b53d3a4d0842099e88342f0f2d
 DIST kwin-6.2.5.tar.xz 8563352 BLAKE2B 9a1ac80c337722d6a6411c338ac31f14f542f6d84505cc65c66e1ceedea2b88cbc9dabba68c42acf5dbace28b62e04cadc09a010a7972bc5ceb22d79344033fe SHA512 06a78d41003f2fb676f3cadca21a1e26a0006b78dcd9188c09d92fbc45f934aa9e923a69013b1cb496396d924a1848feb136d3016d64e14eca9cc525743b095b
 DIST kwin-6.3.0.tar.xz 8865496 BLAKE2B 41755ac89753f6eac62e2fb4b69e7e677a0a5cd92f1ba6f4bd524bc42478d672579985f3e6a39ea925c906c54300d157dae7dab39876eb1fc7137c3b374dccbc SHA512 282dd32722f90937da66aab46528ca9f144146f31ee3b09f616d706f7d4349fe36239dd82f6feffe2008082b4b61d44a8a1c3d58590d5e962b9bd424e433c459
 EBUILD kwin-6.2.5.ebuild 4338 BLAKE2B 7d9ee1ed1aa206230a23efdbb00a9a12b3094ee803bc5dabc74baf5dfdfa325f56a93194e2ecb24863266271973ef3bb011d4fd4acaf595f445f5a4edba5a184 SHA512 044f0f5e4336069826772e335264d5968a620acad76fe73f8d9debe88bf51ac87ed5e980286a3089aaa17c99ef677c88fb7fd6ca7906455470d560eb8a5ea285
-EBUILD kwin-6.3.0-r1.ebuild 4408 BLAKE2B 4dbabdef63749d075b1b088c931d0bc1855dde42dc3f27ea15daa034f0e7e3df3cc6b34f5c0b8be2d7682916b24fbd227dec50ede701f9700e8aae3c80670149 SHA512 69aa8735a749afb4abc50669f4d3f1eba6c87cc4bc5a310a061e2a25b6d876a950b04ac6c0e72f2a1a6bd8a6e9586307c657fdf8ccd3b9dc6c25451f3d42266c
+EBUILD kwin-6.3.0-r2.ebuild 4439 BLAKE2B 884bfe0223453ee6ab983d34c7750f73a55be4f5324696e2c67c90bb833d57fe696462e8d2c39ba603a244ae9d0c3eff1dc9587c86959d476814688384cce4e4 SHA512 7d3d6c3955df00e2e23d8bc31299c3e64620fe4dce16f17da0a0698bd409b217555ac8c6c259ec613e2b76a88f18cc938ccdf4667f3a2736f58f3914f8fa6d74
 MISC metadata.xml 677 BLAKE2B 050345f8f8f489b3cb81e112c05fddedc738c8f136d409b8754c54494a02caf5671a66dd1ecd7cfb91f24ab11210c67f78c09c928a4daf16b3512600649551c5 SHA512 5134373a0ce30f351344c07df4a68f97a15bf3bdb061ba8ff3355a42da2281d64bb506cdcb5b1dad698fc2061b4a4a92e054e08c521acb327b84f968a7d936dc
diff --git a/kde-plasma/kwin/files/kwin-6.3.0-lto.patch b/kde-plasma/kwin/files/kwin-6.3.0-lto.patch
new file mode 100644
index 000000000000..f73586869130
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.3.0-lto.patch
@@ -0,0 +1,76 @@
+https://bugs.kde.org/show_bug.cgi?id=499789
+https://invent.kde.org/plasma/kwin/-/commit/196c95d8bbab6519d0cc742ae3b595081051c08e
+
+From 196c95d8bbab6519d0cc742ae3b595081051c08e Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Sun, 16 Feb 2025 23:53:40 +0200
+Subject: [PATCH] core: Fix initialization of IccProfile::s_connectionSpace
+
+Colorimetry constants can be initialized after IccProfile::s_connectionSpace
+when LTO is enabled. It's okay with the C++ standard.
+
+As a way around it, this change moves the CIEXYZD50 constant to the
+IccProfile where it's actually needed.
+
+We need to reconsider how the constants are defined, e.g. have static
+getters or use constexpr. But as a short term solution, this should be
+fine.
+
+BUG: 499789
+
+Co-authored-by: Xaver Hugl <xaver.hugl@gmail.com>
+(cherry picked from commit 6d6667fc2a3f0a5e51676be267a5a8e1ce3c1337)
+--- a/src/core/colorspace.cpp
++++ b/src/core/colorspace.cpp
+@@ -400,12 +400,6 @@ static const Colorimetry CIEXYZ = Colorimetry{
+     XYZ{0.0, 0.0, 1.0},
+     xy{1.0 / 3.0, 1.0 / 3.0}.toXYZ(),
+ };
+-static const Colorimetry CIEXYZD50 = Colorimetry{
+-    XYZ{1.0, 0.0, 0.0},
+-    XYZ{0.0, 1.0, 0.0},
+-    XYZ{0.0, 0.0, 1.0},
+-    XYZ(0.9642, 1.0, 0.8249),
+-};
+ static const Colorimetry DCIP3 = Colorimetry{
+     xy{0.680, 0.320},
+     xy{0.265, 0.690},
+@@ -442,8 +436,6 @@ const Colorimetry &Colorimetry::fromName(NamedColorimetry name)
+         return BT2020;
+     case NamedColorimetry::CIEXYZ:
+         return CIEXYZ;
+-    case NamedColorimetry::CIEXYZD50:
+-        return CIEXYZD50;
+     case NamedColorimetry::DCIP3:
+         return DCIP3;
+     case NamedColorimetry::DisplayP3:
+--- a/src/core/colorspace.h
++++ b/src/core/colorspace.h
+@@ -38,7 +38,6 @@ enum class NamedColorimetry {
+     GenericFilm,
+     BT2020,
+     CIEXYZ,
+-    CIEXYZD50,
+     DCIP3,
+     DisplayP3,
+     AdobeRGB
+--- a/src/core/iccprofile.cpp
++++ b/src/core/iccprofile.cpp
+@@ -18,7 +18,14 @@
+ namespace KWin
+ {
+ 
+-const ColorDescription IccProfile::s_connectionSpace = ColorDescription(Colorimetry::fromName(NamedColorimetry::CIEXYZD50), TransferFunction(TransferFunction::linear, 0, 1), 1, 0, 1, 1);
++static const Colorimetry CIEXYZD50 = Colorimetry{
++    XYZ{1.0, 0.0, 0.0},
++    XYZ{0.0, 1.0, 0.0},
++    XYZ{0.0, 0.0, 1.0},
++    XYZ(0.9642, 1.0, 0.8249),
++};
++
++const ColorDescription IccProfile::s_connectionSpace = ColorDescription(CIEXYZD50, TransferFunction(TransferFunction::linear, 0, 1), 1, 0, 1, 1);
+ 
+ IccProfile::IccProfile(cmsHPROFILE handle, const Colorimetry &colorimetry, std::optional<ColorPipeline> &&bToA0Tag, std::optional<ColorPipeline> &&bToA1Tag, const std::shared_ptr<ColorTransformation> &inverseEOTF, const std::shared_ptr<ColorTransformation> &vcgt, std::optional<double> minBrightness, std::optional<double> maxBrightness)
+     : m_handle(handle)
+-- 
+GitLab
diff --git a/kde-plasma/kwin/kwin-6.3.0-r1.ebuild b/kde-plasma/kwin/kwin-6.3.0-r2.ebuild
index d996b2c9ff3f..84c11f09990f 100644
--- a/kde-plasma/kwin/kwin-6.3.0-r1.ebuild
+++ b/kde-plasma/kwin/kwin-6.3.0-r2.ebuild
@@ -114,7 +114,10 @@ BDEPEND="
 # -m 0755 to avoid suid with USE="-filecaps"
 FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland )
 
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-lto.patch"
+)
 
 src_prepare() {
 	ecm_src_prepare