diff options
Diffstat (limited to 'kde-plasma/plasma-desktop')
| -rw-r--r-- | kde-plasma/plasma-desktop/Manifest | 5 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch | 85 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-6.0.90.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild) | 8 |
3 files changed, 6 insertions, 92 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index a0dab71697ba..02ccdd7f4847 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,8 +1,7 @@ -AUX plasma-desktop-6.0.5-unused-dep.patch 2710 BLAKE2B 69c3cb6a6455fdeb2d2f8c70f0914f4729dbadfbb55411530f97206bff9aeddd56acb4c952a9add778ad0d86c7664762136ff314f2587ecbe60c0effcd1f003d SHA512 75764344336d18766ea71458b3c7063a690d05498f146b3eea5552705c6913e4b432a791aa09f943cc7bab15747fcf5151f9b8af594108d5d5ca5440d2a98a43 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 EBUILD plasma-desktop-5.27.11.ebuild 5318 BLAKE2B 75da1ba8bec630d7d93b0a397b4905b547ad90e8b5b465f47a287b3c7b883e2ae18ed78924f267228d7c4e46b19a41e276c6e589370c265dbb35f61b3595ed4d SHA512 054fc42dee25b42b204d1fd1bbe329620c1fae0b55f8326dd3132f77f027399aac552b7e3598850c135a1fa4bd52878f619fdab5f9aafd46148fc90c82654da1 -EBUILD plasma-desktop-6.0.5.ebuild 5250 BLAKE2B 8da9aaf6fd25cf18e0d2a34712b5912a8f53ccf698e6ea58532fec4e91989c9ebd3acde1944f95612c94bacc1f2eadca2df0950bf822e05daec915f3986787b1 SHA512 4590f680ff558c8370e587b4dbd4958fffb58c16d8239342538b4ae0bae15f6ed6a18ae4580bf1605177de93dcadc672d1a98e823822114e32cc89e9a7fbecbe +EBUILD plasma-desktop-6.0.90.ebuild 5216 BLAKE2B 41d7e432884003d17490c65eb619d01ee9e9137a22e68926a76c0bd7187fb01d20f72e4cf3a9f7a56ae8158db6ef6c339b659e82e617639e0b35aff68b3a9157 SHA512 c8f9324b9879f0070d5c72568ff00515711a807d7a722bacadc400a81f9f4bd6cb8c37397594f94888532f96388712d914367a41b708d00d1d6a1a2801855993 MISC metadata.xml 560 BLAKE2B bf6910f40706c17989a0961c39073bd1bb00575b0bbd12c9a44c5ae8c699b33451dac36512afe8310c4bff5432864d16adb0f5b6b3f933b39705409547b05ee5 SHA512 0f34c3e91789674538cbac7f857ef57db8e1ca9b85b7e5d512b1a6af10fb218bfae01f65ae1825d26bb31103e7b95c0cf68fc3965c40952392afafcbf5877a25 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.90.ebuild index f928f890a09a..e1d1d414365d 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.0.90.ebuild @@ -5,9 +5,9 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=6.0 +KFMIN=6.2.0 PVCUT=$(ver_cut 1-3) -QTMIN=6.6.2 +QTMIN=6.7.1 inherit ecm plasma.kde.org optfeature DESCRIPTION="KDE Plasma desktop" @@ -103,6 +103,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-plasma/kdeplasma-addons-5.25.50 + !<kde-plasma/plasma-workspace-6.0.80 dev-libs/kirigami-addons:6 >=dev-qt/qtwayland-${QTMIN}:6 >=kde-frameworks/kirigami-${KFMIN}:6 @@ -124,8 +125,7 @@ BDEPEND=" " 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 + "${WORKDIR}/${XORGHDRS}/${PN}-6.0.80-override-include-dirs.patch" # downstream patch ) src_prepare() { |