commit:     c32480e88d551853c179ddcf84e264df51a3c1b6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 19:00:11 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 19:24:09 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c32480e8

kde-plasma/plasma-workspace: Set GLIBC_LOCALE_PREGENERATED=ON

... and GLIBC_LOCALE_GEN=OFF.

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

 kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild | 8 +++-----
 kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild        | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild
index 4fa8be3de4..e58e9ca24d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild
@@ -108,10 +108,7 @@ COMMON_DEPEND="
        )
        geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
        gps? ( sci-geosciences/gpsd )
-       policykit? (
-               >=sys-auth/polkit-qt-0.175[qt6(+)]
-               virtual/libcrypt:=
-       )
+       policykit? ( virtual/libcrypt:= )
        screencast? (
                >=dev-qt/qtbase-${QTMIN}:6=
                >=kde-plasma/kpipewire-${KDE_CATV}:6
@@ -202,7 +199,8 @@ src_configure() {
        local mycmakeargs=(
                -DWITH_X11=ON # TODO: broken upstream, fix it if you can
                -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
-               -DGLIBC_LOCALE_GEN=$(usex policykit)
+               -DGLIBC_LOCALE_GEN=OFF
+               -DGLIBC_LOCALE_PREGENERATED=$(usex elibc_glibc)
                $(cmake_use_find_package appstream AppStreamQt)
                $(cmake_use_find_package calendar KF6Holidays)
                $(cmake_use_find_package fontconfig Fontconfig)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index fd230a8e29..9b6dfaf4ed 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -107,10 +107,7 @@ COMMON_DEPEND="
                x11-libs/xcb-util-image
        )
        gps? ( sci-geosciences/gpsd )
-       policykit? (
-               >=sys-auth/polkit-qt-0.175[qt6(+)]
-               virtual/libcrypt:=
-       )
+       policykit? ( virtual/libcrypt:= )
        semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
        systemd? ( sys-apps/systemd:= )
        telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
@@ -183,7 +180,8 @@ src_configure() {
        local mycmakeargs=(
                -DWITH_X11=ON # TODO: broken upstream, fix it if you can
                -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
-               -DGLIBC_LOCALE_GEN=$(usex policykit)
+               -DGLIBC_LOCALE_GEN=OFF
+               -DGLIBC_LOCALE_PREGENERATED=$(usex elibc_glibc)
                $(cmake_use_find_package appstream AppStreamQt)
                $(cmake_use_find_package calendar KF6Holidays)
                $(cmake_use_find_package fontconfig Fontconfig)

Reply via email to