From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QnbyJ-0001Hc-Ee for garchives@archives.gentoo.org; Sun, 31 Jul 2011 19:46:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6803221C08A; Sun, 31 Jul 2011 19:46:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 235A321C08A for ; Sun, 31 Jul 2011 19:46:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 486351BC01B for ; Sun, 31 Jul 2011 19:46:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 754C33C004 for ; Sun, 31 Jul 2011 19:46:36 +0000 (UTC) From: "Elias Probst" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Elias Probst" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild X-VCS-Directories: kde-base/kdeplasma-addons/files/ kde-base/kdeplasma-addons/ X-VCS-Committer: eliasp X-VCS-Committer-Name: Elias Probst X-VCS-Revision: e46bfcf4f3372392777d08adf9a7e32e392a7655 Date: Sun, 31 Jul 2011 19:46:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b04be0109760c996fdf335c6f84d9b92 commit: e46bfcf4f3372392777d08adf9a7e32e392a7655 Author: Elias Probst eliasprobst eu> AuthorDate: Sun Jul 31 19:46:20 2011 +0000 Commit: Elias Probst eliasprobst eu> CommitDate: Sun Jul 31 19:46:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3De46bfcf4 [kde-base/kdeplasma-addons-4.7.0-r1] Added patch to prevent crashes of pl= asma-desktop on startup when using grid layout (see KDE Bug#278222). --- ...plasma-addons-4.7.0-groupingdesktop-crash.patch | 69 ++++++++++++++= ++++ .../kdeplasma-addons-4.7.0-r1.ebuild | 73 ++++++++++++++= ++++++ 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-group= ingdesktop-crash.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons= -4.7.0-groupingdesktop-crash.patch new file mode 100644 index 0000000..587295a --- /dev/null +++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesk= top-crash.patch @@ -0,0 +1,69 @@ +commit 67b5c56e564f5052238bab38342a85e5f4af570b +Author: Christoph Feck +Date: Sat Jul 30 19:15:28 2011 +0200 + + Fix assignment operator and add copy constructor + =20 + This fixes the crash in Grid Desktop and Grouping Desktop. + Thanks to Aaron Seigo for investigation and patch review. + =20 + BUG: 278222 + FIXED-IN: 4.7.1 + +diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containmen= ts/groupingdesktop/lib/groupinfo.cpp +index 2106cca..c945551 100644 +--- a/containments/groupingdesktop/lib/groupinfo.cpp ++++ b/containments/groupingdesktop/lib/groupinfo.cpp +@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QStri= ng &prettyName) + d->prettyName =3D prettyName; + } +=20 ++GroupInfo::GroupInfo(const GroupInfo &other) ++ : d(new GroupInfoPrivate()) ++{ ++ *d =3D *other.d; ++} ++ + GroupInfo::~GroupInfo() + { + delete d; +@@ -78,13 +84,12 @@ QString GroupInfo::icon() const + return d->icon; + } +=20 +-GroupInfo GroupInfo::operator=3D(const GroupInfo &gi) ++GroupInfo &GroupInfo::operator=3D(const GroupInfo &gi) + { +- GroupInfo g(gi.name(), gi.prettyName()); +- g.setFormFactors(gi.formFactors()); +- g.setIcon(gi.icon()); +- +- return g; ++ if (this !=3D &gi) { ++ *d =3D *gi.d; ++ } ++ return *this; + } +=20 + bool GroupInfo::operator=3D=3D(const GroupInfo &gi) const +diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments= /groupingdesktop/lib/groupinfo.h +index f8cc66f..320c800 100644 +--- a/containments/groupingdesktop/lib/groupinfo.h ++++ b/containments/groupingdesktop/lib/groupinfo.h +@@ -31,6 +31,7 @@ class GroupInfo + { + public: + explicit GroupInfo(const QString &name, const QString &prettyNa= me =3D QString()); ++ GroupInfo(const GroupInfo &other); + ~GroupInfo(); + void setFormFactors(QSet formFactors); + void setIcon(const QString &icon); +@@ -40,7 +41,7 @@ class GroupInfo + QSet formFactors() const; + QString icon() const; +=20 +- GroupInfo operator=3D(const GroupInfo &gi); ++ GroupInfo &operator=3D(const GroupInfo &gi); + bool operator=3D=3D(const GroupInfo &gi) const; + bool operator<(const GroupInfo &gi) const; +=20 diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild b= /kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild new file mode 100644 index 0000000..5e3b862 --- /dev/null +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-a= ddons-4.7.0.ebuild,v 1.1 2011/07/27 14:04:49 alexxy Exp $ + +EAPI=3D4 + +KDE_SCM=3D"git" +inherit kde4-base + +DESCRIPTION=3D"Extra Plasma applets and engines." +HOMEPAGE=3D"http://www.kde.org/" +LICENSE=3D"GPL-2 LGPL-2" + +KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE=3D"attica debug desktopglobe exif qalculate qwt scim semantic-deskt= op" + +# krunner is only needed to generate dbus interface for lancelot +COMMON_DEPEND=3D" + app-crypt/qca:2 + app-crypt/qca-ossl:2 + $(add_kdebase_dep kdelibs 'semantic-desktop=3D') + $(add_kdebase_dep krunner) + $(add_kdebase_dep plasma-workspace 'semantic-desktop=3D') + x11-misc/shared-mime-info + attica? ( dev-libs/libattica ) + desktopglobe? ( $(add_kdebase_dep marble) ) + exif? ( $(add_kdebase_dep libkexiv2) ) + qalculate? ( sci-libs/libqalculate ) + qwt? ( x11-libs/qwt:5 ) + scim? ( app-i18n/scim ) + semantic-desktop? ( + $(add_kdebase_dep kdepimlibs 'semantic-desktop') + $(add_kdebase_dep plasma-workspace 'rss') + ) +" +DEPEND=3D"${COMMON_DEPEND} + dev-cpp/eigen:2 +" +# kde-misc/plasmaboard: moved here in 4.3.65 +# kde-misc/qalculate-applet: since 4.4.0 +RDEPEND=3D"${COMMON_DEPEND} + !kde-misc/plasmaboard + !kde-misc/qalculate-applet +" + +PATCHES=3D( + # needed for 4.7.0, can be removed in 4.7.1, see KDE Bug#278222 + "${FILESDIR}/${P}-groupingdesktop-crash.patch" +) + +# kdebase-data: some svg icons moved from data directly here. +add_blocker kdebase-data '<4.2.88' + +src_prepare() { + use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonad= i.patch" + kde4-base_src_prepare +} + +src_configure() { + mycmakeargs=3D( + -DDBUS_INTERFACES_INSTALL_DIR=3D"${EPREFIX}/usr/share/dbus-1/interface= s/" + $(cmake-utils_use_with attica LibAttica) + $(cmake-utils_use_with desktopglobe Marble) + $(cmake-utils_use_with exif Kexiv2) + $(cmake-utils_use_with qalculate) + $(cmake-utils_use_with qwt) + $(cmake-utils_use_with semantic-desktop KdepimLibs) + $(cmake-utils_use_with semantic-desktop Nepomuk) + $(cmake-utils_use_with scim) + ) + + kde4-base_src_configure +}