| 1 |
commit: 4256c550991105e8ad7d9d6f1782706118c14327 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 4 14:59:17 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 15:56:19 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4256c550 |
| 7 |
|
| 8 |
kde-plasma/plasma-workspace: Rename IUSE=qalculate -> calculator |
| 9 |
|
| 10 |
As discussed on https://bugs.kde.org/show_bug.cgi?id=433730 rather |
| 11 |
than having bad floating point precision, we should build calculator |
| 12 |
runner conditionally on qalculate. |
| 13 |
|
| 14 |
Based on work by Zoltan Puskas but solved without using patch that is |
| 15 |
not yet filed upstream. |
| 16 |
|
| 17 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 18 |
Thanks-to: Zoltan Puskas <zoltan <AT> sinustrom.info> |
| 19 |
Closes: https://github.com/gentoo/kde/pull/901 |
| 20 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 21 |
|
| 22 |
kde-plasma/plasma-workspace/metadata.xml | 2 +- |
| 23 |
.../plasma-workspace-5.21.49.9999.ebuild | 15 +++++++++------ |
| 24 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 21 ++++++++++++--------- |
| 25 |
3 files changed, 22 insertions(+), 16 deletions(-) |
| 26 |
|
| 27 |
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml |
| 28 |
index 599877f90b..2bd7fc185c 100644 |
| 29 |
--- a/kde-plasma/plasma-workspace/metadata.xml |
| 30 |
+++ b/kde-plasma/plasma-workspace/metadata.xml |
| 31 |
@@ -7,8 +7,8 @@ |
| 32 |
</maintainer> |
| 33 |
<use> |
| 34 |
<flag name="appstream">Enable AppStream software metadata support</flag> |
| 35 |
+ <flag name="calculator">Enable calculator runner using <pkg>sci-libs/libqalculate</pkg></flag> |
| 36 |
<flag name="geolocation">Enables dataengine providing location information</flag> |
| 37 |
- <flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag> |
| 38 |
<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag> |
| 39 |
<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag> |
| 40 |
</use> |
| 41 |
|
| 42 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.49.9999.ebuild |
| 43 |
index 03cc7cf68a..2c81fd4458 100644 |
| 44 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.49.9999.ebuild |
| 45 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.49.9999.ebuild |
| 46 |
@@ -16,12 +16,12 @@ DESCRIPTION="KDE Plasma workspace" |
| 47 |
LICENSE="GPL-2" # TODO: CHECK |
| 48 |
SLOT="5" |
| 49 |
KEYWORDS="" |
| 50 |
-IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry" |
| 51 |
+IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast |
| 52 |
++semantic-desktop systemd telemetry" |
| 53 |
|
| 54 |
REQUIRED_USE="gps? ( geolocation )" |
| 55 |
RESTRICT+=" test" |
| 56 |
|
| 57 |
-BDEPEND="virtual/pkgconfig" |
| 58 |
COMMON_DEPEND=" |
| 59 |
>=dev-libs/wayland-1.15 |
| 60 |
>=dev-qt/qtdbus-${QTMIN}:5 |
| 61 |
@@ -93,6 +93,7 @@ COMMON_DEPEND=" |
| 62 |
x11-libs/xcb-util |
| 63 |
x11-libs/xcb-util-image |
| 64 |
appstream? ( dev-libs/appstream[qt5] ) |
| 65 |
+ calculator? ( sci-libs/libqalculate:= ) |
| 66 |
calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) |
| 67 |
fontconfig? ( |
| 68 |
media-libs/fontconfig |
| 69 |
@@ -102,7 +103,6 @@ COMMON_DEPEND=" |
| 70 |
) |
| 71 |
geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) |
| 72 |
gps? ( sci-geosciences/gpsd ) |
| 73 |
- qalculate? ( sci-libs/libqalculate:= ) |
| 74 |
screencast? ( |
| 75 |
>=media-video/pipewire-0.3:= |
| 76 |
x11-libs/libdrm |
| 77 |
@@ -138,6 +138,7 @@ RDEPEND="${COMMON_DEPEND} |
| 78 |
!systemd? ( sys-apps/dbus ) |
| 79 |
!<kde-plasma/plasma-desktop-5.19.80:5 |
| 80 |
" |
| 81 |
+BDEPEND="virtual/pkgconfig" |
| 82 |
PDEPEND=" |
| 83 |
>=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 84 |
" |
| 85 |
@@ -155,9 +156,12 @@ src_prepare() { |
| 86 |
|
| 87 |
# TODO: try to get a build switch upstreamed |
| 88 |
if ! use screencast; then |
| 89 |
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" \ |
| 90 |
- -i CMakeLists.txt || die |
| 91 |
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die |
| 92 |
fi |
| 93 |
+ |
| 94 |
+ # KDE-bug: 433730 |
| 95 |
+ use calculator || |
| 96 |
+ cmake_run_in runners cmake_comment_add_subdirectory calculator |
| 97 |
} |
| 98 |
|
| 99 |
src_configure() { |
| 100 |
@@ -167,7 +171,6 @@ src_configure() { |
| 101 |
$(cmake_use_find_package calendar KF5Holidays) |
| 102 |
$(cmake_use_find_package fontconfig Fontconfig) |
| 103 |
$(cmake_use_find_package geolocation KF5NetworkManagerQt) |
| 104 |
- $(cmake_use_find_package qalculate Qalculate) |
| 105 |
$(cmake_use_find_package semantic-desktop KF5Baloo) |
| 106 |
$(cmake_use_find_package telemetry KUserFeedback) |
| 107 |
) |
| 108 |
|
| 109 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 110 |
index e7dd9eca29..688b19a65a 100644 |
| 111 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 112 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
| 113 |
@@ -16,15 +16,12 @@ DESCRIPTION="KDE Plasma workspace" |
| 114 |
LICENSE="GPL-2" # TODO: CHECK |
| 115 |
SLOT="5" |
| 116 |
KEYWORDS="" |
| 117 |
-IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry" |
| 118 |
+IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast |
| 119 |
++semantic-desktop systemd telemetry" |
| 120 |
|
| 121 |
REQUIRED_USE="gps? ( geolocation )" |
| 122 |
RESTRICT+=" test" |
| 123 |
|
| 124 |
-BDEPEND=" |
| 125 |
- >=dev-util/cmake-3.14 |
| 126 |
- virtual/pkgconfig |
| 127 |
-" |
| 128 |
COMMON_DEPEND=" |
| 129 |
>=dev-libs/wayland-1.15 |
| 130 |
>=dev-qt/qtdbus-${QTMIN}:5 |
| 131 |
@@ -99,6 +96,7 @@ COMMON_DEPEND=" |
| 132 |
x11-libs/xcb-util |
| 133 |
x11-libs/xcb-util-image |
| 134 |
appstream? ( dev-libs/appstream[qt5] ) |
| 135 |
+ calculator? ( sci-libs/libqalculate:= ) |
| 136 |
calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) |
| 137 |
fontconfig? ( |
| 138 |
>=dev-qt/qtprintsupport-${QTMIN}:5 |
| 139 |
@@ -108,7 +106,6 @@ COMMON_DEPEND=" |
| 140 |
) |
| 141 |
geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) |
| 142 |
gps? ( sci-geosciences/gpsd ) |
| 143 |
- qalculate? ( sci-libs/libqalculate:= ) |
| 144 |
screencast? ( |
| 145 |
>=media-video/pipewire-0.3:= |
| 146 |
x11-libs/libdrm |
| 147 |
@@ -144,6 +141,10 @@ RDEPEND="${COMMON_DEPEND} |
| 148 |
!systemd? ( sys-apps/dbus ) |
| 149 |
!<kde-plasma/plasma-desktop-5.19.80:5 |
| 150 |
" |
| 151 |
+BDEPEND=" |
| 152 |
+ >=dev-util/cmake-3.14 |
| 153 |
+ virtual/pkgconfig |
| 154 |
+" |
| 155 |
PDEPEND=" |
| 156 |
>=kde-plasma/kde-cli-tools-${PVCUT}:5 |
| 157 |
" |
| 158 |
@@ -161,9 +162,12 @@ src_prepare() { |
| 159 |
|
| 160 |
# TODO: try to get a build switch upstreamed |
| 161 |
if ! use screencast; then |
| 162 |
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" \ |
| 163 |
- -i CMakeLists.txt || die |
| 164 |
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die |
| 165 |
fi |
| 166 |
+ |
| 167 |
+ # KDE-bug: 433730 |
| 168 |
+ use calculator || |
| 169 |
+ cmake_run_in runners cmake_comment_add_subdirectory calculator |
| 170 |
} |
| 171 |
|
| 172 |
src_configure() { |
| 173 |
@@ -173,7 +177,6 @@ src_configure() { |
| 174 |
$(cmake_use_find_package calendar KF5Holidays) |
| 175 |
$(cmake_use_find_package fontconfig Fontconfig) |
| 176 |
$(cmake_use_find_package geolocation KF5NetworkManagerQt) |
| 177 |
- $(cmake_use_find_package qalculate Qalculate) |
| 178 |
$(cmake_use_find_package semantic-desktop KF5Baloo) |
| 179 |
$(cmake_use_find_package telemetry KUserFeedback) |
| 180 |
) |
Archives