Added upstream patch against a crash, bug 365139

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 99 insertions, 2 deletions

diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index d239dc2e4d82..52a3cc1b97e4 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.173 2011/04/23 17:12:48 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.174 2011/04/27 22:12:47 dilfridge Exp $
+
+*kalarm-4.4.11.1-r1 (27 Apr 2011)
+
+  27 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kalarm-4.4.11.1-r1.ebuild, +files/kalarm-4.4.11.1-crash.patch:
+  Added upstream patch against a crash, bug 365139
 
 *kalarm-4.5.95 (23 Apr 2011)
 
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index 7652c77a6745..4691d0d2108f 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,10 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX kalarm-4.4.11.1-crash.patch 1442 RMD160 92407f1ad2be9cd1de41ad2200d8757355f531c2 SHA1 3dafcd2fae1946fe4976c8bfbf123747105c3da1 SHA256 22cb1522b6ea83267a869d3f9b6c2d3c13e4513895d2cd57e57f0ebe92bc8dc8
 DIST kdepim-4.4.10.tar.bz2 9071402 RMD160 bbdb5f1ecfef5fa94241c2055255433322ae57a5 SHA1 b9c45e80dddc3bff201df6ddd76fdf4f1f18d5c3 SHA256 9e1770cb8d4bf1f95c3a2006877e7b49bc2a641591c990d07411d7424ea33099
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
 DIST kdepim-4.4.9.tar.bz2 9084259 RMD160 d11b5090bdf27c3ffd4558d9c3e6cd30aa6a7e88 SHA1 efe91c4309fb09f49c816a6557a157170c8f0360 SHA256 28a3e60118efb86822fb5376ee29359e509737d8339fa91d8a4da950a6b1215f
 DIST kdepim-4.5.95.tar.bz2 55221821 RMD160 46f0f47bc2313f4a7f2c2294dc8d28383ab64a7e SHA1 5227ac466247f043643bb9eaa7568e8b936edafe SHA256 ecfe56f88c609e4e1e89885a58bd1c1d31d5f24c1eb5592093f87c8718635b27
 EBUILD kalarm-4.4.10.ebuild 738 RMD160 d71f529a40b067fc59f34b1523179e50b56bd1f2 SHA1 38e0139769069e05cf27a33dcc5f5a54b0566c09 SHA256 00b42d79c7488ef6a67d5da3146bcca01be6fa46847c8bcd77e79a2d62a8d6a1
+EBUILD kalarm-4.4.11.1-r1.ebuild 799 RMD160 6d663c422a42d51036d93d4cbca621e74fbe908f SHA1 ce7d74500d2cc670e6c8c25d4436b14fc61cfa95 SHA256 8ad84e1a70a3633e9458b92173ebc6945801c9783e8ef54b9a193bdab34d1370
 EBUILD kalarm-4.4.11.1.ebuild 742 RMD160 80b26cd266e69f1d8761775c436dbb16b5f64eba SHA1 758f90f4584de213828715a8900fc8fcd6015ad8 SHA256 349d57f6da26728063ef1771e14ec2e989972a8ea20e9b31770835d3ea3627fb
 EBUILD kalarm-4.4.9.ebuild 731 RMD160 7c92c0a4520f74342f164a3fa1cacea4b7a3bab8 SHA1 40a13a3bdd48cab5602d23a8ef1885b36cf3c2e4 SHA256 5dd91cc0940f1843081574272d4de573b2fa948d589c1170ed0c44672f0b241b
 EBUILD kalarm-4.5.95.ebuild 605 RMD160 703d356b285222d1f6faee687c2762e261c311bb SHA1 5e762557c442ae3a9eb47009934a4675597d3979 SHA256 248e38d46013de56c73449331d64a65decb569dc777ad76c0b880ed5bd82d44b
