From d16a958edd9d00c11113effaa768ca2f034a3f10 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 29 Nov 2018 14:51:15 +0100 Subject: kde-plasma/plasma-desktop: 5.14.4.1 version bump Same as 5.14.4-r1, but upstream's respin in place of 5.14.4 tarball forces our hand. See also: https://community.kde.org/Plasma/5.14_Errata https://mail.kde.org/pipermail/release-team/2018-November/011159.html Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner --- kde-plasma/plasma-desktop/Manifest | 2 +- .../plasma-desktop-5.14.4-taskbar-crash.patch | 39 ------ .../plasma-desktop/plasma-desktop-5.14.4-r1.ebuild | 146 --------------------- .../plasma-desktop/plasma-desktop-5.14.4.1.ebuild | 144 ++++++++++++++++++++ 4 files changed, 145 insertions(+), 186 deletions(-) delete mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild create mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 2d769984e6ec..5daa3383a31e 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,3 +1,3 @@ DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383 DIST plasma-desktop-5.14.3.tar.xz 9141312 BLAKE2B f6be5a432abac3835b7a6102a755f7bfc8809ef851c498ecc57ca2026fadcf7aebc2cf5c4e8b11198551cdaca04eff0607fd0d7ebcfd47a33fb4fd739e1eaf42 SHA512 52ce17321a0dd153446e9e334102ab2f6579e84595c53641864a660969ae410272f4762b345397fd00e9f6e936ce097e179d0b69a62341fa97b7b6b0b1ec38bd -DIST plasma-desktop-5.14.4.tar.xz 9148316 BLAKE2B ce4ff1c17d2fb2166f4ab151b16c800629a947578826784ca51449d6e740874348c05f7f092da773fe81a733d2f3806fa2283b849e6a6bf8c7f496111f30d23a SHA512 7028d609ea05560cd07f5668ed620910f39ccd82d7f87e9f3f35321014271e3a1b5a3ffccef836fbf383fde40e7529011b5c48522c403ff84f4a605887c3cca4 +DIST plasma-desktop-5.14.4.1.tar.xz 9139608 BLAKE2B b30e27031ac93f031010261fd064d774d5cd1e88be470f4f174a4dd2dda7f6c2af359c6be25671c5c0408ec9a71a6a6aed595b25dc4b5432bb35432b63f8cd34 SHA512 92404c766eddaf97f5ba6e76edfd3320eb21e787202aa8aadc76e4c1f613f455a669a9fc09fe3d19e90e46c39a4bf55185d3e2ef99f7f79adb7afe3f63e7bbdc diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch deleted file mode 100644 index 1a0a8957ef07..000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.14.4-taskbar-crash.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ed34cc5f181e61d1fc98872866c5d7300a90af86 Mon Sep 17 00:00:00 2001 -From: Eike Hein -Date: Thu, 29 Nov 2018 00:22:17 +0900 -Subject: [PATCH] Fix group popup dialog - -Summary: -Fixes regression introduced with ab26ebb18b74: That diff contained -a change unrelated to the original submission, swapping a || out for -&& in response to a review note. This turns out to have broken things. - -BUG:401508 - -Reviewers: davidedmundson - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D17219 ---- - applets/taskmanager/package/contents/ui/GroupDialog.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/applets/taskmanager/package/contents/ui/GroupDialog.qml b/applets/taskmanager/package/contents/ui/GroupDialog.qml -index 6f592756..28238dce 100644 ---- a/applets/taskmanager/package/contents/ui/GroupDialog.qml -+++ b/applets/taskmanager/package/contents/ui/GroupDialog.qml -@@ -262,7 +262,7 @@ PlasmaCore.Dialog { - // Setting VisualDataModel.rootIndex drops groupRepeater.count to 0 - // before the actual row count. updateSize is therefore invoked twice; - // only update size once the repeater count matches the model role. -- } else if (!groupRepeater.aboutToPopulate && visualParent.childCount == groupRepeater.count) { -+ } else if (!groupRepeater.aboutToPopulate || visualParent.childCount == groupRepeater.count) { - var task; - var maxWidth = 0; - var maxHeight = 0; --- -2.19.2 - diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild deleted file mode 100644 index c8d04a38a96a..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.14.4-r1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# 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 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-0.12.2[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 - ) - 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/util-linux - x11-apps/setxkbmap - !kde-apps/kcontrol - !