commit:     021f9c635289129f4161b96ff07f6ae6ac133520
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 23:21:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 23:21:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=021f9c63

kde-plasma/kwin: filter LTO for older versions

This is fixed upstream in git and will be cherry-picked to 6.0 branch. But
not going to bother backporting it in Gentoo for <=6, so filter for older 
versions.

See https://invent.kde.org/plasma/kwin/-/merge_requests/5339.

Bug: https://bugs.gentoo.org/921558
Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-plasma/kwin/kwin-5.27.10-r2.ebuild | 5 ++++-
 kde-plasma/kwin/kwin-6.0.0.ebuild      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/kwin/kwin-5.27.10-r2.ebuild 
b/kde-plasma/kwin/kwin-5.27.10-r2.ebuild
index 5e54c5773374..a038cad012b5 100644
--- a/kde-plasma/kwin/kwin-5.27.10-r2.ebuild
+++ b/kde-plasma/kwin/kwin-5.27.10-r2.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="optional"
 KFMIN=5.106.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.9
-inherit ecm plasma.kde.org optfeature
+inherit ecm flag-o-matic plasma.kde.org optfeature
 
 DESCRIPTION="Flexible, composited Window Manager for windowing systems on 
Linux"
 
@@ -119,6 +119,9 @@ src_prepare() {
 }
 
 src_configure() {
+       # ODR violation (bug #921558)
+       filter-lto
+
        local mycmakeargs=(
                # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still 
hard-depends on it
                $(cmake_use_find_package accessibility QAccessibilityClient)

diff --git a/kde-plasma/kwin/kwin-6.0.0.ebuild 
b/kde-plasma/kwin/kwin-6.0.0.ebuild
index fd8eb2d7cb86..566ea08c2dcc 100644
--- a/kde-plasma/kwin/kwin-6.0.0.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.0.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="optional"
 KFMIN=6.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=6.6.2
-inherit ecm plasma.kde.org
+inherit ecm flag-o-matic plasma.kde.org
 
 DESCRIPTION="Flexible, composited Window Manager for windowing systems on 
Linux"
 
@@ -119,6 +119,9 @@ src_prepare() {
 }
 
 src_configure() {
+       # ODR violation (bug #921558)
+       filter-lto
+
        local mycmakeargs=(
                # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still 
hard-depends on it
                $(cmake_use_find_package accessibility QAccessibilityClient6)

Reply via email to