From 17d2f35c2ca225afdd8a89ad4dd59174c7ed82ff Mon Sep 17 00:00:00 2001 From: "Andreas K. Hüttel" Date: Tue, 29 Nov 2011 21:49:08 +0000 Subject: Another crash fix, bug 389991 (Portage version: 2.1.10.37/cvs/Linux x86_64) --- kde-base/plasma-workspace/ChangeLog | 9 +- .../plasma-workspace-4.7.3-deletedwidget.patch | 40 ++++++ .../plasma-workspace-4.7.3-r6.ebuild | 148 -------------------- .../plasma-workspace-4.7.3-r7.ebuild | 149 +++++++++++++++++++++ 4 files changed, 197 insertions(+), 149 deletions(-) create mode 100644 kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch delete mode 100644 kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild create mode 100644 kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild (limited to 'kde-base/plasma-workspace') diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog index 8ac37dd0d9c8..deca53265b92 100644 --- a/kde-base/plasma-workspace/ChangeLog +++ b/kde-base/plasma-workspace/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/plasma-workspace # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.136 2011/11/24 22:33:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.137 2011/11/29 21:49:08 dilfridge Exp $ + +*plasma-workspace-4.7.3-r7 (29 Nov 2011) + + 29 Nov 2011; Andreas K. Huettel + -plasma-workspace-4.7.3-r6.ebuild, +plasma-workspace-4.7.3-r7.ebuild, + +files/plasma-workspace-4.7.3-deletedwidget.patch: + Another crash fix, bug 389991 *plasma-workspace-4.7.3-r6 (24 Nov 2011) diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch new file mode 100644 index 000000000000..70f73675345e --- /dev/null +++ b/kde-base/plasma-workspace/files/plasma-workspace-4.7.3-deletedwidget.patch @@ -0,0 +1,40 @@ +commit 2d1deb4234aa3d43e2a7cc48fc1f6936bd2ff97c +Author: Aaron Seigo +Date: Wed Nov 9 17:11:50 2011 +0100 + + since the widget is being deleted, remove it from the collection + + BUG:286197 + BUG:286195 + BUG:264750 + BUG:277367 + BUG:280326 + BUG:280072 + BUG:282552 + BUG:283061 + BUG:284603 + BUG:286177 + BUG:286181 + +diff --git a/plasma/generic/applets/systemtray/core/task.cpp b/plasma/generic/applets/systemtray/core/task.cpp +index 5793102..1a02c24 100644 +--- a/plasma/generic/applets/systemtray/core/task.cpp ++++ b/plasma/generic/applets/systemtray/core/task.cpp +@@ -101,7 +101,7 @@ QHash Task::widgetsByHost() const + + void Task::abandon(Plasma::Applet *host) + { +- QGraphicsWidget *widget = d->widgetsByHost.value(host); ++ QGraphicsWidget *widget = d->widgetsByHost.take(host); + if (widget) { + widget->deleteLater(); + } +@@ -116,7 +116,7 @@ void Task::widgetDeleted() + { + bool wasEmbeddable = isEmbeddable(); + +- QGraphicsWidget * w = static_cast(sender()); ++ QGraphicsWidget *w = static_cast(sender()); + QMutableHashIterator it(d->widgetsByHost); + while (it.hasNext()) { + it.next(); diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild deleted file mode 100644 index ec2939d0f3c3..000000000000 --- a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r6.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2011 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.7.3-r6.ebuild,v 1.1 2011/11/24 22:33:17 dilfridge Exp $ - -EAPI=4 - -KDE_HANDBOOK="optional" -KMNAME="kde-workspace" -KMMODULE="plasma" -PYTHON_DEPEND="python? 2" -inherit python kde4-meta - -DESCRIPTION="Plasma: KDE desktop framework" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama" - -COMMONDEPEND=" - $(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 ) - python? ( - >=dev-python/PyQt4-4.4.0[X] - >=dev-python/sip-4.7.1 - $(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') ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${COMMONDEPEND} - rss? ( dev-libs/boost ) - x11-proto/compositeproto - x11-proto/damageproto - x11-proto/fixesproto - x11-proto/renderproto - xinerama? ( x11-proto/xineramaproto ) -" -RDEPEND="${COMMONDEPEND} - $(add_kdebase_dep activitymanager) - $(add_kdebase_dep plasma-runtime) -" - -KMEXTRA=" - statusnotifierwatcher/ -" -KMEXTRACTONLY=" - krunner/dbus/org.freedesktop.ScreenSaver.xml - krunner/dbus/org.kde.krunner.App.xml - ksmserver/org.kde.KSMServerInterface.xml - libs/kephal/ - libs/kworkspace/ - libs/taskmanager/ - libs/plasmagenericshell/ - libs/ksysguard/ - ksysguard/ -" - -KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" - "${FILESDIR}/${PN}-4.7.3-weathercrash.patch" - "${FILESDIR}/${PN}-4.7.3-taskcrash.patch" - "${FILESDIR}/${PN}-4.7.3-calendarcrash.patch" - "${FILESDIR}/${PN}-4.7.3-layoutcrash.patch" -) - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup - kde4-meta_pkg_setup -} - -src_unpack() { - if use handbook; then - KMEXTRA+=" doc/plasma-desktop" - fi - - kde4-meta_src_unpack -} - -src_prepare() { - sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die - - kde4-meta_src_prepare -} - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_with google-gadgets Googlegadgets) - $(cmake-utils_use_with gps libgps) - $(cmake-utils_use_with python SIP) - $(cmake-utils_use_with python PyQt4) - $(cmake-utils_use_with python PyKDE4) - $(cmake-utils_use_with qalculate) - $(cmake-utils_use_with rss KdepimLibs) - $(cmake-utils_use_with semantic-desktop Akonadi) - $(cmake-utils_use_with semantic-desktop Nepomuk) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_with xinerama X11_Xinerama) - -DWITH_Xmms=OFF - ) - - kde4-meta_src_configure -} - -src_install() { - kde4-meta_src_install - - rm -f \ - "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \ - "${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co] -} - -pkg_postinst() { - kde4-meta_pkg_postinst - - if use python; then - python_mod_optimize \ - PyKDE4 \ - /usr/share/apps/plasma_scriptengine_python - fi -} - -pkg_postrm() { - kde4-meta_pkg_postrm - - if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then - python_mod_cleanup \ - PyKDE4 \ - /usr/share/apps/plasma_scriptengine_python - fi -} diff --git a/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild new file mode 100644 index 000000000000..daecec894ddd --- /dev/null +++ b/kde-base/plasma-workspace/plasma-workspace-4.7.3-r7.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2011 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.7.3-r7.ebuild,v 1.1 2011/11/29 21:49:08 dilfridge Exp $ + +EAPI=4 + +KDE_HANDBOOK="optional" +KMNAME="kde-workspace" +KMMODULE="plasma" +PYTHON_DEPEND="python? 2" +inherit python kde4-meta + +DESCRIPTION="Plasma: KDE desktop framework" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama" + +COMMONDEPEND=" + $(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 ) + python? ( + >=dev-python/PyQt4-4.4.0[X] + >=dev-python/sip-4.7.1 + $(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') ) + xinerama? ( x11-libs/libXinerama ) +" +DEPEND="${COMMONDEPEND} + rss? ( dev-libs/boost ) + x11-proto/compositeproto + x11-proto/damageproto + x11-proto/fixesproto + x11-proto/renderproto + xinerama? ( x11-proto/xineramaproto ) +" +RDEPEND="${COMMONDEPEND} + $(add_kdebase_dep activitymanager) + $(add_kdebase_dep plasma-runtime) +" + +KMEXTRA=" + statusnotifierwatcher/ +" +KMEXTRACTONLY=" + krunner/dbus/org.freedesktop.ScreenSaver.xml + krunner/dbus/org.kde.krunner.App.xml + ksmserver/org.kde.KSMServerInterface.xml + libs/kephal/ + libs/kworkspace/ + libs/taskmanager/ + libs/plasmagenericshell/ + libs/ksysguard/ + ksysguard/ +" + +KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager" + +PATCHES=( + "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" + "${FILESDIR}/${PN}-4.7.3-weathercrash.patch" + "${FILESDIR}/${PN}-4.7.3-taskcrash.patch" + "${FILESDIR}/${PN}-4.7.3-calendarcrash.patch" + "${FILESDIR}/${PN}-4.7.3-layoutcrash.patch" + "${FILESDIR}/${PN}-4.7.3-deletedwidget.patch" +) + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup + kde4-meta_pkg_setup +} + +src_unpack() { + if use handbook; then + KMEXTRA+=" doc/plasma-desktop" + fi + + kde4-meta_src_unpack +} + +src_prepare() { + sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die + + kde4-meta_src_prepare +} + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_with google-gadgets Googlegadgets) + $(cmake-utils_use_with gps libgps) + $(cmake-utils_use_with python SIP) + $(cmake-utils_use_with python PyQt4) + $(cmake-utils_use_with python PyKDE4) + $(cmake-utils_use_with qalculate) + $(cmake-utils_use_with rss KdepimLibs) + $(cmake-utils_use_with semantic-desktop Akonadi) + $(cmake-utils_use_with semantic-desktop Nepomuk) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with xinerama X11_Xinerama) + -DWITH_Xmms=OFF + ) + + kde4-meta_src_configure +} + +src_install() { + kde4-meta_src_install + + rm -f \ + "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \ + "${ED}"/usr/share/apps/plasma_scriptengine_python/*.py[co] +} + +pkg_postinst() { + kde4-meta_pkg_postinst + + if use python; then + python_mod_optimize \ + PyKDE4 \ + /usr/share/apps/plasma_scriptengine_python + fi +} + +pkg_postrm() { + kde4-meta_pkg_postrm + + if [[ -d ${EPREFIX}/usr/share/apps/plasma_scriptengine_python ]]; then + python_mod_cleanup \ + PyKDE4 \ + /usr/share/apps/plasma_scriptengine_python + fi +} -- cgit v1.2.3-65-gdbad