diff options
Diffstat (limited to 'kde-plasma/plasma-desktop')
| -rw-r--r-- | kde-plasma/plasma-desktop/Manifest | 8 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch | 24 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch | 40 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/metadata.xml | 1 | ||||
| -rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-5.27.5.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild) | 25 |
5 files changed, 9 insertions, 89 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 21dd5b8c5947..34cf13873a38 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,11 +1,9 @@ -AUX plasma-desktop-5.26.5-missing-kpackage-1.patch 607 BLAKE2B 9259235c168e4139578e55656e5d870e7f9dea8b224913cf27874614c1023c48ed88ee0d196c62c70b4efcd5b75879fac69edac194fe1774575070318c705602 SHA512 1b70359238da9c73a5a25e4399871a37016b14737258cf37dee71c089aca443af4a5b2a8e83a9855517a163a6d57dbc82b665e4e8c1c416c0924c63777a5ccea -AUX plasma-desktop-5.26.5-missing-kpackage-2.patch 1123 BLAKE2B 160c72f267016be9a320bd735b1d84e3cba30a28a09665a2f4e4a73eb9834c9b04feb468b1359867d77ee062a84278a65048f727595ac211b492b8490a00e8b3 SHA512 cb75f2a27d4436f5828929fd05d92ec3847c2741a776eeeb7df26fc406da5751ec542f94db9a6e1d71e063e7c292f09c1233e81693409d33d9f65641c558f6ad -DIST plasma-desktop-5.26.5.tar.xz 6352588 BLAKE2B 093d559830719ac011d5aea33beb86c6fb39403a44416da97646c1f890373cfcd570ae6015dfacf0d4cd2448b44e03f814376a3897351178c582bc865e110fce SHA512 6d58bc09c7f0e0218d3ffe4609fe206012c34d8c1ad64003a51ee3228e2ca203b0131b878f797babc43476bd0cf3e7cbe295e8a11ff1ae97843a61b2183ae182 DIST plasma-desktop-5.27.4-patchset-1.tar.xz 3344 BLAKE2B 4e8daaa10a1f88fcfbf72346b275d3cf6656460dc05f3c61dae4cdc5b9c9071728cf9cf82a13f69d4b8cb6ca79844c1ca37842540a1acfe2fa799553bd0b6773 SHA512 a75e15053134968d805642daeadcf6b3aa321736470d1a04f19f7dc76b513423d97929b36363632bc8eab4167eead2ae58df727bbb69587ef90fcfc0aa94669e DIST plasma-desktop-5.27.4-patchset-2.tar.xz 9180 BLAKE2B 1ef7f0151d0b62e496aa06c8c63f970bff2133797a901dd11f916484a2b58d948f5433c4c979a1993f7997f7f5efbd4b197d1bd9c520836121d8ccab5dda5dd7 SHA512 40883f770c9c49d883b10708d3b6fbe00aa50eea8a8819e5882eb3661cc59fc67351c9690d1d569592d2e05a984847e6981eb98d6d047edc62fb50cc562e83d0 DIST plasma-desktop-5.27.4.tar.xz 14335168 BLAKE2B b45aaa6cc04d3d519e7ccad0cae674f60c6f4c81105deb0a575db7f6c1eeaf19e9ce8e441c4144ac670c722a9413b68e9eb2c111338844e0bed0839e69da69ce SHA512 a9e8dc3244631af50429d05c3ec861396e2b5b58738ebee7dfcc9c912f43ca9865ed8343f585fd665df41a05c401996a97161da10e852970dfc2741e01614162 +DIST plasma-desktop-5.27.5.tar.xz 14361248 BLAKE2B cf8efedc79c9ca24c7f267c02fa51af2680ef130eba702855e6a1a75537b55b266206bd1c0b5ca4c99779ff5d9a567c5da74d3c58f5320c39c9bd322e642f9e9 SHA512 2dee9d068b0a4ffaccffe6175f8c9833451d2235837d3187ee3f5bf62e0024d48ff50884b7708b914e0e383471e83b9ba969c84103d5351e1b8583a04ec703fb DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a -EBUILD plasma-desktop-5.26.5-r2.ebuild 5670 BLAKE2B bb1797e33205edb737cecbb075d7632ceae2f1794b9d71c23c6c00d5dcd6b98c2a43f44fc97a454521ae11032ab9765f29351bb663c1f2052cf5416821d4d8fe SHA512 ed1c75f01fd9f080141adc186a47fc102f080b8691f7ec1af2ade8bbbb5dea43eb68155fa4c307f1f0bdb53baab2d86dba4e43669d5251c1ff1bb9c30b210565 EBUILD plasma-desktop-5.27.4-r1.ebuild 5402 BLAKE2B 887f57ed533fbb35f531b8a929125b3cb7dde301a241b8e2600246fe82f9a8c087481c9ee471fab455ea76d9509442e1a24a740aac34ff5d55897ab808f53b37 SHA512 159fbdb13cae84f848ca6d02808e34544d03dd8859b297e06a4c77d60abf352e6e6dce885acc46db9bbaab42f6c9022d6932ad301708fa3bb85aee1d5a398cde EBUILD plasma-desktop-5.27.4-r2.ebuild 5451 BLAKE2B 4f2e5b819a3356ebc5f364bb29fd045646101d3d3d35558e9e9df74a684cbc185c33b0bdeb85ee1504577be24bbfa3807c051797a00ab87f45b33d859500fef9 SHA512 62bd4d2e07ed77440e3bd877028a9f3c50149e51437c5cc764a4626c7916269aa68783f22bd9a67ac2a5397fa5de740358cd41187a7f0d00a40de1c981f0d175 -MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5 +EBUILD plasma-desktop-5.27.5.ebuild 5276 BLAKE2B a89b14d3f258fe2d2807ef82ebdb6a886255b65fdc47ce255cc28e5f492885434060cc4a1433ace401c80aa23a247129a1c6f4e8091ec168a07a50faa95ab4d1 SHA512 5ffe37184eae53e4b9e5811f082bf810ba40e9f83ba2ec5036220bb00b520686f61b6b6121c1d3a577b0b2bde630c9b627d28d5c1d2feb4cdc5225ce84d1ddf6 +MISC metadata.xml 560 BLAKE2B bf6910f40706c17989a0961c39073bd1bb00575b0bbd12c9a44c5ae8c699b33451dac36512afe8310c4bff5432864d16adb0f5b6b3f933b39705409547b05ee5 SHA512 0f34c3e91789674538cbac7f857ef57db8e1ca9b85b7e5d512b1a6af10fb218bfae01f65ae1825d26bb31103e7b95c0cf68fc3965c40952392afafcbf5877a25 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch deleted file mode 100644 index 68f4ffc07848..000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8447cfdf67458768627def4f481d9f52f8d444e1 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Mon, 28 Nov 2022 13:08:09 +0100 -Subject: [PATCH] Add missing KPackage link - ---- - kcms/ksplash/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kcms/ksplash/CMakeLists.txt b/kcms/ksplash/CMakeLists.txt -index ea75dd743..8bf51f997 100644 ---- a/kcms/ksplash/CMakeLists.txt -+++ b/kcms/ksplash/CMakeLists.txt -@@ -28,6 +28,7 @@ target_link_libraries(kcm_splashscreen - KF5::Plasma - KF5::PlasmaQuick - KF5::NewStuff -+ KF5::Package - - Qt::DBus - Qt::Widgets --- -2.39.0 - diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch deleted file mode 100644 index 3ebddb75d195..000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8ad8d248b91d9357f4ee421e4933d89595faf80a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 15 Jan 2023 15:17:09 +0100 -Subject: [PATCH] Add missing KPackage search and link - -Follow-up to 8447cfdf67458768627def4f481d9f52f8d444e1 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 1 + - kcms/landingpage/CMakeLists.txt | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e797efa50..ef2db360d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,6 +74,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - WidgetsAddons - Codecs - Sonnet -+ Package - KDELibs4Support # kcms/dateandtime - ) - -diff --git a/kcms/landingpage/CMakeLists.txt b/kcms/landingpage/CMakeLists.txt -index 215d51234..e39da9f51 100644 ---- a/kcms/landingpage/CMakeLists.txt -+++ b/kcms/landingpage/CMakeLists.txt -@@ -26,6 +26,7 @@ target_link_libraries(kcm_landingpage - KF5::KCMUtils - KF5::ConfigWidgets - KF5::Declarative -+ KF5::Package - PW::KWorkspace - KF5::ActivitiesStats - --- -2.39.0 - diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index 3ea9270f30ec..3e49f87352a5 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -9,7 +9,6 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag> <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> <flag name="kaccounts">Build the OpenDesktop integration plugin</flag> <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.5.ebuild index 328d9db5465b..cb0f572091a5 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.5.ebuild @@ -5,9 +5,9 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=5.99.0 +KFMIN=5.102.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.5 +QTMIN=5.15.7 VIRTUALX_REQUIRED="test" inherit ecm plasma.kde.org optfeature @@ -17,8 +17,8 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="emoji ibus +kaccounts scim screencast +semantic-desktop telemetry" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="ibus +kaccounts scim screencast +semantic-desktop" # kde-frameworks/kwindowsystem[X]: Uses KX11Extras COMMON_DEPEND=" @@ -85,11 +85,6 @@ COMMON_DEPEND=" x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxkbfile - emoji? ( - app-i18n/ibus[emoji] - dev-libs/glib:2 - media-fonts/noto-emoji - ) ibus? ( app-i18n/ibus dev-libs/glib:2 @@ -103,7 +98,6 @@ COMMON_DEPEND=" ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) " DEPEND="${COMMON_DEPEND} >=dev-libs/wayland-protocols-1.25 @@ -112,7 +106,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-plasma/kdeplasma-addons-5.25.50 - !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=dev-qt/qtwaylandscanner-${QTMIN}:5 @@ -120,6 +113,7 @@ RDEPEND="${COMMON_DEPEND} >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 >=kde-plasma/kde-cli-tools-${PVCUT}:5 >=kde-plasma/oxygen-${PVCUT}:5 + media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs @@ -133,7 +127,6 @@ BDEPEND=" PATCHES=( "${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # downstream patch - "${FILESDIR}"/${P}-missing-kpackage-{1,2}.patch ) src_prepare() { @@ -144,9 +137,6 @@ src_prepare() { -i applets/kimpanel/backend/ibus/CMakeLists.txt || die fi - use emoji || cmake_run_in applets/kimpanel/backend/ibus \ - cmake_comment_add_subdirectory emojier - # TODO: try to get a build switch upstreamed if ! use scim; then sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die @@ -160,14 +150,11 @@ src_configure() { -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + $(cmake_use_find_package ibus GLIB2) $(cmake_use_find_package kaccounts AccountsQt5) $(cmake_use_find_package kaccounts KAccounts) $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) ) - if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) - fi ecm_src_configure } |