From 7c35d64267e11ce34e728ea01b4f4e7981175b8d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 15 Jan 2023 15:12:00 +0100 Subject: kde-plasma/plasma-desktop: Add missing dependencies - kde-frameworks/kpackage Used in ksplash and landingpage Upstream commit 8447cfdf67458768627def4f481d9f52f8d444e1 See also: https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/1338 - x11-libs/libXcursor and x11-libs/libxkbcommon Used in mouse and keyboard KCMs. Thanks-to: Sam James Signed-off-by: Andreas Sturmlechner --- .../plasma-desktop-5.26.5-missing-kpackage-1.patch | 24 +++ .../plasma-desktop-5.26.5-missing-kpackage-2.patch | 40 +++++ .../plasma-desktop/plasma-desktop-5.26.5-r1.ebuild | 188 -------------------- .../plasma-desktop/plasma-desktop-5.26.5-r2.ebuild | 192 +++++++++++++++++++++ 4 files changed, 256 insertions(+), 188 deletions(-) create mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch create mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r1.ebuild create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild 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 new file mode 100644 index 000000000000..68f4ffc07848 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-1.patch @@ -0,0 +1,24 @@ +From 8447cfdf67458768627def4f481d9f52f8d444e1 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +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 new file mode 100644 index 000000000000..3ebddb75d195 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.26.5-missing-kpackage-2.patch @@ -0,0 +1,40 @@ +From 8ad8d248b91d9357f4ee421e4933d89595faf80a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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 +--- + 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/plasma-desktop-5.26.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r1.ebuild deleted file mode 100644 index 26db65779408..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=5.99.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm plasma.kde.org optfeature - -DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-2" -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" - -# kde-frameworks/kwindowsystem[X]: Uses KX11Extras -COMMON_DEPEND=" - dev-libs/wayland - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?] - >=media-libs/phonon-4.11.0 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb - x11-libs/libxkbfile - emoji? ( - app-i18n/ibus[emoji] - dev-libs/glib:2 - media-fonts/noto-emoji - ) - ibus? ( - app-i18n/ibus - dev-libs/glib:2 - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - kaccounts? ( - kde-apps/kaccounts-integration:5 - net-libs/accounts-qt - ) - 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 - dev-libs/boost - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - !=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=kde-plasma/oxygen-${PVCUT}:5 - sys-apps/util-linux - x11-apps/setxkbmap - x11-misc/xdg-user-dirs - kaccounts? ( net-libs/signon-oauth2 ) - screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 ) -" -BDEPEND=" - >=kde-frameworks/kcmutils-${KFMIN}:5 - virtual/pkgconfig -" - -PATCHES=( - "${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # downstream patch -) - -src_prepare() { - ecm_src_prepare - - if ! use ibus; then - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ - -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 - fi -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - $(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 -} - -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 -} diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild new file mode 100644 index 000000000000..554f71e30f2c --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.26.5-r2.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.99.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +inherit ecm plasma.kde.org optfeature + +DESCRIPTION="KDE Plasma desktop" +XORGHDRS="${PN}-override-include-dirs-2" +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" + +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +COMMON_DEPEND=" + dev-libs/wayland + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/attica-${KFMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kded-${KFMIN}:5 + >=kde-frameworks/kdelibs4support-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + >=kde-plasma/kwin-${PVCUT}:5 + >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 + >=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?] + >=media-libs/phonon-4.11.0 + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXi + 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 + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) + kaccounts? ( + kde-apps/kaccounts-integration:5 + net-libs/accounts-qt + ) + 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 + dev-libs/boost + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + !=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/oxygen-${PVCUT}:5 + sys-apps/util-linux + x11-apps/setxkbmap + x11-misc/xdg-user-dirs + kaccounts? ( net-libs/signon-oauth2 ) + screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 ) +" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:5 + virtual/pkgconfig +" + +PATCHES=( + "${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # downstream patch + "${FILESDIR}"/${P}-missing-kpackage-{1,2}.patch +) + +src_prepare() { + ecm_src_prepare + + if ! use ibus; then + sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ + -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 + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged + -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + $(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 +} + +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 +} -- cgit v1.2.3-65-gdbad