Add workaround patch for plasma-workspace crash, see bug 450818 and kde bug 311751 comments 2 and 32.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xB6C5F7DE

4 files changed, 302 insertions, 15 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 2da5904f4f37..93b058f04f5f 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.194 2013/02/07 04:57:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.195 2013/02/08 20:30:09 dilfridge Exp $
+
+*plasma-workspace-4.10.0-r1 (08 Feb 2013)
+
+  08 Feb 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +plasma-workspace-4.10.0-r1.ebuild,
+  +files/plasma-workspace-4.10.0-norepeater.patch:
+  Add workaround patch for plasma-workspace crash, see bug 450818 and kde bug
+  311751 comments 2 and 32.
 
 *plasma-workspace-4.10.0 (06 Feb 2013)
 
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 07a8490dbeb4..d0ec08bb0b09 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX plasma-workspace-4.10.0-norepeater.patch 5205 SHA256 d963f4c7cb7c068603fdbc2a52563048fd87bd898c5c853f1eb1d706119e6f12 SHA512 46f05ba8cf5d2f6ec528fc43dc5dc3f0b261baed64a41628fc22c3779613b9ce29ef22c7289a058c958a1ab4f7e15abc1cd9d85dafe21d79f9d5aa66cbfe397f WHIRLPOOL a8a63e91eab8876ef7b29f605118ebbce136eec9931e09aa1ea0223ccb14bd6aa3c3d46036c74a55801a33bf8fff3c96bfc54503f97410055687ca0845f8a73a
 DIST kde-workspace-4.10.0.tar.xz 13378604 SHA256 88c90fef1b8ad81eea75ee04b2a9bae91a38e51425a0ec373ca21bedebef1b46 SHA512 d83210abbfc9cf0bb11f5a7c1fcab52aa512b6ecde7712467a74f5dc03a3dec683386408c3e613cb4bb69e215a0129c44aa935cef59f64c594b43bc2dcf739d9 WHIRLPOOL bdf0b7ce8c1a48c43bb593cbdae3620ef597e83844b7c967dc372539767a1597169894b10daf32de316d41f659e156a0ad44cd5f20dfe2deedb48e129a12b1a6
 DIST kde-workspace-4.9.5.tar.xz 22520656 SHA256 073e495c4ef4eb4689c5c666c86fb6f24f57f2c00801f965c60bf8b32adb014a SHA512 1a8802e8c9dcaf1e81276c962dce7d321a26f205f60ccd27fa00780c4c09a8cd404a67b037265a4dd5efdc4ffc386cc31f571ac5ca10c1a14bc59259683a5e54 WHIRLPOOL f6ba18b30f7a5c454c9304d42f50238eac9a90abfc29fb6f7e873675eca89d206045f7277e5732e3faf669d36ec822cae0849813c66d72f7ba3af25bac3130ef
+EBUILD plasma-workspace-4.10.0-r1.ebuild 3265 SHA256 c01025f055af31b19e7e95e95c2fa4bff28b186f33644095774055ecb09aa3e8 SHA512 1dd453d53234ef44b50c1d3b5803fe57e52c27288b08e1b311b51c2c76510ce63bcc6830707858cdceab7981010d2085038ae3abb66d8fb724e17c4cc40429f6 WHIRLPOOL 0b50e8f7461e0f8133006f6da9237dafae75f590af9c0ca6cd2d6ec3258bb6ed72dce96e1345b787045bab32a13388e6873940aa964318e7ad1f0af7b3a7cdbf
 EBUILD plasma-workspace-4.10.0.ebuild 3210 SHA256 c0097e9fe1b80a0c536a52847f85a4edc43c9e095250670d14c2fbfa2ee94e47 SHA512 7d708ac64784d75dc2b4cc1ba1741ee6407efd01b9a4fbc46bc09bea9c1f6253562bd1805825aaa2e96a1ec8b680b52d04b025f94ade1310dca40559ae762adb WHIRLPOOL aabf2fc64916b97cbd5af515589f03ce7342c4beb4b505eb43bbd4864d4154ef13be0952b1ca6488e6b7484f682f8e8ba1dca8ee073a1a88db94ce911f8ce3b6
 EBUILD plasma-workspace-4.9.5.ebuild 2907 SHA256 dd287b04683b4752bde7d781cd289f8c85438c823cb00708351341b922b9ad0f SHA512 5d94b2ed6873dd18b0c3de4a3fc3756d61ca57421137bb94ff8162286cd274af2b3f044edacbec1f9e5fd6dddf098d4b52ad615e848959223e0de4f728db1b77 WHIRLPOOL f42ff56f58330d7080961446edee99a4355514e7c844369c529dc05ea78b977e387cf580dd8e47960f761300628f925806c7d02f037eccedf3b4334ad5d45718
