From da1d6ef2339994d7aefcb0103caae8cda9fea708 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 24 Jun 2025 17:57:10 +0200 Subject: [PATCH] kde-plasma/plasma-desktop: drop 6.4.0 Signed-off-by: Andreas Sturmlechner --- kde-plasma/plasma-desktop/Manifest | 1 - .../plasma-desktop-6.4.0-unused-dep.patch | 45 ----- .../plasma-desktop-6.4.0.ebuild | 189 ------------------ 3 files changed, 235 deletions(-) delete mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-6.4.0.ebuild diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 938eaa5869cd2..6447ce81ad18d 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,4 +1,3 @@ DIST plasma-desktop-6.3.5.tar.xz 16892144 BLAKE2B f27134b91ad3c416a58b2334331e2e7fdc94c91b99eec446469146f267652152db91987d71c7fea75dd9733972c46a2179f3d2beb98be3c566af2611887f6dc8 SHA512 d4eaad8211325042f22769dcb42b17aa2175e7faf16499ddfb0d015164afb610ef02d1b2dd9e645003206fabc0c60c2e930223cdd94578774f8850ebb061f439 -DIST plasma-desktop-6.4.0.tar.xz 16745856 BLAKE2B 0a1ce335908557985be2580541b1c8121b01fdfdc9c7caadee207b7821291c2b8c1c8c9b4b11164fdd0863bf14e0065b14d02f42304a6e39879987ec790c2618 SHA512 dbf56809cf9d94aae1bac78bfc3bae59075baceb501efe0e5a0a69898f25f247d4380c2ad2bbf6e167471474e0abf2b331ab469e6c2578ed5d5b877558dae5fe DIST plasma-desktop-6.4.1.tar.xz 16748588 BLAKE2B 4696491466cb5fbb95f98d0938251f6ba321b1698cb53d62233a71b5ecfdd3812926dfeaeb912168f046393f724132b9d3545da1f98189d573aba8d46dfc7e8f SHA512 f905d6d074b3df69fcd5b8489f1890226a81dae909478fd07d536d4ca4376b4502e8d554075325710f3df47394aa0275385e0a7caf138f880b278ed7a5b8d32f DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1 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 deleted file mode 100644 index bdcf6679cf390..0000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-6.4.0-unused-dep.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8235d9ec36720e72cacec2721d67a8682149c677 Mon Sep 17 00:00:00 2001 -From: Heiko Becker -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 deleted file mode 100644 index c35ee07639af2..0000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.4.0.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=6.14.0 -QTMIN=6.8.1 -inherit ecm plasma.kde.org optfeature xdg - -DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-4" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine" - -RESTRICT="test" # missing selenium-webdriver-at-spi - -# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h -# kde-frameworks/kwindowsystem[X]: Uses KX11Extras -# kde-plasma/plasma-workspace[X]: applets/pager/pagermodel.cpp includes xwindowtasksmodel.h -COMMON_DEPEND=" - >=dev-qt/qt5compat-${QTMIN}:6[qml] - >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=kde-frameworks/attica-${KFMIN}:6 - >=kde-frameworks/karchive-${KFMIN}:6 - >=kde-frameworks/kauth-${KFMIN}:6 - >=kde-frameworks/kbookmarks-${KFMIN}:6 - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kcodecs-${KFMIN}:6 - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kded-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/kguiaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kitemmodels-${KFMIN}:6 - >=kde-frameworks/kitemviews-${KFMIN}:6 - >=kde-frameworks/kjobwidgets-${KFMIN}:6 - >=kde-frameworks/knewstuff-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/kpackage-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/krunner-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - >=kde-frameworks/sonnet-${KFMIN}:6 - >=kde-plasma/kwin-${KDE_CATV}:6 - >=kde-plasma/libksysguard-${KDE_CATV}:6 - >=kde-plasma/libplasma-${KDE_CATV}:6 - >=kde-plasma/plasma-activities-${KDE_CATV}:6 - >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 - >=kde-plasma/plasma-workspace-${KDE_CATV}:6[screencast?,X] - >=kde-plasma/plasma5support-${KDE_CATV}:6 - media-libs/libcanberra - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libxkbcommon - x11-libs/libxkbfile - ibus? ( - app-i18n/ibus - dev-libs/glib:2 - x11-libs/xcb-util-keysyms - ) - input_devices_wacom? ( - dev-libs/wayland - dev-libs/libwacom:= - >=dev-qt/qtwayland-${QTMIN}:6 - ) - scim? ( app-i18n/scim ) - sdl? ( media-libs/libsdl2[joystick] ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) - webengine? ( - kde-apps/kaccounts-integration:6 - >=net-libs/accounts-qt-1.17[qt6(+)] - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto - input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 ) - test? ( - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${KDE_CATV}:6 - ) -" -RDEPEND="${COMMON_DEPEND} - !=dev-qt/qtwayland-${QTMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/oxygen-${KDE_CATV}:6 - >=kde-plasma/plasma-mimeapps-list-3 - media-fonts/noto-emoji - sys-apps/util-linux - x11-apps/setxkbmap - x11-misc/xdg-user-dirs - screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) - webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6(+)] ) -" -BDEPEND=" - dev-util/intltool - >=kde-frameworks/kcmutils-${KFMIN}:6 - virtual/pkgconfig - input_devices_wacom? ( dev-util/wayland-scanner ) -" - -PATCHES=( - "${FILESDIR}/${PN}-6.1.80-override-include-dirs.patch" # downstream patch - "${FILESDIR}/${P}-unused-dep.patch" # fixed in 6.4 branch -) - -src_prepare() { - ecm_src_prepare - - if ! use ibus; then - sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die - fi - - # TODO: try to get a build switch upstreamed - if ! use scim; then - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_KCM_MOUSE_X11=ON - -DBUILD_KCM_TOUCHPAD_X11=ON - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged - $(cmake_use_find_package ibus GLIB2) - -DBUILD_KCM_TABLET=$(usex input_devices_wacom) - $(cmake_use_find_package sdl SDL2) - $(cmake_use_find_package semantic-desktop KF6Baloo) - $(cmake_use_find_package webengine AccountsQt6) - $(cmake_use_find_package webengine KAccounts6) - ) - - ecm_src_configure -} - -src_test() { - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 - # test_kio_fonts needs D-Bus, bug #634166 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918 - local myctestargs=( - -j1 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" - ) - - ecm_src_test -} - -src_install() { - cmake_src_install - - # Provide kde-mimeapps.list with distribution kde-plasma/plasma-mimeapps-list - rm "${ED}"/usr/share/applications/kde-mimeapps.list || die -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "screen reader support" "app-accessibility/orca" - fi - xdg_pkg_postinst -}