diff options
Diffstat (limited to 'kde-plasma')
| -rw-r--r-- | kde-plasma/Manifest.gz | bin | 11941 -> 11942 bytes | |||
| -rw-r--r-- | kde-plasma/plasma-workspace/Manifest | 3 | ||||
| -rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-multiscreen-crash.patch | 123 | ||||
| -rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-notification-padding.patch | 41 | ||||
| -rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-6.3.4-r1.ebuild | 219 |
5 files changed, 386 insertions, 0 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz Binary files differindex ce9a3c199978..4c60cc4e8824 100644 --- a/kde-plasma/Manifest.gz +++ b/kde-plasma/Manifest.gz diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 4d46fba3cf94..e8d08e7b20a3 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -2,8 +2,11 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099c AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd AUX plasma-workspace-6.2.5-cameraindicator-optional.patch 4695 BLAKE2B 4b952b854b0116cabb4b30af1e15b3874619885586d16c4409b61954db64b357d2026e17f0253a2adf37359d50143e88747e59be99abb10d0934e3461ccc9623 SHA512 0093aa8196b9110f9d230b1f0786f770183eef2c722e93b1a0c40293b6638541de5e9b10dbafff2fdd12316bf75b4519e550101a34b0defec0681bd9510abf7a +AUX plasma-workspace-6.3.4-multiscreen-crash.patch 5182 BLAKE2B 16407daeb68f85de12f32b39a0312239a4651948b62995cb83feb734fdb58eee48e15cdc3c439ecde40f7eb89eb76908c5b42ccf2a3be2bdac98d12b61ba8012 SHA512 8e83f46679d346714da2f4598cc8795fdc75663eb70b45464a3d048ce5bb711baa5f6488665713d882bef994cfb00b127015b47d752d05ed63db8e8919116958 +AUX plasma-workspace-6.3.4-notification-padding.patch 1693 BLAKE2B 1cf27a4ac12fd440a3d6a05351b813d7af90002fa447933210040a179ac13fad1f3ab61d26a4296fb9ae75837387b5bf442de91f64891aa8d705d75b9d2625fb SHA512 ef66d75e8c45a4271cdf2a0e9edabe5e17cb43239d1c702246c3d0ec4d823adfce83c615b7f9455fc49e81cca9809951d0f0c930f31601d6427785388e8c530c DIST plasma-workspace-6.2.5.tar.xz 19136676 BLAKE2B 38d211247cfeee10df6f4fff5cbef91d9a7daa760033e29743e1c78577baf876c8c416d0a84e45efb5d6bab007965b3cd8c6d1feec7749bd4dd8cb24df4a71ee SHA512 228d183c9561cbf3d5630582b80c687868eaf420310010bd417de0e9f0ababaa4767805c1ce84f4eb3539ea32bfe6c2849b70d7ddd133f6095ab71f94f854dea DIST plasma-workspace-6.3.4.tar.xz 19153368 BLAKE2B 2f3e09a1698af00c24fd143b5c54d45ba2249e72db5fab279e260305026189c75983e08befae2b37f5a488bc3cd4cf89e07b3257ad5242fe26196c64a71982ce SHA512 62fc334b03796bb87fdda627ad2b4914c0832f43a93e9ae82c694c5c08d1373b4a0a5cbe3b421c2bda2fd36bf0ae52131143d9049c13be8c6c098599b7b4b226 EBUILD plasma-workspace-6.2.5.ebuild 7068 BLAKE2B e695e6d10125ebdcea67eb37a7c60351b9b73a7c67bb608bcc5428e6016ffe9c104cdea5129ce6bae9f80d9fa3ad203b7a3a59fcdf24c8f304a91e68485ae768 SHA512 3c53651f9f86e530497c4631f5f9a685a86bc62ec6fcd2cf5ace0d5750714d4bad799abb244af4b72cca1115bc76f7586520c6d4d5cd9a794a8eb67d79f555ad +EBUILD plasma-workspace-6.3.4-r1.ebuild 6924 BLAKE2B 51412e1ae73e1b5c6fe1655f01c6dca198b27af9801ec78b0f14f68d25eb4ea9d8e347057ca87a5702ffbd65d09e8fc0d01ab9c6e8d720404f1ba266c2b3f462 SHA512 30d438e041267b7f12aeb41ce2a1be6c9298432465514a16f7786b264b018fefdd5b7963445ae8369c0bb4e05fd685c1f158d77ae89dbd65659a123cc8e9e7f0 EBUILD plasma-workspace-6.3.4.ebuild 6791 BLAKE2B 75fa45d043e319a4eb39079e2bb1537cc6eef959ea7660a065215f0bdb49b414f900ead3d267f3ebd9f3912f0ded77ebac73005d26e9905d0e217b67aa231e4e SHA512 709e7c392e1dca2ccbf363e951ffeba98b42c63eda57f670983239daa1efc2a793dd53f33864e921d376aac14e7ae10a6ea86af95f8b59035855b5dfd5e7357c MISC metadata.xml 1026 BLAKE2B 49c2bc5fdc752caf8f45ce982633df0542a008ba1ef0cc99d32b64d6cd73c237d9c98484cac16fa32210156a080e17ad365c2d4eeb81cd3e9a7dc2119b1f7395 SHA512 4cdf77f6be4ce18148936e2a7012b86c70cdcc9de8b99455b3db65a4a52990eb604082ca098cdaee5fe6762bb9d138861f687f8d5fbedb3f60eef7c7be3a42cb diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-multiscreen-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-multiscreen-crash.patch new file mode 100644 index 000000000000..8ba7e6e3cd1b --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-multiscreen-crash.patch @@ -0,0 +1,123 @@ +From 580a2ed1f41640e14adf57c5c7921cdadbdbe14d Mon Sep 17 00:00:00 2001 +From: Marco Martin <notmart@gmail.com> +Date: Wed, 2 Apr 2025 08:28:05 +0000 +Subject: [PATCH] multiscreen: fix an incorrect assert in screenInvariants + +Since OutputOrderWatcher at the time of screen removing can temporarly contain a dead entry, we can't check on screenInvariants that the count is the same as the real screen count, but check instead that outputorderwatcher doesn't have missing entries instead + +BUG:494616 + + +(cherry picked from commit 285cfe150efd941eed62b06604db0709977540c9) + +Co-authored-by: Marco Martin <notmart@gmail.com> +--- + shell/autotests/screenpooltest.cpp | 60 ++++++++++++++++++++++++++++++ + shell/screenpool.cpp | 6 ++- + 2 files changed, 65 insertions(+), 1 deletion(-) + +diff --git a/shell/autotests/screenpooltest.cpp b/shell/autotests/screenpooltest.cpp +index bbb984a8738..033844e6195 100644 +--- a/shell/autotests/screenpooltest.cpp ++++ b/shell/autotests/screenpooltest.cpp +@@ -41,6 +41,7 @@ private Q_SLOTS: + void testLastScreenRemoval(); + void testFakeToRealScreen(); + void testFakeOutputInitially(); ++ void testReorderRemoveRace(); + + private: + ScreenPool *m_screenPool; +@@ -459,6 +460,65 @@ void ScreenPoolTest::testFakeOutputInitially() + QCOMPARE(screenPool.idForScreen(newScreen), 0); + } + ++void ScreenPoolTest::testReorderRemoveRace() ++{ ++ QSignalSpy addedSpy(qGuiApp, SIGNAL(screenAdded(QScreen *))); ++ QSignalSpy orderChangeSpy(m_screenPool, &ScreenPool::screenOrderChanged); ++ QSignalSpy firstScreenResizedSpy(qGuiApp->screens()[0], &QScreen::geometryChanged); ++ ++ // Add a new output ++ exec([this] { ++ OutputData data; ++ data.mode.resolution = {1920, 1080}; ++ data.position = {1920, 0}; ++ data.physicalSize = data.mode.physicalSizeForDpi(96); ++ // NOTE: assumes that when a screen is added it will already have the final geometry ++ auto *out = add<Output>(data); ++ auto *xdgOut = xdgOutput(out); ++ xdgOut->m_name = QStringLiteral("WL-2"); ++ outputOrder()->setList({u"WL-1"_s, u"WL-2"_s}); ++ }); ++ ++ QVERIFY(orderChangeSpy.wait()); ++ ++ QCOMPARE(orderChangeSpy.size(), 1); ++ QCOMPARE(QGuiApplication::screens().size(), 2); ++ QCOMPARE(m_screenPool->screenOrder().size(), 2); ++ QCOMPARE(addedSpy.size(), 1); ++ ++ QScreen *newScreen = addedSpy.takeFirst().at(0).value<QScreen *>(); ++ QCOMPARE(newScreen->name(), QStringLiteral("WL-2")); ++ QCOMPARE(newScreen->geometry(), QRect(1920, 0, 1920, 1080)); ++ // Check mapping ++ QCOMPARE(m_screenPool->idForScreen(newScreen), 1); ++ QCOMPARE(m_screenPool->screenForId(1)->name(), QStringLiteral("WL-2")); ++ ++ exec([this] { ++ // BUG 494616: ++ // When there are those 3 things happening in quick order ++ // * Setting the order ++ // * resizing an output ++ // * removing another output ++ // we used to get an inconsistent state in OutputOrderWatcher ++ // where the removed output is *not* removed from outputOrder ++ outputOrder()->setList({u"WL-2"_s, u"WL-1"_s}); ++ auto *out = output(0); ++ auto *xdgOut = xdgOutput(output(0)); ++ xdgOut->sendLogicalSize(QSize(1024, 600)); ++ remove(output(1)); ++ out->m_data.physicalSize = QSize(1024, 600); ++ out->sendGeometry(); ++ out->sendDone(); ++ }); ++ ++ QVERIFY(orderChangeSpy.wait()); ++ QTRY_COMPARE(firstScreenResizedSpy.size(), 1); ++ QCOMPARE(m_screenPool->screenOrder().size(), 1); ++ QCOMPARE(m_screenPool->screenOrder().first()->name(), QStringLiteral("WL-1")); ++ QCOMPARE(qApp->screens().size(), 1); ++ QCOMPARE(qApp->screens().first()->geometry(), QRect(0, 0, 1024, 600)); ++} ++ + QCOMPOSITOR_TEST_MAIN(ScreenPoolTest) + + #include "screenpooltest.moc" +diff --git a/shell/screenpool.cpp b/shell/screenpool.cpp +index 8d9c92b0d80..3c33dab8e9d 100644 +--- a/shell/screenpool.cpp ++++ b/shell/screenpool.cpp +@@ -282,6 +282,7 @@ void ScreenPool::handleScreenRemoved(QScreen *screen) + void ScreenPool::handleOutputOrderChanged(const QStringList &newOrder) + { + qCDebug(SCREENPOOL) << "handleOutputOrderChanged" << newOrder; ++ + QHash<QString, QScreen *> connMap; + for (auto s : qApp->screens()) { + connMap[s->name()] = s; +@@ -369,7 +370,10 @@ void ScreenPool::screenInvariants() + // QScreen bookeeping integrity + auto allScreens = qGuiApp->screens(); + // Do we actually track every screen? +- Q_ASSERT_X((m_availableScreens.count() + m_redundantScreens.count()) == m_outputOrderWatcher->outputOrder().count(), ++ // (m_availableScreens.count() + m_redundantScreens.count() must be less or equal ++ // to the number of screens tracked by OutputOrderWatcher, because it can contain ++ // for a little while a screen that has just been removed ++ Q_ASSERT_X((m_availableScreens.count() + m_redundantScreens.count()) <= m_outputOrderWatcher->outputOrder().count(), + Q_FUNC_INFO, + qUtf8Printable(debugMessage())); // https://crash-reports.kde.org/organizations/kde/issues/5249/ + Q_ASSERT_X(allScreens.count() == m_sizeSortedScreens.count(), +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-notification-padding.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-notification-padding.patch new file mode 100644 index 000000000000..50617c537dc2 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-notification-padding.patch @@ -0,0 +1,41 @@ +From 47d502353720004fa2d0e7b0065994b75b3e0ded Mon Sep 17 00:00:00 2001 +From: Nate Graham <nate@kde.org> +Date: Wed, 2 Apr 2025 20:57:09 +0000 +Subject: [PATCH] applets/notifications: improve paddings again + +Zero top padding is fine when there's only a summary label, but looks +bad when there's body text, an icon, or both. Correct that. + + +(cherry picked from commit 53b6289f84094d91745b79c3bc902e7f80f235ef) + +Co-authored-by: Nate Graham <nate@kde.org> +--- + .../package/contents/ui/delegates/DelegatePopup.qml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml b/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml +index 2038f49de50..e22a8322196 100644 +--- a/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml ++++ b/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml +@@ -93,6 +93,8 @@ BaseDelegate { + + Components.Summary { + id: summary ++ // Base layout intentionally has no row spacing, so add top padding here when needed ++ Layout.topMargin: delegateRoot.hasBodyText || icon.visible ? Kirigami.Units.smallSpacing : 0 + Layout.fillWidth: true + Layout.row: 2 + Layout.column: delegateRoot.__firstColumn +@@ -108,7 +110,7 @@ BaseDelegate { + + Components.Icon { + id: icon +- // We removed the row spacing from the base layout, so re-add it just here ++ // Base layout intentionally has no row spacing, so add top padding here + Layout.topMargin: Kirigami.Units.smallSpacing + Layout.row: 2 + Layout.column: delegateRoot.__firstColumn + 1 +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.3.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.3.4-r1.ebuild new file mode 100644 index 000000000000..6a613c749915 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-6.3.4-r1.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=6.10.0 +QTMIN=6.8.1 +inherit ecm plasma.kde.org xdg + +DESCRIPTION="KDE Plasma workspace" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="appstream +calendar +fontconfig networkmanager +policykit screencast ++semantic-desktop systemd telemetry +wallpaper-metadata" + +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +# slot op: various private QtWaylandClient headers +COMMON_DEPEND=" + dev-libs/icu:= + >=dev-libs/wayland-1.15 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,opengl,sql,sqlite,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtpositioning-${QTMIN}:6 + >=dev-qt/qtshadertools-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6= + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcolorscheme-${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/kdeclarative-${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/kidletime-${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/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/ktexteditor-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kunitconversion-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/prison-${KFMIN}:6[qml] + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/breeze-${KDE_CATV}:6 + >=kde-plasma/kscreenlocker-${KDE_CATV}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/kwin-${KDE_CATV}:6 + >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 + media-libs/libcanberra + >=media-libs/phonon-4.12.0[qt6(+)] + sci-libs/libqalculate:= + sys-apps/dbus + sys-libs/zlib + virtual/libudev:= + 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 + appstream? ( >=dev-libs/appstream-1[qt6] ) + calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 ) + fontconfig? ( + media-libs/fontconfig + x11-libs/libXft + x11-libs/xcb-util-image + ) + policykit? ( virtual/libcrypt:= ) + networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) + systemd? ( sys-apps/systemd:= ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) + wallpaper-metadata? ( kde-apps/libkexiv2:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.16.0 + dev-libs/qcoro + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) + test? ( screencast? ( >=media-video/pipewire-0.3:* ) ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/libkworkspace:5 + !<kde-plasma/plasma-desktop-5.27.0:5 + !<kde-plasma/xdg-desktop-portal-kde-6.1.90 + !kde-plasma/xembed-sni-proxy:* + app-text/iso-codes + dev-libs/kirigami-addons:6 + >=dev-qt/qttools-${QTMIN}:*[qdbus] + kde-apps/kio-extras:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-plasma/kactivitymanagerd-${KDE_CATV}:6 + >=kde-plasma/kdesu-gui-${KDE_CATV}:* + >=kde-plasma/milou-${KDE_CATV}:6 + >=kde-plasma/plasma-integration-${KDE_CATV}:6 + >=kde-plasma/plasma-login-sessions-${KDE_CATV}:6 + sys-apps/dbus + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + policykit? ( sys-apps/accountsservice ) + screencast? ( >=media-video/pipewire-0.3:* ) +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + >=dev-util/wayland-scanner-1.19.0 + >=kde-frameworks/kcmutils-${KFMIN}:6 + virtual/pkgconfig + test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 + # in Plasma/6.3 branch: + "${FILESDIR}/${P}-multiscreen-crash.patch" # KDE-bug 494616 + "${FILESDIR}/${P}-notification-padding.patch" +) + +src_prepare() { + ecm_src_prepare + + cmake_comment_add_subdirectory login-sessions + + if ! use policykit; then + cmake_run_in kcms cmake_comment_add_subdirectory users + fi + + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if ! use systemd; then + sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_X11=ON # TODO: broken upstream, fix it if you can + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged + -DGLIBC_LOCALE_GEN=OFF + -DGLIBC_LOCALE_PREGENERATED=$(usex elibc_glibc) + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF6Holidays) + $(cmake_use_find_package fontconfig Fontconfig) + $(cmake_use_find_package networkmanager KF6NetworkManagerQt) + -DBUILD_CAMERAINDICATOR=$(usex screencast) + $(cmake_use_find_package semantic-desktop KF6Baloo) + $(cmake_use_find_package telemetry KF6UserFeedback) + $(cmake_use_find_package wallpaper-metadata KExiv2Qt6) + ) + + 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 () { + xdg_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" +} |