Skip to content

Commit

Permalink
kde-plasma/plasma-desktop: Fix task icons w/ >=KF-5.19
Browse files Browse the repository at this point in the history
Requires kde-frameworks/plasma-5.19.0

Package-Manager: portage-2.2.27
  • Loading branch information
a17r authored and kensington committed Mar 13, 2016
1 parent d45e4e9 commit 3af3081
Show file tree
Hide file tree
Showing 2 changed files with 191 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
From: David Rosca <[email protected]>
Date: Fri, 19 Feb 2016 15:20:00 +0000
Subject: TaskManager: Don't use Plasma theme icons in task icon
X-Git-Tag: v5.5.95
X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=310cffc34156b094c0c68d5002ecd2d2936ac546
---
TaskManager: Don't use Plasma theme icons in task icon

Summary:
Also disable animation for icon in tooltip (normal Plasma tooltips
no longer have animated icon too).

BUG: 359387

Reviewers: #plasma, hein

Reviewed By: hein

Subscribers: plasma-devel

Projects: #plasma

Differential Revision: https://phabricator.kde.org/D991
---


--- a/applets/taskmanager/package/contents/ui/Task.qml
+++ b/applets/taskmanager/package/contents/ui/Task.qml
@@ -293,6 +293,7 @@

active: task.containsMouse || task.showingContextMenu
enabled: true
+ usesPlasmaTheme: false

source: model.DecorationRole


--- a/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml
+++ b/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml
@@ -334,6 +334,8 @@
x: _s
width: units.iconSizes.desktop
height: width
+ animated: false
+ usesPlasmaTheme: false
source: icon
}
}

142 changes: 142 additions & 0 deletions kde-plasma/plasma-desktop/plasma-desktop-5.5.5-r1.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=6

FRAMEWORKS_MINIMAL="5.19.0"
KDE_HANDBOOK="true"
KDE_TEST="true"
inherit kde5

DESCRIPTION="KDE Plasma desktop"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"

COMMON_DEPEND="
$(add_frameworks_dep attica)
$(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
$(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
fontconfig? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
x11-libs/xcb-util-image
)
pulseaudio? (
dev-libs/glib:2
media-libs/libcanberra
media-sound/pulseaudio
)
touchpad? ( x11-drivers/xf86-input-synaptics )
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep breeze)
$(add_plasma_dep kde-cli-tools)
$(add_plasma_dep oxygen)
$(add_qt_dep qtgraphicaleffects)
sys-apps/accountsservice
x11-apps/setxkbmap
legacy-systray? (
gtk2? ( dev-libs/libappindicator:2 )
gtk3? ( dev-libs/libappindicator:3 )
qt4? ( dev-libs/sni-qt )
)
pulseaudio? ( $(add_plasma_dep plasma-pa ) )
qt4? ( kde-base/qguiplatformplugin_kde )
!kde-apps/kcontrol
!kde-apps/kdepasswd
!kde-apps/knetattach[handbook]
!kde-base/plasma-desktop:4
!kde-base/plasma-workspace:4
!kde-base/solid-actions-kcm:4
!kde-base/systemsettings:4
!kde-misc/kcm_touchpad
!kde-misc/kcm-touchpad
!kde-plasma/kcm-touchpad
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
x11-proto/xproto
evdev? ( x11-drivers/xf86-input-evdev )
fontconfig? ( x11-libs/libXrender )
"

REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )"

PATCHES=( "${FILESDIR}/${P}-fix-task-icon.patch" ) # Requires KDE Frameworks 5.19

pkg_setup() {
if has_version net-im/skype && use legacy-systray && use amd64; then
einfo
elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary."
einfo
fi
}

src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package evdev Evdev)
$(cmake-utils_use_find_package fontconfig Fontconfig)
$(cmake-utils_use_find_package pulseaudio PulseAudio)
$(cmake-utils_use_find_package touchpad Synaptics)
)

kde5_src_configure
}

0 comments on commit 3af3081

Please sign in to comment.