-MISC ChangeLog 29910 SHA256 145f9c5eaff272527e1d1333d5412e9ebcb83c36bcabb8415a6af88204d8ec9d SHA512 191db77204b106b4f6753fe2ee545e374af2f6a563dbeae20eefd8271a9eb66aac7621be20f8c28fa769fe32438d2d1b643f18a0eeab5edd7d13f969c7f47535 WHIRLPOOL fb9f4d6826821218b063452310343cecd6c0b95852ea93a88b56acf96f68833574b656302fee32f78d2a5af15b904f9efe5ca9b4722f90ff75cb670c3be25411
+MISC ChangeLog 30209 SHA256 b84176a00527077e92cc1df9f2bb4234e6cbe4fb5f131446019b5b699582e57f SHA512 69b0cdeba313dad8cc0170b7a3bf53fd6f83eac287002a1fb7a113737e05c5fa9e0e67997d3a6d0160c4ceffc684c104c88ff9cee0ea04c57ec2d5a3af80de9c WHIRLPOOL ec5ceb2d183266020fd0f1de2ff941313221356df05cfddb33dc5b98cb960668a26655c142e30a4b2d2b5bba96e7e732b32e4d2773147f87df29542f074d1987
 MISC metadata.xml 402 SHA256 cdc50a40ebc732d7671787e4cc83dfa378e37cad4f153c370378d92118207eeb SHA512 d11f02ef452b93a6c48fec038996c502537d1c2560b94d92b461a79e7ebd61b900b6806c4ac4b31a5803bd40ada497546204286975fce0a0d1b40fc3bedd3b69 WHIRLPOOL 7d8f3ee88cc10e7546696f01654ab54d72e75204c57b5c87f42d42104b7ef34a1372ec9d246718137d24d930f82d58b54968928c365d0ac57ea2d1b4c6961d27
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJREzVFAAoJEOf+E+/4L5LmfzQP/jT/0v3eoxRQnIFNec8xk0Pi
-1rfgIp21yUzUkqQIg8BNOG5MVa7Ww5cLPqwjP5J8mI+mD69RYPWJpqmlYvu3tVa8
-aoEOpetNwuwN4sxFwDIh7jhnNoTOCFSGbUtk+Fg+SoQoS8mEzOMu06dwLIVEJjF4
-7UPeobPdzHfktoaagAraL1oKrgDuPpletTqSlxNJWXiYrD8X1jNp2NIWaNVXNrDU
-H5bcocnPPrDBR4fjTeOmaiYmCc0R+IYhabuNVgsczTSBdfPDGqlMTFFXdTndrsTi
-iv0iZBODUungd/x+kDlV+uJ8OLimpDvTaEUS/zMsHGgyHktgckMZ8vW8Pqjq7fqw
-Cu97HLqfrnism6C5LPiC53qHuDD4axo69tWE+N0/07wZDs3fKfcTHDLG6I9nouQ0
-0Z2D42Hme9axrt5FtwaT4LtyYS2ddDk4bw01/5aakpLoTSctSv+5vEnbeOGU35Dp
-NnyA0U+ruWkBvpVxNMC99KU4p6lhzDDtDFpHYNluN+dSYwp8VKsDx2g5/xitJ79w
-l2bB3JwyfOjGoRHhNLmi6Ugrqi1g3Z4BpaTcG/5ZDjnJYt5+RKQzi6iCjO8cdM4f
-oA1h87GC78eKhX+MzDVFDcUWKKazxP6Pmvg+tqB6TOVqfUzZ5IYahiSmLEF7hcZI
-pcWd5mYOjMjrDyC5F7hp
-=L922
+iQIcBAEBCAAGBQJRFWBeAAoJENwGBM22xffe1mYP/0cL1nAjIHSGNc5ph2u7pgsr
+lX1xNFg4ElJicLuzvpiB/UV/EUkZ0XgHtMiATCGFdnuozPQGc2e04ug/k1tXJn+L
+MU9fXutnbnjxatGsxHDl2rJRaikPn4YFYc/+qS/TU9JZcSpC0le/PGp0sTn2HnJb
+b3NOheA+N/PM82nGR4eYDKnZVOQU2vvYFQF3gula5f58snJlXtkSXv0easkFr1GH
+fwre7L4CHR1D5+PW6vGnWR+A/e+tE6ayNP8SoUsz12EVYuU5ra8v+YuKCNJ6RKn+
+lRvAzftutw+3sqlyt5+Fx3xqxDf2b+DicF7IaEJ6t9rbWQxNFZaj5qPfnNb86VT/
+dhWUpL1EUCADW68axf40IjsgJW6PjkWqQWx39wbXvDSBNDpd3I93if2h8XWxX9HH
+NqXcgLHRZLInsBGFCrkFSN2dAAsLi70qOr+U2DxNWNA/aEpHTTKDVzSuX9PUS8rW
+AFq2uG/OzaeN2Vs1Ppif+8AZU0lhLuQRXREuqODQZSv4IcA+rHWS4yGBCMsydM5c
+J7pkX4bcRDLCLb9yqtJRaBLimZGfSXvk2LqinEtJ2VNeIIoOylfrsoUKpKhEVGiw
+NXLJiQt9svbBg+Jt0qoPiWqH6+ehb+V8fnzq2eoNW/RlOGyreujJtw9uMNuKSrKg
+wYo8MHvBKTdbwYBT14cu
+=gvpC
 -----END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch
