summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2025-06-15 16:43:22 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2025-06-15 16:50:43 +0200
commit9668131ffb629c3225206821c4ab0686c864f80a (patch)
tree64773846e9e23862b3d2bc1428d61dd836d2e63a
parentc245bdd7508bdde4a36df5173c732c82acdf9d05 (diff)
downloadkde-9668131ffb629c3225206821c4ab0686c864f80a.tar.gz
kde-9668131ffb629c3225206821c4ab0686c864f80a.tar.bz2
kde-9668131ffb629c3225206821c4ab0686c864f80a.zip
kde-plasma/plasma-desktop: Drop unused ICU dependency
Upstream commits: 8235d9ec36720e72cacec2721d67a8682149c677 6fdca0deaebb9d2adc22c737359e774b618fd358 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch45
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-6.4.0.ebuild2
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-6.4.49.9999.ebuild1
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild1
4 files changed, 46 insertions, 3 deletions
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch
new file mode 100644
index 00000000000..bdcf6679cf3
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch
@@ -0,0 +1,45 @@
+From 8235d9ec36720e72cacec2721d67a8682149c677 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Fri, 13 Jun 2025 15:55:03 +0200
+Subject: [PATCH] Drop no longer used icu dependency
+
+It's no longer necessary since commit
+6fdca0deaebb9d2adc22c737359e774b618fd358.
+---
+ CMakeLists.txt | 6 ------
+ kcms/dateandtime/CMakeLists.txt | 2 --
+ 2 files changed, 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a05e390797..ef8a77f44f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -233,12 +233,6 @@ if (BUILD_KCM_TOUCHPAD_X11)
+ endif()
+
+
+-find_package(ICU COMPONENTS i18n uc)
+-set_package_properties(ICU PROPERTIES
+- PURPOSE "Retrieving timezone info"
+- TYPE REQUIRED
+-)
+-
+ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
+ add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
+ add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
+diff --git a/kcms/dateandtime/CMakeLists.txt b/kcms/dateandtime/CMakeLists.txt
+index 347ab280a9..72b866af3c 100644
+--- a/kcms/dateandtime/CMakeLists.txt
++++ b/kcms/dateandtime/CMakeLists.txt
+@@ -26,8 +26,6 @@ target_link_libraries(kcm_clock
+ KF6::KIOCore
+ KF6::KIOWidgets
+ KF6::Svg
+- ICU::i18n
+- ICU::uc
+ )
+ install(TARGETS kcm_clock DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/kcms/systemsettings_qwidgets )
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.4.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.4.0.ebuild
index fede896f231..c35ee07639a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.4.0.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.4.0.ebuild
@@ -24,7 +24,6 @@ RESTRICT="test" # missing selenium-webdriver-at-spi
# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
# kde-plasma/plasma-workspace[X]: applets/pager/pagermodel.cpp includes xwindowtasksmodel.h
COMMON_DEPEND="
- dev-libs/icu:=
>=dev-qt/qt5compat-${QTMIN}:6[qml]
>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
>=dev-qt/qtdeclarative-${QTMIN}:6
@@ -128,6 +127,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-6.1.80-override-include-dirs.patch" # downstream patch
+ "${FILESDIR}/${P}-unused-dep.patch" # fixed in 6.4 branch
)
src_prepare() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.4.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.4.49.9999.ebuild
index e1b5e6c409d..4832db54106 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.4.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.4.49.9999.ebuild
@@ -24,7 +24,6 @@ RESTRICT="test" # missing selenium-webdriver-at-spi
# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
# kde-plasma/plasma-workspace[X]: applets/pager/pagermodel.cpp includes xwindowtasksmodel.h
COMMON_DEPEND="
- dev-libs/icu:=
>=dev-qt/qt5compat-${QTMIN}:6[qml]
>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
>=dev-qt/qtdeclarative-${QTMIN}:6
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index d6392b19972..63a80eac43f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -24,7 +24,6 @@ RESTRICT="test" # missing selenium-webdriver-at-spi
# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
# kde-plasma/plasma-workspace[X]: applets/pager/pagermodel.cpp includes xwindowtasksmodel.h
COMMON_DEPEND="
- dev-libs/icu:=
>=dev-qt/qt5compat-${QTMIN}:6[qml]
>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
>=dev-qt/qtdeclarative-${QTMIN}:6