-MISC ChangeLog 20358 RMD160 66b85912285b169fdf935875e9ab5b9b29c93bfe SHA1 8f263a801e0a19dedf746fd42d571b9caaf9589e SHA256 80c4182e7ec87d74b5e7af777376707af1e56656a12a74cb98e3b76d5b248bbc
+MISC ChangeLog 20568 RMD160 4f0b20035a029a2618f18452845c54e282921fd8 SHA1 22f41c3c18832329d5201aea8d70063304fcc6be SHA256 bbf1cf516ebed2ea3800d9ba8339cea2e5412c26233d925ebf026fcffffc49e4
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNuJV8AAoJENwGBM22xffeZ/QP/3pJi8wLepcPkE1LhJO4cFP+
+9rCrwIUM7nVvXjkmUZ0ecEddAlqHEQkoxzKArwBZrGTbm/Rw7jITfbSeojWYII6y
+2p7RvSf35+dmTWORzjolhk/DsBPA/Bg26WpZ+6r9zrevXwgzlxgbrRBXZxlIuHr9
+lTL5aCv2J5C/h89Lo1lrC7Oz+4+6XRFnCZaX4lqgVcY0b5Pf1fe+oHuQJZZOR7qs
+tOGr3MpG6qQl+0hvv5uUQHXCsbLyyE01zCC5UZB2+UGjvK9g+LLwHxFOEioLDONr
+xe2EXsC5Ow9vUEukcSSiYvNPiTvIj1yW+M9Vyt9U1sk3CGp6mtD/4dCwT/+vdPPL
+cIHVc55jX6zao9FkQeMhXg1fC6I/RVNBlKVIHH54TRh/hE1pYoVUngl31w1Ygiqo
+7ksOtp6jJy6R36NbIm/f1XRrMUFu6Whrkbe0yO7RFPOVRyAQM4n06ogMP5DQbU3k
+5AB5/5Z2IipGByNy1UR0G44fUu3EaeCTvDg/Hu2CP+3BXnKzZcuc0GanabeFzW0+
+yityXW5VvAJp61mwF2db/EXBuJzriThdyYAXfMRdrNbxTe5Kir0LpXO32/yATItX
+oHSWAAmT8FT6B5pvZkG2EoOepigKj0uY9EUgVu/QuNg7oGPlf3AKXcXM8wKQWQOo
+HENvbbpJfFf8hifybE8X
+=Vw5r
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch b/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch
new file mode 100644
index 000000000000..2c05d750dea7
--- /dev/null
+++ b/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch
@@ -0,0 +1,34 @@
+diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
+index cc10882..f1e8ab9 100644
+--- a/kalarm/lib/spinbox2.cpp
++++ b/kalarm/lib/spinbox2.cpp
+@@ -1,7 +1,7 @@
+ /*
+  *  spinbox2.cpp  -  spin box with extra pair of spin buttons (for Qt 3)
+  *  Program:  kalarm
+- *  Copyright © 2001-2009 by David Jarvie <djarvie@kde.org>
++ *  Copyright © 2001-2009,2011 by David Jarvie <djarvie@kde.org>
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -28,7 +28,7 @@
+ #include <QMouseEvent>
+ #include <QStyleOptionSpinBox>
+ #include <QGraphicsPixmapItem>
+-#include <QPaintEngine>
++#include <QPainter>
+ #include <QTimer>
+ #include <QFrame>
+ #include <QBrush>
+@@ -588,8 +588,9 @@ void SpinMirror::setFrame()
+ 		p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height()));
+ 		// Blot out edit field stuff from the middle of the slice
+ 		QPixmap dot = grabWidget(mMainSpinbox, QRect(x, editOffsetY, 1, 1));
+-		QPaintEngine* pe = p.paintEngine();
+-		pe->drawTiledPixmap(QRectF(0, editOffsetY, 1, height() - 2*editOffsetY), dot, QPointF(0, 0));
++		QPainter painter(&p);
++		painter.drawTiledPixmap(0, editOffsetY, 1, height() - 2*editOffsetY, dot, 0, 0);
++		painter.end();
+ 		// Horizontally fill the mirror widget with the vertical slice
+ 		p = p.scaled(size());
+ 		// Grab the left hand border of the main spinbox, and draw it into the mirror widget.
diff --git a/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild b/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild
new file mode 100644
index 000000000000..bd57f172b1ba
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild,v 1.1 2011/04/27 22:12:47 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +handbook"
+
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep libkdepim)
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+"
+
+KMEXTRACTONLY="
+	kmail/
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.4.11.1-crash.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_akonadi=OFF
+		-DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
+	)
+	kde4-meta_src_configure
+}