summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-02-21 12:46:42 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2022-02-21 12:47:06 +0100
commit2138bab01d36e14ba09fe61ea14e55a691d3efb1 (patch)
treefa651906a6bee91da4b90ce0282ac48a4720923c
parentbb9abeff45d913e654871e6c6bfde530196ccf28 (diff)
downloadkde-2138bab01d36e14ba09fe61ea14e55a691d3efb1.tar.gz
kde-2138bab01d36e14ba09fe61ea14e55a691d3efb1.tar.bz2
kde-2138bab01d36e14ba09fe61ea14e55a691d3efb1.zip
kde-plasma/plasma-workspace: Fix IUSE gps
Upstream commit 6045c1ee7d3236796a4e5a35e3f1b84c4bba7f03 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild8
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild8
2 files changed, 12 insertions, 4 deletions
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild
index c8abf2ec6cc..9b6a2f68691 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.49.9999.ebuild
@@ -167,6 +167,12 @@ src_prepare() {
sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
fi
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
if ! use policykit; then
cmake_run_in kcms cmake_comment_add_subdirectory users
fi
@@ -186,8 +192,6 @@ src_configure() {
$(cmake_use_find_package telemetry KUserFeedback)
)
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
ecm_src_configure
}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index d7c8efc8993..c90668f9a58 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -167,6 +167,12 @@ src_prepare() {
sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
fi
+ # TODO: try to get a build switch upstreamed
+ if use geolocation; then
+ use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
+ -i dataengines/geolocation/CMakeLists.txt || die
+ fi
+
if ! use policykit; then
cmake_run_in kcms cmake_comment_add_subdirectory users
fi
@@ -184,8 +190,6 @@ src_configure() {
$(cmake_use_find_package telemetry KUserFeedback)
)
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
ecm_src_configure
}