new file mode 100644
index 000000000000..7e510aa1cc84
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch
@@ -0,0 +1,139 @@
+diff --git a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml b/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
+index 348d3dd..16277b5 100644
+--- a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
++++ b/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
+@@ -34,13 +34,13 @@ MouseArea {
+ 
+     property int icons_size:     24  ///< Size of icons, icons are square i.e. width == height
+     property int icons_margins:  4  ///< Margins for icons
+-    property alias icons_number: repeater.count  ///< [readonly] Number of icons
+-    property alias model:    repeater.model; ///< Model for grid
++    property alias icons_number: list.count  ///< [readonly] Number of icons
++    property alias model:    list.model; ///< Model for grid
+     property int cell_size: icons_size + 2*icons_margins ///< [readonly] size of grid cell
+ 
+     //Those properties are used by PlasmaCore.Dialog for size hints
+-    property int minimumWidth:   layoutColumn.childrenRect.width ///< [readonly] minimum width of component required to show whole grid
+-    property int minimumHeight:  layoutColumn.childrenRect.height ///< [readonly] minimum height of compontn required to show whole grid
++    property int minimumWidth:   list.contentItem.childrenRect.width ///< [readonly] minimum width of component required to show whole grid
++    property int minimumHeight:  list.contentItem.childrenRect.height ///< [readonly] minimum height of compontn required to show whole grid
+     property int maximumWidth: minimumWidth
+     property int maximumHeight: minimumHeight
+ 
+@@ -53,6 +53,7 @@ MouseArea {
+             id: delegate_root_item
+             width: childrenRect.width
+             height: childrenRect.height
++            z: 0
+ 
+             // we redirect some events to IconWidget or applet
+             target: task.type == TypeStatusItem ? ui_item.getIconWidget() : task
+@@ -63,8 +64,9 @@ MouseArea {
+             onClickRight: ui_item.click(Qt.RightButton)
+             onScrollVert: ui_item.scrollVert(delta)
+             onScrollHorz: ui_item.scrollHorz(delta)
+-            onEntered: {
+-                delegate_highlight.y = delegate_root_item.y
++            onChangedMousePos: {
++                var pos = mapToItem(list.contentItem, mouseX, mouseY)
++                list.currentIndex = list.indexAt(pos.x, pos.y)
+             }
+ 
+             Row {
+@@ -108,38 +110,42 @@ MouseArea {
+             }
+ 
+         }
+-
+     }
+ 
+ 
+ 
+-    PlasmaWidgets.ItemBackground {
++    Component {
+         id: delegate_highlight
+-        height: cell_size
+-        width: minimumWidth
+-
+-        opacity: root_item.containsMouse
+-        Behavior on opacity {
+-            NumberAnimation {
+-                duration: 150
+-                easing: Easing.InOutQuad
++        Item {
++            height: cell_size
++            width: minimumWidth
++
++            PlasmaWidgets.ItemBackground {
++                anchors.fill: parent
+             }
+-        }
+-        Behavior on y {
+-            NumberAnimation {
+-                duration: 250
+-                easing: Easing.InOutQuad
++            opacity: root_item.containsMouse
++            Behavior on opacity {
++                NumberAnimation {
++                    duration: 150
++                    easing: Easing.InOutQuad
++                }
+             }
+         }
+     }
+ 
+-
+-    Column {
+-        id: layoutColumn
++    ListView {
++        id: list
++        anchors.fill: parent
++        //never delete items
++        cacheBuffer: 1000
++
++        interactive: false
++        delegate: delegate_task
++        highlight: delegate_highlight
++        highlightFollowsCurrentItem: true
++        highlightMoveSpeed: -1
++        highlightMoveDuration: 250
+         spacing: 0
+-        Repeater {
+-            id: repeater
+-            delegate: delegate_task
+-        }
++        snapMode: ListView.SnapToItem
+     }
+ }
+diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
+index 79f5ca0..38bb815 100644
+--- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
++++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
+@@ -146,14 +146,12 @@ void MouseRedirectArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+ void MouseRedirectArea::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+ {
+     forwardEvent(event);
+-    emit entered();
+ }
+ 
+ 
+ void MouseRedirectArea::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+ {
+     forwardEvent(event);
+-    emit exited();
+ }
+ 
+ void MouseRedirectArea::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h b/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
+index 9c60070..ed1a806 100644
+--- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
++++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
+@@ -67,8 +67,6 @@ signals:
+     void scrollVert(int delta);
+     void scrollHorz(int delta);
+     void changedMousePos(qreal mouseX, qreal mouseY);
+-    void entered();
+-    void exited();
+ 
+ private: //Events
+     virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..26dfbfbb6069
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild,v 1.1 2013/02/08 20:30:09 dilfridge Exp $
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
+OPENGL_REQUIRED="always"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google-gadgets gps json python qalculate +rss semantic-desktop"
+
+COMMONDEPEND="
+	dev-libs/libdbusmenu-qt
+	!kde-misc/ktouchpadenabler
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep solid)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
+	gps? ( >=sci-geosciences/gpsd-2.37 )
+	json? ( dev-libs/qjson )
+	python? (
+		>=dev-python/PyQt4-4.4.0[X]
+		$(add_kdebase_dep pykde4)
+	)
+	qalculate? ( sci-libs/libqalculate )
+	rss? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
+		$(add_kdebase_dep libplasmaclock 'holidays')
+	)
+	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
+	semantic-desktop? (
+		dev-libs/soprano
+		$(add_kdebase_dep nepomuk-core)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	rss? ( dev-libs/boost )
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep plasma-runtime)
+"
+
+PATCHES=( "${FILESDIR}/${P}"-norepeater.patch )
+
+KMEXTRA="
+	appmenu/
+	ktouchpadenabler/
+	statusnotifierwatcher/
+"
+KMEXTRACTONLY="
+	kcheckpass/
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	ksmserver/screenlocker/
+	libs/kephal/
+	libs/kworkspace/
+	libs/taskmanager/
+	libs/plasmagenericshell/
+	libs/ksysguard/
+	libs/kdm/kgreeterplugin.h
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
+
+pkg_setup() {
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+=" doc/plasma-desktop"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use_with json QJSON)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with rss KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop NepomukCore)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		-DWITH_Xmms=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if use python; then
+		python_mod_optimize \
+			PyKDE4/plasmascript.py \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	if use python; then
+		python_mod_cleanup \
+			PyKDE4/plasmascript.py \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}