diff options
Diffstat (limited to 'kde-plasma/plasma-workspace')
3 files changed, 265 insertions, 0 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index a4c741a09d83..25bf7f67b8df 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -4,6 +4,7 @@ AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd AUX plasma-workspace-5.24.80-split-libkworkspace.patch 1175 BLAKE2B 74dabcc26da223fb46bd97c2d07b5913ad51ab85a20062835dbb80b2a555129029996f99129ea9d99af76399722a404cf9baabbea48de4ab4392f068539f3c9f SHA512 95a63a106242449cdf605f943e794e07834b5d1e8fff2ad4e6a025fd68cc20fc6725ec0f0389898c4fe8c87587c7a51381b343cf116b2ff812236f0fe95ed314 AUX plasma-workspace-5.25.5-delay-ksplash-until-after-env-setup.patch 2718 BLAKE2B 92a97286860d97a64f6bc19bfe0a1e42a85d594a7a9bc7d879ed08a92b3a0a1e03030c6c06315929534c51116e04c00a35330f0642e6fdd22dbb32353b9b58bd SHA512 2ec73f0c30a1bf2d73a4f63b76551bbbabff87462077e7137c699b0d65d6e5b52100d1bf66b279ce5cac8f52f5c54612a9a51e7b7ced91d09740cb8f79cc9497 +AUX plasma-workspace-5.25.5-fix-setpassword.patch 1528 BLAKE2B af3c5aec87890e840848988e9528bfce639ebe8d0a1ad0919f4d75c0d798532d092aec1cc445e0ae85a71519c2eb1fbef7bd94b8c624cdb363885c2fd662a0ed SHA512 f72eec7b461d3f02c3548c5c754123cd70f6c0191cffff693c0f4c6882d43cd2754dd4ec1cd8b6c3fb190b37990aa0efe6c21828550fae4dd9d37db80f6b786a AUX plasma-workspace-5.25.5-fonts-honor-and-present-system-defaults.patch 1920 BLAKE2B 0bf6253ad9b2d9fa83ddc04cf804311053ec310f6d5bed67a0b67f542957294da697dcf402c7b46984631d4a0aa830f52c8c90a753351fdb4dc25b1170c0f201 SHA512 8891594b6895dfc46968ece1d4dfb69b6eb2f9b6500cc72bcec1d1e7600a3b5225b84af8e7408e648908e7ed3022d271322bf983450f5f9af5f0bb249b5c1541 AUX plasma-workspace-5.25.5-prevent-panel-go-out-of-screen.patch 992 BLAKE2B bace8863e329cd23caa6770fe47d716701adc0245b437606545d0a286c48f54325b35a9ea70cc267cc1533f48de59fe3d4fe0a92c3ef6699cc24dc33276959d5 SHA512 1c3196b5309b234163e6c9dfca3788a958791f6b81a4b69e40ff1fbe60676875615dd85d6a769f94963af35028d2e8fdbf819d89c2bf4f16cf9ca070fd7a78be AUX plasma-workspace-5.25.5-widgetexplorer-recurse-containments.patch 1438 BLAKE2B d33271c8fafe0e7b14205009d541f6d7bba98e405a47f0d5c85fc60028d093a4e8b135dac122a18bc78288ed43d489adef6e66ff53e4ddc2098f74a1525126e6 SHA512 7f623ca5d8a184cb31af5039e49ac0a8a6a35cc9ada2959d2ae38fb2e4e1aafc44d3e684740a9d0c97b00e92af858b2ab374c2d5c793b17dac2e4808239dd0e0 @@ -11,4 +12,5 @@ DIST plasma-workspace-5.24.6.tar.xz 18500752 BLAKE2B 1e469e91e8f1828f0b819aaa03f DIST plasma-workspace-5.25.5.tar.xz 18638932 BLAKE2B f83aabf84b775c0bf9d1e60db03f94400e3363fa8f45767bdc471706682cda7323fae4948cffa156188cc7ed2d30d05349a385dd370ef941c16464ddddf8fa01 SHA512 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb EBUILD plasma-workspace-5.24.6.ebuild 6504 BLAKE2B 70a8668b7062c419bc5b671f0e0359c590f5a340d2289b0688d24b3f5dac135ea3788863873a304c3c43ee38576424a29fe0dfe2ba60629cd63669b9606c379f SHA512 9d611f6ae062daac80f4d4f9fdeb8535ac5f567b9215797a4eba33e23fd808c3c61ab8b3956a4199e6b46635f766cd7f9bdb7cf20edb4907bb37746f5e54b51e EBUILD plasma-workspace-5.25.5-r3.ebuild 6955 BLAKE2B 4beeaeaf621f68f8157c78a4e576333a60406e2ab8759d597f964de1e0e26c63d1fc0ffbaab9c7e4f6a889ed43316a6fac079ceb40abe32ed67a0beeaa82b1e7 SHA512 655d9656974c138906ad15cacb67aa77f3c41386a490c1f02d77d2b727c29509162844c1ca2cb761fad27607d3e837e06d81a943b08c641960d2691bce7f9d73 +EBUILD plasma-workspace-5.25.5-r4.ebuild 7037 BLAKE2B 9aac5cb251c4775e0adbbefbb0e49ef1e76fee1a399a545436ec37f85c7de34121b025c1d9957fc75ff7dc1a87da07c94fd212c5796d0c3a15586794c86d8a1c SHA512 b2708c5093d4b047dd39a8508c5ce8c106f459fe35d82df978f21ae1d5b1ef641c9e57b9940b20fd2b17e8a48e0b7f9ce8a337cb8788b62c94843770d765e664 MISC metadata.xml 726 BLAKE2B ee1a0b82d5852d7c68784107563ccf0245d26cfcc1c2f2bb4cef243b7ab9a0925c0cbe848f387ebe7928ea68cb50c9c267203c00535b716bdb1c7c56eb4cbcff SHA512 f7ffe99faf800f559dcd966c7f3f72523484a851870fcf9cead18b878f1089bc33a6d20fc682c2c45db012b1e908618bdfdb4590816554245c11dbb9baf10100 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch new file mode 100644 index 000000000000..7351b8808819 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.25.5-fix-setpassword.patch @@ -0,0 +1,39 @@ +From 84dcfc45b9a354827b9bbf6ae58902d04e8fe915 Mon Sep 17 00:00:00 2001 +From: Marco Martin <notmart@gmail.com> +Date: Wed, 28 Sep 2022 11:33:33 +0200 +Subject: [PATCH] set setInteractiveAuthorizationAllowed on SetPassword call + +is important that the setpasswod call uses interactive authorization, +otherwise will be denied, unless the user had been modified beforehand +so an authorization was already granted + +BUG:459309 +--- + kcms/users/src/user.cpp | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/kcms/users/src/user.cpp b/kcms/users/src/user.cpp +index 020ebee097..87745582c5 100644 +--- a/kcms/users/src/user.cpp ++++ b/kcms/users/src/user.cpp +@@ -217,9 +217,14 @@ void User::setPassword(const QString &password) + { + // Blocking because we need to wait for the password to be changed before we + // can ask the user about also possibly changing their KWallet password +- auto invocation = m_dbusIface->SetPassword(saltPassword(password), QString()); +- invocation.waitForFinished(); +- if (!invocation.isError()) { ++ ++ auto mc = QDBusMessage::createMethodCall(m_dbusIface->service(), m_dbusIface->path(), m_dbusIface->interface(), "SetPassword"); ++ mc.setArguments({saltPassword(password), QString()}); ++ mc.setInteractiveAuthorizationAllowed(true); ++ auto message = QDBusConnection::systemBus().call(mc); ++ ++ // Not an error or invalid message ++ if (message.type() == QDBusMessage::ReplyMessage) { + Q_EMIT passwordSuccessfullyChanged(); + } + } +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild new file mode 100644 index 000000000000..dbb6d6add84f --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.25.5-r4.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=5.95.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.5 +VIRTUALX_REQUIRED="test" +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma workspace" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="appstream +calendar +fontconfig geolocation gps +policykit +screencast +semantic-desktop telemetry" + +REQUIRED_USE="gps? ( geolocation )" +RESTRICT="test" + +# slot op: various private QtWaylandClient headers +COMMON_DEPEND=" + dev-libs/icu:= + >=dev-libs/wayland-1.15 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput] + >=dev-qt/qtnetwork-${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/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/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/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kinit-${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/kpeople-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktexteditor-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kunitconversion-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/prison-${KFMIN}:5[qml] + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwin-${PVCUT}:5 + >=kde-plasma/layer-shell-qt-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5 + >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 + >=media-libs/phonon-4.11.0 + sci-libs/libqalculate:= + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXtst + x11-libs/xcb-util + x11-libs/xcb-util-image + appstream? ( dev-libs/appstream[qt5] ) + calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) + fontconfig? ( + >=dev-qt/qtprintsupport-${QTMIN}:5 + media-libs/fontconfig + x11-libs/libXft + x11-libs/xcb-util-image + ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) + gps? ( sci-geosciences/gpsd ) + policykit? ( virtual/libcrypt:= ) + screencast? ( + >=dev-qt/qtgui-${QTMIN}:5=[egl] + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-util/wayland-scanner-1.19.0 + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) + test? ( >=dev-libs/wayland-protocols-1.24 ) +" +RDEPEND="${COMMON_DEPEND} + app-text/iso-codes + >=dev-qt/qdbus-${QTMIN}:* + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtpaths-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + kde-apps/kio-extras:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/milou-${PVCUT}:5 + >=kde-plasma/plasma-integration-${PVCUT}:5 + sys-apps/dbus + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + !<kde-plasma/breeze-5.22.90:5 + !<kde-plasma/plasma-desktop-5.23.90:5 + policykit? ( sys-apps/accountsservice ) +" +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + virtual/pkgconfig +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" + +PATCHES=( + "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream + "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 + "${FILESDIR}/${P}-widgetexplorer-recurse-containments.patch" # https://mail.kde.org/pipermail/distributions/2022-September/001287.html + "${FILESDIR}/${P}-delay-ksplash-until-after-env-setup.patch" # KDE-bug 458865 w/ Qt 5.15.6 + "${FILESDIR}/${P}-fonts-honor-and-present-system-defaults.patch" # KDE-bug 416140 + "${FILESDIR}/${P}-prevent-panel-go-out-of-screen.patch" # git master and Plasma/5.24 branch double revert + "${FILESDIR}/${P}-fix-setpassword.patch" # Plasma/5.25 branch, KDE-bug 459309 +) + +src_prepare() { + ecm_src_prepare + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + fi + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if use geolocation; then + use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ + -i dataengines/geolocation/CMakeLists.txt || die + fi + + if ! use policykit; then + cmake_run_in kcms cmake_comment_add_subdirectory users + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_xembed-sni-proxy=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF5Holidays) + $(cmake_use_find_package fontconfig Fontconfig) + $(cmake_use_find_package geolocation KF5NetworkManagerQt) + $(cmake_use_find_package semantic-desktop KF5Baloo) + $(cmake_use_find_package telemetry KUserFeedback) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # default startup and shutdown scripts + insinto /etc/xdg/plasma-workspace/env + doins "${FILESDIR}"/10-agent-startup.sh + + insinto /etc/xdg/plasma-workspace/shutdown + doins "${FILESDIR}"/10-agent-shutdown.sh + fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh +} + +pkg_postinst () { + ecm_pkg_postinst + + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," + elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" + elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" +} |