From 288d9455931660abb6dfa534a78d45c7fb901477 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Apr 2025 01:34:40 +0100 Subject: gentoo auto-resync : 06:04:2025 - 01:34:40 --- kde-plasma/Manifest.gz | Bin 11942 -> 11946 bytes kde-plasma/kscreen/Manifest | 2 + ...6.3.4-kcm-fix-wrong-settings-after-revert.patch | 40 ++++ kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild | 58 ++++++ kde-plasma/plasma-workspace/Manifest | 1 - .../plasma-workspace/plasma-workspace-6.3.4.ebuild | 216 --------------------- 6 files changed, 100 insertions(+), 217 deletions(-) create mode 100644 kde-plasma/kscreen/files/kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch create mode 100644 kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-6.3.4.ebuild (limited to 'kde-plasma') diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz index 4c60cc4e8824..b5df1e5b3dca 100644 Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest index 8bbc2d6a145b..496d66f81f00 100644 --- a/kde-plasma/kscreen/Manifest +++ b/kde-plasma/kscreen/Manifest @@ -1,5 +1,7 @@ +AUX kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch 1431 BLAKE2B cc67a4288df498927c4313228edc24e01bc47f3dca6669803c674b271320150e2d9557c1c3faf8fc4e56bcff85650aaa4b40840386041930ee8e09f6a3ce6b14 SHA512 78a07e965eeb484f6f1273cb8fe6b81fb10b621f3c637fa117895a8e5cf85a70b241b5e7f82d8b6bc8bee38cadb98e21e98eafcba8082c5a658a9c707a443ea9 DIST kscreen-6.2.5.tar.xz 211884 BLAKE2B 2751d0395a436d3b8003ad2d2087a9e29dc367bfebc72f18818bbf970c9e0ceb38bb5ea36945006d9430c0804fd681743dc63b8c256193a999e062b946fa249b SHA512 ca749f9acb18ceb0531017e9d7ec6aafeced699550f75ab7bd02af13fe7e6826d1bc8149e5b650aa6066d3fe920b5bc6ed09d1f3f991f6b934bccc37aa3cf839 DIST kscreen-6.3.4.tar.xz 226552 BLAKE2B fb0a826fe812d862557a6ea2b5ac8abe5a0adfea9319eac2c78c34688617c888df4873263a60e8c01b1eb17b47b05225beca1f42d6640e00ae934db799ec13a1 SHA512 a9ea8927ad5c110f8e08101217f1069fa82dfb063df24157b87479075f1f36715f05d48217f3f85bd1674e2ade30e4d554f13b8f58233383a0b0ac3de83d4d1b EBUILD kscreen-6.2.5.ebuild 1369 BLAKE2B ff7226ee8ff6d335cf2d58130b806a8f938f5f2733202e6ec7a502727c0f9f2f67947d9ef0440589de168260f3bb957604e2921549351c9de6728b662fa00967 SHA512 de6a85d6ca40b9377e6f9598c43b7c443eed9aa224c3f5a2a090630e0d646671e2020d4c2f6cb19788e6cbafc364abdfdad5a595f287604b5061b5a00ba5220a +EBUILD kscreen-6.3.4-r1.ebuild 1477 BLAKE2B f5fa3267e78936ae977ade1596b834fa8d44f5dfce1a221642287af1757d60d64b19c9ae0ce70bed82dbb4ecb4b54b2e6192b5af150024fa48fd981ebff3e7a9 SHA512 c888a4840083ebb05defcffc2dea323854e64cf3413beff1ac53eb2bf3dee8f10f8ea3268f7b7e4104216e7da9fe371cee1b42e5e8bd9894dae1f7991ff899c8 EBUILD kscreen-6.3.4.ebuild 1376 BLAKE2B 51273876b558b73a8307bae93cd2dea432b84e05be0e95399a3565883d94bfe76a9e42c79f1201a103e1a297f1fc1789c60b0e7e1cd0af81d91910820e84bbe1 SHA512 e81c938ad672267578a7a29d448a6da3007e7b67e566cb48e6fec8531236635aaac858243ae57be1abda7d5af486e003a6413e5b6a77ce1bf69c40ad85709d79 MISC metadata.xml 376 BLAKE2B a743b33e08a1a279c0891824690a4b000135c25bfd1274bb8903f7f3876a1aeb058f7dd283455b3bb8f2e39f83f850b21207bfa14bf9700833d07bde19b9bdc4 SHA512 059438335c8318b7287d3f84f823036d33cb10397cc1e780e9520435818bdc2c3dd7c70dd97b4d041ef3d19219abc22e45ae6244d72c44eb005889b350933c59 diff --git a/kde-plasma/kscreen/files/kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch b/kde-plasma/kscreen/files/kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch new file mode 100644 index 000000000000..3e71d8cb3893 --- /dev/null +++ b/kde-plasma/kscreen/files/kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch @@ -0,0 +1,40 @@ +From 50a3ee595f5f5c6cebed220b79f13483f3ecad97 Mon Sep 17 00:00:00 2001 +From: Oliver Beard +Date: Fri, 4 Apr 2025 12:51:04 +0000 +Subject: [PATCH] kcm: Fix wrong settings shown when reverting changes When + reverting display changes, due to model changes, the StackLayout's + currentIndex is changed by the stackLayout. This is a behaviour added in Qt + 6.5, and requires working around to ensure we keep it the same as + selectedOutput. + +BUG: 490586 +FIXED-IN: 6.3 + + +(cherry picked from commit 3e8ccda33895efe9311b5b5f1e142c6d608846da) + +Co-authored-by: Oliver Beard +--- + kcm/ui/Panel.qml | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/kcm/ui/Panel.qml b/kcm/ui/Panel.qml +index 799477a6f..1b9ebac72 100644 +--- a/kcm/ui/Panel.qml ++++ b/kcm/ui/Panel.qml +@@ -58,6 +58,12 @@ ColumnLayout { + enabledOutputs: root.enabledOutputs + onReorder: root.reorder() + } ++ ++ // "Since 6.5, inserting/removing a new Item at an index less than or equal to the current ++ // index will increment/decrement the current index, but keep the current Item." ++ // This causes BUG: 490586 and the following works around it: ++ onItemAdded: panelView.currentIndex = Qt.binding(() => root.selectedOutput) ++ onItemRemoved: panelView.currentIndex = Qt.binding(() => root.selectedOutput) + } + } + +-- +GitLab + diff --git a/kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild b/kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild new file mode 100644 index 000000000000..e913713844f2 --- /dev/null +++ b/kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.10.0 +QTMIN=6.8.1 +inherit ecm plasma.kde.org xdg + +DESCRIPTION="KDE Plasma screen management" +HOMEPAGE="https://invent.kde.org/plasma/kscreen" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="X" + +# bug #580440, last checked 5.6.3 +RESTRICT="test" + +# qtbase slot op: GuiPrivate use in kded daemon +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtsensors-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6= + >=kde-plasma/libplasma-${KDE_CATV}:6 + X? ( + >=dev-qt/qtbase-${QTMIN}:6=[X] + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libXi + ) +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +PATCHES=( "${FILESDIR}/${P}-kcm-fix-wrong-settings-after-revert.patch" ) # KDE-bug 490586, in 6.3.5 + +src_configure() { + local mycmakeargs=( + -DWITH_X11=$(usex X) + ) + ecm_src_configure +} diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index e8d08e7b20a3..88245519c2dd 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -8,5 +8,4 @@ DIST plasma-workspace-6.2.5.tar.xz 19136676 BLAKE2B 38d211247cfeee10df6f4fff5cbe 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/plasma-workspace-6.3.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.3.4.ebuild deleted file mode 100644 index 5432ba093eaf..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-6.3.4.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# 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 - !=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 -) - -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" -} -- cgit v1.2.3