From 97967bbbae8f43c98315b079178f1717f130e302 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 19 May 2018 13:06:44 +0100 Subject: gentoo resync : 19.05.2018 --- kde-plasma/Manifest.gz | Bin 7610 -> 7608 bytes kde-plasma/plasma-desktop/Manifest | 2 + .../plasma-desktop-5.12.5-submodules-update.patch | 39 +++++ .../plasma-desktop/plasma-desktop-5.12.5-r1.ebuild | 164 +++++++++++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild (limited to 'kde-plasma') diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz index 0d05be1b831b..2a92083ae1c5 100644 Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index b13ddaf8c5bb..ddca9ac00a21 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,5 +1,7 @@ +AUX plasma-desktop-5.12.5-submodules-update.patch 1016 BLAKE2B 7ff9a57181b1438027cdf2aaf0e5d6dad25125c79c9cdb349b1d4b271638f1fb77f0742b3d67060ad74f26a820765260796eacd8cd994263fc00fcb13b82ace0 SHA512 c283923a0f5473e6017b1160f3a15f7ec277196cc55b14c03bc77a56188b44c9d58010abfe85d1e6c2c25fdda1f3b35ea3bbe9525bbbd80c8ab82d6e28960a9a DIST plasma-desktop-5.11.5.tar.xz 8534060 BLAKE2B 3d3405c5ed1b85cad172c6c5f92c4da9a9204e901a3f3f3e4a581f20726881baeb086df71cc9d7df36715f809856f9fd01487497543efa7d3a28be206381b29c SHA512 328b6a75def1343c87cc783dd9cf6fcbd17a000f5ef7d28f2d558225a38de6d879767335036c97743d1f6ea029c9b932671dec8436d0bdba5a0f27b1afdd82a7 DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb EBUILD plasma-desktop-5.11.5.ebuild 4372 BLAKE2B a5353650f3eec32961ba02cbdb16afd389767a69c9b50cf0971e3a05bbc74d09dc606fa9c7946d15b69396c8a3b809e1ffda365f6d32c7019a772719ba4817fb SHA512 8c578b6c7602ed9b4e3fe16687cf04960a29e6821d5773b6760fe676ff5587b30c2b619faebce69141cd4454a15bbadc02308ee2bc56906730d831927189099a +EBUILD plasma-desktop-5.12.5-r1.ebuild 4497 BLAKE2B 284391aabe3e987b97eaeb536bc0ee557ad1774c1942fae1619dbb7f54c355d973cda2f04d0c76915efa0cbfe4f403d0714fca9bcc9a42a5b0ab4b4609b4367b SHA512 63fb57371c9d25908ccdf9c622769481fb18e2658afd53356172d3ad0d8ce8d083739665d89dad4eb3b9d64c5c39864658d97ecfe1204a0486e9378274f7056a EBUILD plasma-desktop-5.12.5.ebuild 4441 BLAKE2B d9df1e51651467790a8c549c7f5590f264168ed4ecca71f53d252d79534110978d89ba396d48baf5892c1685a7097d71808165be6c8254b9bc9f32f83aa5b4e2 SHA512 fa9c334f3b689e70df6011164286594f9b167e1aa5c39d3889556698b1be7fb9db7860bf2af289d53fa520007d9405569299c2a20a825d987d3b097feb9d26b1 MISC metadata.xml 936 BLAKE2B 36f03184c29147611b8db767332ac26008ede1379844401486b1a9c0b82118c88a63d03c4260601069adc4b3e73d9e7087fd947c99b4e834dfc3aeea5347eb0a SHA512 cbdfc40a4ec80d01d0fd11e695259e4525347f4294a4ff786be7b863b4c679daea38187e1a8eac0239396ccea84ef83c5a7cc18dce387829edc69096e29041f8 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch new file mode 100644 index 000000000000..ce6c7a8a2791 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.12.5-submodules-update.patch @@ -0,0 +1,39 @@ +From c0cd1f8d49e6d63f1988d4749c366a0bef177790 Mon Sep 17 00:00:00 2001 +From: Eike Hein +Date: Wed, 9 May 2018 16:24:15 +0900 +Subject: Fix submenus not updating when switching between categories of the + same size + +Summary: +This fixes a regression introduced in 38403268aad3, which forgot to +handle the branch where the counts are the same. + +BUG:394013 + +Reviewers: #plasma + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D12774 +--- + applets/kicker/plugin/funnelmodel.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/applets/kicker/plugin/funnelmodel.cpp b/applets/kicker/plugin/funnelmodel.cpp +index 26cad55..165e43d 100644 +--- a/applets/kicker/plugin/funnelmodel.cpp ++++ b/applets/kicker/plugin/funnelmodel.cpp +@@ -81,6 +81,8 @@ void FunnelModel::setSourceModel(QAbstractItemModel *model) + setNewModel(); + endRemoveRows(); + } ++ } else { ++ setNewModel(); + } + + if (newCount > 0) { +-- +cgit v0.11.2 + diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild new file mode 100644 index 000000000000..07022c834703 --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.5-r1.ebuild @@ -0,0 +1,164 @@ +# 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 + !