commit:     89a040d8e5dffcfb7fbad08af06be65844ccdd95
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 11:10:03 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:10:35 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=89a040d8

kde-plasma/plasma-workspace: Re-incorporate kde-plasma/xembed-sni-proxy

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index 91ee0e4dbd..99efb6c573 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-plasma/libkworkspace:5
        !<kde-plasma/breeze-5.22.90:5
        !<kde-plasma/plasma-desktop-5.27.0:5
+       !kde-plasma/xembed-sni-proxy:*
        app-text/iso-codes
        dev-libs/kirigami-addons:6
        >=dev-qt/qttools-${QTMIN}:*[qdbus]
@@ -164,9 +165,6 @@ PATCHES=(
 src_prepare() {
        ecm_src_prepare
 
-       # delete colliding libkworkspace translations
-       find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-
        # TODO: try to get a build switch upstreamed
        if ! use screencast; then
                ecm_punt_bogus_dep KPipeWire
@@ -196,7 +194,6 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               -DBUILD_xembed-sni-proxy=OFF
                -DWITH_X11=ON # TODO: broken upstream, fix it if you can
                -DGLIBC_LOCALE_GEN=$(usex policykit)
                $(cmake_use_find_package appstream AppStreamQt)

Reply via email to