Fix building with x11-libs/qt-gui >= 4.8.0 wrt #415551 by Paweł Hajdan, Jr.

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

4 files changed, 53 insertions, 8 deletions

diff --git a/games-puzzle/kmagnet/ChangeLog b/games-puzzle/kmagnet/ChangeLog
index cff42efd2738..81e965f87af6 100644
--- a/games-puzzle/kmagnet/ChangeLog
+++ b/games-puzzle/kmagnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/kmagnet
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kmagnet/ChangeLog,v 1.11 2011/04/11 14:16:43 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kmagnet/ChangeLog,v 1.12 2012/05/12 10:10:11 ssuominen Exp $
+
+  12 May 2012; Samuli Suominen <ssuominen@gentoo.org> kmagnet-0.10.ebuild,
+  +files/kmagnet-0.10-qt48.patch:
+  Fix building with x11-libs/qt-gui >= 4.8.0 wrt #415551 by Paweł Hajdan, Jr.
 
   11 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> kmagnet-0.10.ebuild:
   x86 stable wrt bug #360717
diff --git a/games-puzzle/kmagnet/Manifest b/games-puzzle/kmagnet/Manifest
index 2b52a3006c72..117a4d98bba8 100644
--- a/games-puzzle/kmagnet/Manifest
+++ b/games-puzzle/kmagnet/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kmagnet-0.10-qt48.patch 712 RMD160 eda28e59b31651fac360508652ef49cca6128c56 SHA1 16e43bd11ba20890a53d7723955431381ea922e9 SHA256 61ed838ec0967825316fd312470ad5b2b7cd41036a55085fba33199fa380956a
 DIST 109111-kmagnet-0.10.tar.bz2 272473 RMD160 6374142dc037981ec8a5136961039daae865766e SHA1 3e92c7992c03629a1995eeaeb174c9ddfd38e423 SHA256 91aaec76ebbc7983ae23110e1d739e1a25e16dd46a5cb629747a5de0be29f372
-EBUILD kmagnet-0.10.ebuild 659 RMD160 735e6341e1b20dfda1954165aa0761da6fad6b28 SHA1 a65f152e9f50c6658db53e51da9ba75b689c5c50 SHA256 f045a0df4da1a5675a78f8f66ab1480e7de521173a306c81796d6f6037dacb45
-MISC ChangeLog 1499 RMD160 cbd41c05e10557fc2cfb77290600f0a6d58db835 SHA1 ba52d473d613d25841c82b92af05d03b88087935 SHA256 a080508cab86bb35be22820fcd4fc671651cda8d4f51078492019862aa64231c
+EBUILD kmagnet-0.10.ebuild 713 RMD160 890ec35c89893b1975d85fa6a458b5c664d8290a SHA1 6a4913c3a978a5189477216e19a07b5c5aed975d SHA256 8f1c34da1a872061131d723b0095ca886be3434b2584d57e354be9ae7ffa8088
+MISC ChangeLog 1687 RMD160 fe3a44f0df841873ef7d02e1c83299c68e41a7a7 SHA1 75124c9a4bd3a3800a950bcf3d3bf0009ffe2c22 SHA256 25bf973c1bb7673c9f340dd0b56edce60a4fc9d525aa33ea6ee25820dfe2888c
 MISC metadata.xml 175 RMD160 95619d0a2c99b495157a2cf824e9a95371476128 SHA1 f35dd6e8c834b70c7c6edadd9bf343b75f4ffa92 SHA256 206440b9e5ceb13a519ea89be410c33480c2ffef073ae4145bc7084d50a691f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPrjZKAAoJEEdUh39IaPFNPoIH/1Xbl7ZsjGiMTVAXDoXCbDoE
+7Qxk/euBJQO1qllsrtzUwMEFcChjHSuv8zdRWjxcQ8/HYvPV4oMg8W4+81wy5y6w
+j97S+Ea+lhxaGRoCC3JKSvOsJlKFHl/MFQnuO5g6wdvRERcMVoIFFvQOuOG66qmw
+QWtbruwNmkGZHs4QrmEDtT6iItgreEzEBecYyJbFJdF4sk5M0cYTseu+zmQFktad
+zfH9X3B5/IUEaR2P6ohvrLerFYmUXuQqLkBS/VAjWQZx3diF0SnNskdyxbuQLYXR
+TqgbaL9P4mTlTvoGAwppSBWIgAOX2araB7SMXQfHqg/QC8d0xDrSsIySrgFOk0A=
+=7pA9
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/kmagnet/files/kmagnet-0.10-qt48.patch b/games-puzzle/kmagnet/files/kmagnet-0.10-qt48.patch
new file mode 100644
index 000000000000..763ed3ed3b67
--- /dev/null
+++ b/games-puzzle/kmagnet/files/kmagnet-0.10-qt48.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/415551
+
+--- src/kmagnetscene.cpp
++++ src/kmagnetscene.cpp
+@@ -160,9 +160,9 @@
+     uint pos=nm.getPosition();
+     if (mov==Moves::UP || mov==Moves::DOWN)
+     {
+-        dist=abs(pos-currentPosition)/COLUMNS;
++        dist=qAbs(pos-currentPosition)/COLUMNS;
+     } else {
+-        dist=abs(pos%ROWS-currentPosition%ROWS);
++        dist=qAbs(pos%ROWS-currentPosition%ROWS);
+     }
+     QTimeLine *timer = new QTimeLine (Settings::animationTime()+dist*10,this);//Settings::animationTime(), this );//better use heap?
+     signalMapper->setMapping(timer,currentPosition+pos*1000);
+@@ -465,4 +465,4 @@
+         text.append("-");
+     }
+     qDebug() << text;
+-}
+\ No newline at end of file
++}
diff --git a/games-puzzle/kmagnet/kmagnet-0.10.ebuild b/games-puzzle/kmagnet/kmagnet-0.10.ebuild
index ea3b00fcd509..2095b7af323a 100644
--- a/games-puzzle/kmagnet/kmagnet-0.10.ebuild
+++ b/games-puzzle/kmagnet/kmagnet-0.10.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kmagnet/kmagnet-0.10.ebuild,v 1.3 2011/04/11 14:16:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kmagnet/kmagnet-0.10.ebuild,v 1.4 2012/05/12 10:10:11 ssuominen Exp $
 
-EAPI=3
+EAPI=4
+KDE_HANDBOOK=optional
 KDE_LINGUAS="ca cs"
 inherit kde4-base
 
@@ -13,7 +14,7 @@ SRC_URI="http://www.kde-apps.org/CONTENT/content-files/109111-${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="4"
 KEYWORDS="amd64 x86"
-IUSE="debug +handbook"
+IUSE="debug"
 
 DEPEND="
 	$(add_kdebase_dep libkdegames)
@@ -22,3 +23,5 @@ DEPEND="
 RDEPEND=${DEPEND}
 
 DOCS="AUTHORS ChangeLog README TODO"
+
+PATCHES=( "${FILESDIR}"/${P}-qt48.patch )