From 44cec61076bf2bbb3cea1fc89943dd6818a5acc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 6 Jun 2024 00:07:58 +0100 Subject: gentoo auto-resync : 06:06:2024 - 00:07:57 --- kde-plasma/Manifest.gz | Bin 11485 -> 11489 bytes kde-plasma/plasma-workspace/Manifest | 8 +- ...e-5.27.11.1-fix-writing-iceauthority-file.patch | 66 ++++++ .../plasma-workspace-5.27.11.1-r1.ebuild | 234 +++++++++++++++++++++ .../plasma-workspace-5.27.11.1.ebuild | 2 +- .../plasma-workspace-6.0.90-r1.ebuild | 232 -------------------- .../plasma-workspace-6.0.90-r2.ebuild | 232 ++++++++++++++++++++ 7 files changed, 538 insertions(+), 236 deletions(-) create mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r2.ebuild (limited to 'kde-plasma') diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz index 92c947b82b7b..81f97dc4a3d0 100644 Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 0aef5977b2bd..763ecf95574f 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -2,10 +2,12 @@ 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-5.24.80-split-libkworkspace.patch 1175 BLAKE2B 74dabcc26da223fb46bd97c2d07b5913ad51ab85a20062835dbb80b2a555129029996f99129ea9d99af76399722a404cf9baabbea48de4ab4392f068539f3c9f SHA512 95a63a106242449cdf605f943e794e07834b5d1e8fff2ad4e6a025fd68cc20fc6725ec0f0389898c4fe8c87587c7a51381b343cf116b2ff812236f0fe95ed314 +AUX plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch 2591 BLAKE2B c901b06d037750accab60f8edbd139578da1ed6514da8d49192aa05682c4b2a795663723f870519dbf15aada6367415e75030d0ec8754af54cb17a4d7823a11f SHA512 70b2e76a4b88586b3efb78f7833bcd72a71d2210023e5451d5c9f911c5ba5e8ec8be39c63d1765dd93842f5c0916427d1629d88205fba6d342a8a4aabfe31544 DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006 DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 -DIST plasma-workspace-6.0.90_p20240601-58ced80a.tar.gz 26020494 BLAKE2B f58ea1856d8697f5d9cd4bbd7b8d0d39a1138f1a921d206ba321bf735af797b2a1115970b8143d563c6e1ef2d75ff14612e8126d99de91272d2a55c7880e61c2 SHA512 4e7fa32ee6d182c34988b3ba23f7bd9a478804617f5cfac95fbb2c9c775e7c36d4f8f7a5913ac2cd1ad6de2b28255effef282faf853e946e759188ea66ac2903 -EBUILD plasma-workspace-5.27.11.1.ebuild 6967 BLAKE2B b5d9a3c8601222e0e9a7dfd1ca1f97e20fe81fc445b9942fd47471d7c895864279d66938ff7ac494569204dc9d11cb58308a8b8e302970180cddbbb10081daa0 SHA512 40c25e977d4ca76bdc5d2e1f5e66e158ebc068384487afd739fef8eec057feacb3a29d557d4ac9c79eba19f88c1a043d05a13fb86e57802f2a390ac2d61c84d4 +DIST plasma-workspace-6.0.90-7a700862.tar.gz 26019401 BLAKE2B b55350c62efc640e50f2d573b342d2db8a35651b0b4ae532aa87877e686d45e24042d93c936abe63e6abd14a54d66ddf67c58ac7534b58e4cb40064ac98e67aa SHA512 9896e161469f20ab06559b36cc0b53c1f73dd06dd3d0be0b1c7f3ff0ce239ca485f8bbcbffa73236b9027648b67f949602a3e0514bc5b449e07ebc01ea9d6738 +EBUILD plasma-workspace-5.27.11.1-r1.ebuild 7052 BLAKE2B e856954d76b596d2ef3071c4794589f4c31ae699a55867cf4ab62009d014988c28dd4f9fd17dc55d4f129ecec33612d1e2e456088c6d8a567bb0afd4a068d84d SHA512 e2a0f453dd9c58ae0bcb234f51a8523f9965dac759d803a4f4df8bf390ebe65b7cb3fb7ec76458a711067e0b5710da9ad86218e47664815e9e5892087410a01f +EBUILD plasma-workspace-5.27.11.1.ebuild 6966 BLAKE2B 2e528c31a6fa9875fa81f29c72800efd708e8fee24e3a2e237101c752df38c0cd6c133c16a7ab3c50ea831b7ed545a4be7c9249a519785d7cf1f507311f531f5 SHA512 6d6cfa97d0363e80a72e6e16d0f357a484b8b83b6cfdbad9b03af37958a23c2e67227d48f87e270d7fae3ba6a2f70dac6e6649ee080a19cc3842f16c3dd4f416 EBUILD plasma-workspace-5.27.11.ebuild 6964 BLAKE2B b0f634c84abf8dbe7067ba95ea4a5af67b729e4b980da844ff4f22740268f06a617a0621d3ec9e2f5a47069daec2f1f0b6b68eb160f8388a806645d59417be5b SHA512 cb4f7894270f1162ba15e5a96ea9e5e2393c436d86898f5de7f6c01255a4998efeb9f7b7ebe6095efcee42030c9da5fa75714cb5099abe477542832144e2f090 -EBUILD plasma-workspace-6.0.90-r1.ebuild 7041 BLAKE2B fd77ea37ff2f0cda61ce9aa81ac34bb8083af5b090871501c074e9b1c44e3d77cded9dc1932026a400313572683bb4eb5989d018ff1544bb70a25a5627dabe24 SHA512 9fcec6d80744eb1054c00054c2a0dd7c6d6239848b66e242c4c6c530583061663f3f0e5eda5f0a0d57c0304cfff126a6d4e9798aba18b08d035bc5f28ad68a72 +EBUILD plasma-workspace-6.0.90-r2.ebuild 7031 BLAKE2B 97e148ce89b63318cda7c6429d600f2876df2e01973616b4eacb1e9c27e9c534de81d9912fb6a82008f4293d57de6ba48641ffc1eddf6aef0f5d753cb741daea SHA512 92633d8ac1c53eab5ee8ecb05210979e72e54a5776d23d4139b76db2786d2c84eff3a505e6c15eaa12d28afe75184a274b6766a87592bfaa64ba0649f44dfc6e MISC metadata.xml 959 BLAKE2B 6513ae79e0cf24efd0bd33a16708950d36393770b51ea752c4c8c6e7ec63c7675dcf5e96dcfbb07d527ba910462b7c23afe35c55b4643ec69d1175660b245478 SHA512 8af28473216b00d4273be4bbb5d93adf8a4db79c46d9e97bd8b2822fa3920e8fc789042669bc93e6e9a6fa1c864a49fc23887be8456ea122a6d8b09e384dffbd diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch new file mode 100644 index 000000000000..ed1b67bbd85f --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch @@ -0,0 +1,66 @@ +From 1181acfe30557d6646511df8d98d82589878a570 Mon Sep 17 00:00:00 2001 +From: Fushan Wen +Date: Tue, 4 Jun 2024 12:18:11 +0000 +Subject: [PATCH] Fix writing ICEAuthority file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 9398f6cf8933055b31506ba155aef2fc2b3561d7 "Remove iceauth +dependency" introduced two bugs: + +1) "fp" is never closed, so the generated auth data stays buffered in + memory for some indeterminate time and the file stays empty on disk. + This completely breaks authentication and thus also session restore. + +2) Checking the return value of IceWriteAuthFileEntry() is inverted (the + function returns non-zero on success), so warnings are printed iff + everything goes well. + +BUG: 487912 + + +(cherry picked from commit 0dcf34458d99b07a3d9054ae0c86c656e0dfa7aa) + +Co-authored-by: Tomáš Trnka +--- + ksmserver/server.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp +index f88de40dba4..bba6b13ffae 100644 +--- a/ksmserver/server.cpp ++++ b/ksmserver/server.cpp +@@ -333,7 +333,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry * + file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1"); + file_entry->auth_data = strdup((*authDataEntries)[i].auth_data); + file_entry->auth_data_length = MAGIC_COOKIE_LEN; +- if (IceWriteAuthFileEntry(fp, file_entry) != 0) { ++ if (IceWriteAuthFileEntry(fp, file_entry) == 0) { + qWarning("Failed to write ice auth file entry"); + } + IceFreeAuthFileEntry(file_entry); +@@ -357,7 +357,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry * + file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1"); + file_entry->auth_data = strdup((*authDataEntries)[i + 1].auth_data); + file_entry->auth_data_length = MAGIC_COOKIE_LEN; +- if (IceWriteAuthFileEntry(fp, file_entry) != 0) { ++ if (IceWriteAuthFileEntry(fp, file_entry) == 0) { + qWarning("Failed to write xsmp ice auth file entry"); + } + IceFreeAuthFileEntry(file_entry); +@@ -366,6 +366,11 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry * + IceSetPaAuthData(2, &(*authDataEntries)[i]); + } + ++ if (fclose(fp) != 0) { ++ qWarning() << "Could not close ICEAuthority file"; ++ return 0; ++ } ++ + return (1); + } + +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild new file mode 100644 index 000000000000..2f283485e222 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=5.106.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.9 +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 +wallpaper-metadata" + +REQUIRED_USE="gps? ( geolocation )" +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +# 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/karchive-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${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/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/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/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] + >=kde-frameworks/kxmlgui-${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/kwayland-${KFMIN}: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 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 + >=media-libs/phonon-4.11.0[qt5(+)] + 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 + appstream? ( =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? ( + sys-auth/polkit-qt[qt5(+)] + virtual/libcrypt:= + ) + screencast? ( + >=dev-qt/qtgui-${QTMIN}:5=[egl] + >=kde-plasma/kpipewire-${PVCUT}:5 + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) + wallpaper-metadata? ( kde-apps/libkexiv2:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-libs/wayland-protocols-1.31 + >=dev-qt/qtconcurrent-${QTMIN}:5 + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) +" +RDEPEND="${COMMON_DEPEND} + !=dev-qt/qdbus-${QTMIN}:* + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + || ( + kde-apps/kio-extras-kf5:5 + kde-apps/kio-extras:5 + ) + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/kactivitymanagerd-${PVCUT}: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 + policykit? ( sys-apps/accountsservice ) +" +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + >=dev-util/wayland-scanner-1.19.0 + >=kde-frameworks/kcmutils-${KFMIN}:5 + virtual/pkgconfig +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +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}-fix-writing-iceauthority-file.patch" # bug 933435, KDE-bug 487912 +) + +src_prepare() { + ecm_src_prepare + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + ecm_punt_bogus_dep KPipeWire + 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 + + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_xembed-sni-proxy=OFF + -DGLIBC_LOCALE_GEN=$(usex policykit) + $(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) + $(cmake_use_find_package wallpaper-metadata KF5KExiv2) + ) + + 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" +} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1.ebuild index 9c7c9a8d052f..837fa343fdba 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="KDE Plasma workspace" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry +wallpaper-metadata" diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild deleted file mode 100644 index ae655f845e87..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r1.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=6.2.0 -PVCUT=$(ver_cut 1-3) -QTMIN=6.7.1 -inherit ecm plasma.kde.org - -DESCRIPTION="KDE Plasma workspace" -SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}_p20240601-58ced80a.tar.gz" -S="${WORKDIR}/${PN}-58ced80a7b48d85b7a7743195479dc35ad1889c6" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64" -IUSE="appstream +calendar +fontconfig geolocation gps +policykit -screencast +semantic-desktop systemd telemetry +wallpaper-metadata" - -REQUIRED_USE="gps? ( geolocation )" -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,sql,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - >=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/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-${PVCUT}:6 - >=kde-plasma/kscreenlocker-${PVCUT}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/kwin-${PVCUT}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-activities-stats-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 - media-libs/libcanberra - >=media-libs/phonon-4.12.0[qt6] - sci-libs/libqalculate:= - 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 - ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) - gps? ( sci-geosciences/gpsd ) - policykit? ( - >=sys-auth/polkit-qt-0.175[qt6] - virtual/libcrypt:= - ) - screencast? ( - >=dev-qt/qtbase-${QTMIN}:6=[opengl] - >=kde-plasma/kpipewire-${PVCUT}:6 - media-libs/libglvnd - >=media-video/pipewire-0.3:= - x11-libs/libdrm - ) - 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.6.0 - dev-libs/qcoro[dbus] - >=dev-qt/qtbase-${QTMIN}:6[concurrent] - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) -" -RDEPEND="${COMMON_DEPEND} - !kde-plasma/libkworkspace:5 - !=dev-qt/qttools-${QTMIN}:*[qdbus] - kde-apps/kio-extras:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/kquickcharts-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${PVCUT}:6 - >=kde-plasma/milou-${PVCUT}:6 - >=kde-plasma/plasma-integration-${PVCUT}:6 - sys-apps/dbus - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - policykit? ( sys-apps/accountsservice ) -" -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] ) -" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" - -PATCHES=( - "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 -) - -src_prepare() { - ecm_src_prepare - - # TODO: try to get a build switch upstreamed - if ! use screencast; then - ecm_punt_bogus_dep KPipeWire - 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 - - 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 - -DGLIBC_LOCALE_GEN=$(usex policykit) - $(cmake_use_find_package appstream AppStreamQt) - $(cmake_use_find_package calendar KF6Holidays) - $(cmake_use_find_package fontconfig Fontconfig) - $(cmake_use_find_package geolocation KF6NetworkManagerQt) - $(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 () { - 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" -} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r2.ebuild new file mode 100644 index 000000000000..3a173e96dfb5 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-6.0.90-r2.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=6.2.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.1 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma workspace" +SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}-7a700862.tar.gz" +S="${WORKDIR}/${PN}-7a700862f820e6aff958ed7129b62fb2b771ac45" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="appstream +calendar +fontconfig geolocation gps +policykit +screencast +semantic-desktop systemd telemetry +wallpaper-metadata" + +REQUIRED_USE="gps? ( geolocation )" +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,sql,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=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/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-${PVCUT}:6 + >=kde-plasma/kscreenlocker-${PVCUT}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/kwin-${PVCUT}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-activities-stats-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 + media-libs/libcanberra + >=media-libs/phonon-4.12.0[qt6] + sci-libs/libqalculate:= + 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 + ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) + gps? ( sci-geosciences/gpsd ) + policykit? ( + >=sys-auth/polkit-qt-0.175[qt6] + virtual/libcrypt:= + ) + screencast? ( + >=dev-qt/qtbase-${QTMIN}:6=[opengl] + >=kde-plasma/kpipewire-${PVCUT}:6 + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + 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.6.0 + dev-libs/qcoro[dbus] + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/libkworkspace:5 + !=dev-qt/qttools-${QTMIN}:*[qdbus] + kde-apps/kio-extras:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-plasma/kactivitymanagerd-${PVCUT}:6 + >=kde-plasma/milou-${PVCUT}:6 + >=kde-plasma/plasma-integration-${PVCUT}:6 + sys-apps/dbus + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + policykit? ( sys-apps/accountsservice ) +" +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] ) +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +PATCHES=( + "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 +) + +src_prepare() { + ecm_src_prepare + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + ecm_punt_bogus_dep KPipeWire + 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 + + 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 + -DGLIBC_LOCALE_GEN=$(usex policykit) + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF6Holidays) + $(cmake_use_find_package fontconfig Fontconfig) + $(cmake_use_find_package geolocation KF6NetworkManagerQt) + $(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 () { + 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" +} -- cgit v1.2.3