From 3f71901f8c228f4de570abed1831ce3ee425343e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Sep 2018 10:50:14 +0100 Subject: gentoo resync 08.09.2018 --- kde-plasma/plasma-desktop/Manifest | 5 +- .../plasma-desktop-5.13.5-activityswitcher.patch | 62 ++++++++ .../plasma-desktop/plasma-desktop-5.13.4.ebuild | 163 -------------------- .../plasma-desktop/plasma-desktop-5.13.5.ebuild | 165 +++++++++++++++++++++ 4 files changed, 230 insertions(+), 165 deletions(-) create mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild (limited to 'kde-plasma/plasma-desktop') diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 2181b84f428c..ca8253e8f5b6 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,8 +1,9 @@ AUX plasma-desktop-5.12.5-submodules-update.patch 1016 BLAKE2B 7ff9a57181b1438027cdf2aaf0e5d6dad25125c79c9cdb349b1d4b271638f1fb77f0742b3d67060ad74f26a820765260796eacd8cd994263fc00fcb13b82ace0 SHA512 c283923a0f5473e6017b1160f3a15f7ec277196cc55b14c03bc77a56188b44c9d58010abfe85d1e6c2c25fdda1f3b35ea3bbe9525bbbd80c8ab82d6e28960a9a +AUX plasma-desktop-5.13.5-activityswitcher.patch 2194 BLAKE2B 992d63a598b804f380a2d0f893f6d1295bc8e96f4afaff8472566f6c915e388542ed46cf183803687de04889e4d66cf63dc47c45d5ffabfa4b8e57cc7322587e SHA512 4431a3766e9faa6c2026ea73753691bf7f8d8d29c3e8dff67060772a9a2caaafa3bd760b19817874d411f6f4d275ea46abcb437460753b50edaf52dc4718a4a6 DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb DIST plasma-desktop-5.12.6.tar.xz 9172156 BLAKE2B 054045e1264926e5d0c87876c87cf48164a99c343f7c3fdb22dbae036cdc7e6fbb147c97c33a047c0a5c0cb75b62c88b802ccb79bcce022f9ccf9abeebde419b SHA512 435add4f2133f3e54023ad42b1360dc3ea3c44789692a38e5d95fcc825a1b7a9e3bdc05d03a375c687f3f0544c8f2ea4ccf047ec099ea3da32ed539ca57c8d76 -DIST plasma-desktop-5.13.4.tar.xz 9155072 BLAKE2B e2cf970b2a1c521f2207fb9869501ff616e94d679221b12a18448d402085aacf2f5fc4ac2fdb018bc662060054b61ff754abbae4ede562a1b6da0dcc8f49bd9d SHA512 c990b5d5ffbec70a1f410688c1304c2cdeabd5be017ab9b2a382abd57719505902938e43e5bddd046618f9143d8ee0a61b80aeb53a892315d92897dd80d66b24 +DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383 EBUILD plasma-desktop-5.12.5-r1.ebuild 4495 BLAKE2B 51f2671d3e48f65707b28cf6eb29f6ff26e5e444e06e16ec918d40b803d4c247168f226000ad167530852ff27d721331c0a3d4cd6c3c1aee72e7fcb6fe953f41 SHA512 a2d9148faf259057b3e6b7746b804fd1ae6384714adb57b53f306246992541968faaf9d44acc22e4f4ae34c46068310d37ea3fb66457fe0e52a424c32c96f592 EBUILD plasma-desktop-5.12.6.ebuild 4412 BLAKE2B 890435931325f175740024daebbdeb981061607c539e64b2bcf4bf51b3f929d35e219e08399875db12599c3fd6fa393efdc4e1b79912654deaba12172275a59c SHA512 aa47ac7390a855b6ae64ac663e060cd3b2a7b8421b760c3bf75695f0d35865310f96418956267785b09e32c6adbcc0e17d4e8a275b7a58bad934b4afd5a12057 -EBUILD plasma-desktop-5.13.4.ebuild 4465 BLAKE2B 1fc5b2a75a9b6daa86b61d40eb3585015aaac3db83ff788c3a4c2eab1f7c6c6fa003f6e51e8fdd0adde159dc4901a2bd82c5a96126a133acf318897340419a9a SHA512 fc122e194676a8981bf0ff9be9bf2048cb99cb313d2fbacf4fe1927271c43374f1cb05aea44dd0324cc9e37021ebf38efda541edeab5452bee900363fc8be024 +EBUILD plasma-desktop-5.13.5.ebuild 4520 BLAKE2B a5bf6c1a08b4869be3d132d29c6c7e18fd1424a2c5b35d3f184863ca59e1d0ea448260b982ae3116bde88102069e536eebe8eb928cf25f0a3b3e13450f55d2c4 SHA512 a6feaa6fccf00db7c5da3a3d3c46f2628ac598c8d0efbf7926ab322c633e009b0fc0b46662755fd78809aa565aa85b160cd83c6407ac36fe2b9974158fe8893d MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch new file mode 100644 index 000000000000..a495b075ca6b --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch @@ -0,0 +1,62 @@ +From c1f3b45cabe0cf89e13a5b1c9b7a673992320826 Mon Sep 17 00:00:00 2001 +From: Thomas Surrel +Date: Tue, 22 May 2018 14:20:25 -0600 +Subject: Activity switcher auto-hide when using Meta-Tab + +Summary: +Commit 174aa217180434ab93b899d9c7cf967bd2daff7e created a new +issue where the activity switcher would not hide anymore when +switching activities with the Meta-Tab global shortcut and +releasing the keys under one second. + +This patch fixes this by unconditionnal toggling the activity +switcher visibility if it should be hidden, but keeping the +timestamp condition before showing it, so that both Meta-q and +Meta-Tab behaves correctly. + +BUG: 393912 + +Reviewers: mart, ngraham + +Reviewed By: mart, ngraham + +Subscribers: ngraham, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D13012 +--- + desktoppackage/contents/views/Desktop.qml | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/desktoppackage/contents/views/Desktop.qml b/desktoppackage/contents/views/Desktop.qml +index 3272a89..3539050 100644 +--- a/desktoppackage/contents/views/Desktop.qml ++++ b/desktoppackage/contents/views/Desktop.qml +@@ -73,17 +73,16 @@ Item { + property int lastToggleActivityManagerTimestamp: 0 + + function toggleActivityManager() { +- var currentTimestamp = new Date().getTime() / 1000; ++ if (sidePanelStack.state == "activityManager") { ++ sidePanelStack.state = "closed"; ++ } else { ++ var currentTimestamp = new Date().getTime() / 1000; + +- if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) { +- if (sidePanelStack.state == "activityManager") { +- sidePanelStack.state = "closed"; +- } else { ++ if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) { + sidePanelStack.state = "activityManager"; + sidePanelStack.setSource(Qt.resolvedUrl("../activitymanager/ActivityManager.qml")) ++ lastToggleActivityManagerTimestamp = currentTimestamp; + } +- +- lastToggleActivityManagerTimestamp = currentTimestamp; + } + } + +-- +cgit v0.11.2 + diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild deleted file mode 100644 index 649e0d876dc4..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE Plasma desktop" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad" - -COMMON_DEPEND=" - $(add_frameworks_dep attica) - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kactivities-stats) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpeople) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_frameworks_dep sonnet) - $(add_plasma_dep kwin) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb - x11-libs/libxkbfile - appstream? ( dev-libs/appstream[qt5] ) - fontconfig? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/xcb-util-image - ) - ibus? ( - $(add_qt_dep qtx11extras) - app-i18n/ibus - dev-libs/glib:2 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - pulseaudio? ( - dev-libs/glib:2 - media-libs/libcanberra - media-sound/pulseaudio - ) - scim? ( app-i18n/scim ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) - touchpad? ( x11-drivers/xf86-input-synaptics ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) - mouse? ( - x11-drivers/xf86-input-evdev - x11-drivers/xf86-input-libinput - ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep qqc2-desktop-style) - $(add_plasma_dep breeze) - $(add_plasma_dep kde-cli-tools) - $(add_plasma_dep oxygen) - $(add_qt_dep qtgraphicaleffects) - sys-apps/accountsservice - sys-apps/util-linux - x11-apps/setxkbmap - pulseaudio? ( $(add_plasma_dep plasma-pa ) ) - !kde-apps/kcontrol - !