summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-05-27 19:15:09 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2024-05-28 00:23:22 +0200
commit2ab68cb89d1bee4008374c5686eb701a33d655e8 (patch)
treeb6e8762ef6047be9f9fac7f8283663003c2f59b9 /kde-plasma
parentkde-plasma/plasma-browser-integration: drop 6.0.5 (diff)
downloadgentoo-2ab68cb89d1bee4008374c5686eb701a33d655e8.tar.gz
gentoo-2ab68cb89d1bee4008374c5686eb701a33d655e8.tar.bz2
gentoo-2ab68cb89d1bee4008374c5686eb701a33d655e8.zip
kde-plasma/plasma-desktop: drop 6.0.5
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/plasma-desktop/Manifest1
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch85
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild179
3 files changed, 0 insertions, 265 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index e9d5e4abf338..4b21c18520c0 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,4 @@
DIST plasma-desktop-5.27.11.tar.xz 14729900 BLAKE2B 3c023febf5c6dc72fdd3ca3696d5c5c84c5c099e8d66497e9fccde601a23ec19fc001d6b48f9b1160946ab46e0436e54dc20a91c56dafae455e8455fa558bfc4 SHA512 644bfe2235dcfc591ae66fc7090ca1e67fc8dfe80033c1b0bedc32cd76299a3f47e6c74eadee7ce80241efb31d20b561d9c06af457aa36b6528548b4eaee3eb9
-DIST plasma-desktop-6.0.5.tar.xz 15632868 BLAKE2B 9ece4d16440ecd9f38bad29dc5039439662abf9c872103d9faa58c742b1b93d7825ad4bf6716778c5a3881b877c30d58dcecbaef117fb9ade2ef7d804acece3c SHA512 59ab3e024a5a947603556d596f52bbcedbe94a997f67955583534ad4fce9c95c03e98e977f6df47be13d6014c55266c3f0fee88fdde682fe5d1036c170577499
DIST plasma-desktop-6.0.90.tar.xz 16133260 BLAKE2B 79c213026b81ed52cc646de37e40954382be15918beeb00584e0e43160d86ac20eb6dba221274bae9fcfc728e89194b50c8ea589372c01554316d5bd52c3c606 SHA512 4d51b7aa16172a55a2f4dce944a4805fd1fdb139dd6a875e4cb1c5861d735babca97d3e075a15071fb2803d537f37dd1f3c914e7ab3074027a3ebd0528772028
DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
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.0.5-unused-dep.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch
deleted file mode 100644
index e88c78b49be4..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 96d62f21f52e543dfb1f114988d4912ef321772f Mon Sep 17 00:00:00 2001
-From: Jakob Petsovits <jpetso@petsovits.com>
-Date: Thu, 4 Apr 2024 19:03:49 -0400
-Subject: [PATCH 1/2] kcms/mouse: Remove unused xorg-evdev dependency
-
-It's not necessary to access it directly anymore, now that we only
-expose settings for libinput.
-
-(cherry picked from commit b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770)
----
- kcms/mouse/CMakeLists.txt | 3 ---
- kcms/mouse/backends/x11.cmake | 1 -
- kcms/mouse/inputbackend.h | 1 -
- 3 files changed, 5 deletions(-)
-
-diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
-index 639981380..909ed815d 100644
---- a/kcms/mouse/CMakeLists.txt
-+++ b/kcms/mouse/CMakeLists.txt
-@@ -32,9 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND)
- endif()
-
- if (BUILD_KCM_MOUSE_X11)
-- if (NOT EVDEV_FOUND)
-- list(APPEND MISSING_DEPS "xorg-evdev")
-- endif()
- if (NOT XORGLIBINPUT_FOUND)
- list(APPEND MISSING_DEPS "xorg-libinput")
- endif()
-diff --git a/kcms/mouse/backends/x11.cmake b/kcms/mouse/backends/x11.cmake
-index 3b1601285..c402612de 100644
---- a/kcms/mouse/backends/x11.cmake
-+++ b/kcms/mouse/backends/x11.cmake
-@@ -11,7 +11,6 @@ set(backend_SRCS
- set(backend_LIBS
- ${backend_LIBS}
- PkgConfig::XORGLIBINPUT
-- PkgConfig::EVDEV
- X11::X11
- X11::Xi
- X11::Xcursor
-diff --git a/kcms/mouse/inputbackend.h b/kcms/mouse/inputbackend.h
-index 579634d27..0a6e6ac6a 100644
---- a/kcms/mouse/inputbackend.h
-+++ b/kcms/mouse/inputbackend.h
-@@ -20,7 +20,6 @@ enum class InputBackendMode {
- #endif
- #if BUILD_KCM_MOUSE_X11
- XLibinput = 1,
-- XEvdev = 2,
- #endif
- };
-
---
-2.45.1
-
-
-From fcc965d6a90822b2c6600bf2426dfb0c2b46021a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 20 May 2024 18:41:57 +0200
-Subject: [PATCH 2/2] Cleanup remaining pkg_check_modules(EVDEV) call
-
-Amends 181b6c85ea6d46652b136462d5b6e0c9b56fc5c2 and b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-(cherry picked from commit 2242b7852f1ab746e4f6929e2fcd51b24b2ec37e)
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b475d3c5b..a515367a8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -226,7 +226,6 @@ 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")
-
- pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
--pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
- pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
-
- ecm_find_qmlmodule(org.kde.pipewire 0.1)
---
-2.45.1
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild
deleted file mode 100644
index f928f890a09a..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=6.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=6.6.2
-inherit ecm plasma.kde.org optfeature
-
-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"
-IUSE="ibus kaccounts scim screencast sdl +semantic-desktop"
-
-RESTRICT="test" # missing selenium-webdriver-at-spi
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-COMMON_DEPEND="
- dev-libs/icu:=
- dev-libs/wayland
- >=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
- >=dev-qt/qtwayland-${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-${PVCUT}:6
- >=kde-plasma/libksysguard-${PVCUT}:6
- >=kde-plasma/libplasma-${PVCUT}:6
- >=kde-plasma/plasma-activities-${PVCUT}:6
- >=kde-plasma/plasma-activities-stats-${PVCUT}:6
- >=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?]
- >=kde-plasma/plasma5support-${PVCUT}: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
- )
- kaccounts? (
- kde-apps/kaccounts-integration:6
- >=net-libs/accounts-qt-1.16_p20220803[qt6]
- )
- scim? ( app-i18n/scim )
- sdl? ( media-libs/libsdl2[joystick] )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/wayland-protocols-1.25
- dev-libs/boost
- x11-base/xorg-proto
- test? (
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
- >=kde-plasma/kactivitymanagerd-${PVCUT}:6
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/kdeplasma-addons-5.25.50
- dev-libs/kirigami-addons:6
- >=dev-qt/qtwayland-${QTMIN}:6
- >=kde-frameworks/kirigami-${KFMIN}:6
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
- >=kde-plasma/kde-cli-tools-${PVCUT}:*
- >=kde-plasma/oxygen-${PVCUT}:6
- media-fonts/noto-emoji
- sys-apps/util-linux
- x11-apps/setxkbmap
- x11-misc/xdg-user-dirs
- kaccounts? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] )
- screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 )
-"
-BDEPEND="
- dev-util/intltool
- dev-util/wayland-scanner
- >=kde-frameworks/kcmutils-${KFMIN}:6
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.0.5-unused-dep.patch" # backport from 6.1/git master
- "${WORKDIR}/${XORGHDRS}/${PN}-6.0.5-override-include-dirs.patch" # downstream patch
-)
-
-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)
- $(cmake_use_find_package kaccounts AccountsQt6)
- $(cmake_use_find_package kaccounts KAccounts6)
- $(cmake_use_find_package sdl SDL2)
- $(cmake_use_find_package semantic-desktop KF6Baloo)
- )
-
- 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
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "screen reader support" "app-accessibility/orca"
- fi
- ecm_pkg_postinst
-}