Fix deps, add patch and keyword for ~ppc-macos, bug #353362

Package-Manager: portage-2.2.01.18252-prefix/cvs/Darwin powerpc

4 files changed, 51 insertions, 21 deletions

diff --git a/media-libs/phonon-qt7/ChangeLog b/media-libs/phonon-qt7/ChangeLog
index 79472668c16f..43e52e8b35f9 100644
--- a/media-libs/phonon-qt7/ChangeLog
+++ b/media-libs/phonon-qt7/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/phonon-qt7
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-qt7/ChangeLog,v 1.1 2011/04/24 18:45:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-qt7/ChangeLog,v 1.2 2011/04/25 14:45:44 grobian Exp $
+
+  25 Apr 2011; Fabian Groffen <grobian@gentoo.org>
+  phonon-qt7-0_pre20110424.ebuild,
+  +files/phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch:
+  Fix deps, add patch and keyword for ~ppc-macos, bug #353362
 
 *phonon-qt7-0_pre20110424 (24 Apr 2011)
 
diff --git a/media-libs/phonon-qt7/Manifest b/media-libs/phonon-qt7/Manifest
index db8c1db9c79c..e792276e7026 100644
--- a/media-libs/phonon-qt7/Manifest
+++ b/media-libs/phonon-qt7/Manifest
@@ -1,25 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch 941 RMD160 cec0dcd2ede11a9d22ec73a0a2cf33ca83384932 SHA1 431f390fd5ecb7c5b6cccb4d0cb70be1436f7dd3 SHA256 78117c305bb2bdd9bcae7879c3e7775e86b9ca4fda98c07a3fa2e5500a3b7158
 AUX phonon-qt7-noshow.patch 493 RMD160 061a367fb2158e9079782bf46e5ad6fec98b9bd0 SHA1 3c41718e1af95c0884d9f994c021d15d990fc8df SHA256 3d3c82cba91f324b9eb4c1b198289114ac4a6797d3a46887d16888d4ee194109
 DIST phonon-qt7-0_pre20110424.tar.bz2 54610 RMD160 147df9ee0446a02b08bea2695c331b66bd6db128 SHA1 7f91bbbb4ef6baac33e2154d1b3df8d77165b233 SHA256 c8a96c3053a534ec8e33e105a861a846b8f970f1583ec4054ff046d6785d5cbd
-EBUILD phonon-qt7-0_pre20110424.ebuild 728 RMD160 2bcea47eac97f8f2153103d0ad146c014571bc2a SHA1 039eba17455c6c73c231131cdeb54e57f4849b61 SHA256 73749d967b23cb931362c6d44c1cff753b97bca50dbe8b2b7520fd6f69dde885
-MISC ChangeLog 452 RMD160 abed95cb4813ca173e0ee652c14c471939ae933d SHA1 862638c58367ed198b62e3045009e83b77b1b214 SHA256 7bd65a256a8d978ddfbc0a16a9ad33f3b7f83ac4b23c40298c87293b647b6006
+EBUILD phonon-qt7-0_pre20110424.ebuild 910 RMD160 75eea68327d0fb5743b9bbe0fb467695afa6134e SHA1 b9f7834c3a5c78b6380a380b241440e8a752b56c SHA256 ccf531fc684c05287f70a87b2b8f600a0659dbf456b77ff2607753557baf5395
+MISC ChangeLog 661 RMD160 412a56edf7e0c2b44b7a7641d59ab57d09f5a08f SHA1 8e5d92f9777bf03d10164268b937d1d36f8295db SHA256 e2ec332a140ee80b22a8f1449fd08959da6b02417ff562ac069344cdcfdc2e80
 MISC metadata.xml 176 RMD160 ffd4ac71b91e8ae93d8a7708b110ec7e694e48b2 SHA1 c20c18c2ba3549112f1d929f619806e2dcfff802 SHA256 9be4ccb3ec1d6ec7ac39ded75b341d31f009615102de5ca25dc2bab8f6c21ec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.17 (Darwin)
 
-iQIcBAEBCgAGBQJNtHB6AAoJENwGBM22xffegW0QAJB9GX/2kc0LVBw2S0GMlYIG
-ioyFAGqxWV0tNcmNVxYPZODMaLuFATkZ8L8LKLc0kI8p5cNoxXZ08irq0FckSdfK
-wnLLUXa4F3K05dgrdfVNaiVpc/FeDrQPbIgWfsEN2/584lfFWTPR24h0ag1AtPcw
-UuTZfBJh66Nw2M5lf0QbNzAh8OpcpMfsM8uUxU9BBb7Kg2etegWNKh9se9ekPxhx
-++8KwvkmNDs9sXm6bEX01vo326ST0s0CbYR6kRg5q+teagzLVkmndIlxXvhAXuMb
-c4MMRGoYMdU4asQhvMdEdfXi2TYVoZI++WumD3Wwy9ip6/HRAuwgHZn48nmYUWGe
-eh8jevMeNCd9kQNs1MxgzQm+2AB4kIjJEm25Qofy0sey7JLVQg+LjxhNzb7/KXHm
-EqxvU0Lh4+61WL6iOu5LlZvP8zZitoG6saDZ2f1wrWO3Cswm9uopkPUlYQR2IW2H
-MOJIYBiITTkSEao+uFMUZO9iUSZO8irDzZaMnEZx47m4UqNhMHXtQsHeQdeBk+qz
-Pgl4Uis+RMLUb0owxRaEadScjajsv6TQX7F//QIuLrKpYsYJGANLOomapqXruY/m
-gxZbZ/RpDRdZdu2XypLbsLgYnvyP61bBICI2gkcZU1Bold2NxVDTW6s5hmmkbLwU
-1ym7Jveuh3ORv6p19rCw
-=itqU
+iEYEARECAAYFAk21iRoACgkQX3X2B8XHTong3wCeLHeC6Ad/6ZbGqco7zCbcUbVf
+xbcAnjjb9TVTxP1N1xGAaTws37Lui1i9
+=AqbU
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch b/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch
new file mode 100644
index 000000000000..ae222027b892
--- /dev/null
+++ b/media-libs/phonon-qt7/files/phonon-qt7-0_pre20110424-QWidget-cast-dynamic.patch
@@ -0,0 +1,28 @@
+Revert commit:
+
+commit b22b86f6940d2605e78398eca4ae05c3ea44a92c
+Author: Ritt Konstantin <ritt.ks@gmail.com>
+Date:   Thu Jun 10 07:38:14 2010 +0400
+
+    fix build with -fno-rtti
+    
+    m_renderDrawWidget object inherits QWidget and can be safely static_cast-ed
+
+as it yields in:
+
+error: invalid static_cast from type ‘Phonon::QT7::IVideoRenderDrawWidget*’ to type ‘QWidget*’
+
+
+diff --git a/qt7/videowidget.mm b/qt7/videowidget.mm
+index 736dcdf..e471140 100644
+--- a/qt7/videowidget.mm
++++ b/qt7/videowidget.mm
+@@ -578,7 +578,7 @@ public:
+                 PhononAutoReleasePool pool;
+                 updateDrawFrameRect();
+                 if (m_renderDrawWidget)
+-                    static_cast<QWidget *>(m_renderDrawWidget)->resize(size());
++                    dynamic_cast<QWidget *>(m_renderDrawWidget)->resize(size());
+                 break; }
+             case QEvent::Paint:{
+                 PhononAutoReleasePool pool;
diff --git a/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild b/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild
index d4dc72962f76..89da6f076c59 100644
--- a/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild
+++ b/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild,v 1.1 2011/04/24 18:45:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-qt7/phonon-qt7-0_pre20110424.ebuild,v 1.2 2011/04/25 14:45:44 grobian Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-quicktime"
 SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-KEYWORDS=""
+KEYWORDS="~ppc-macos"
 SLOT="0"
 IUSE="debug"
 
@@ -19,10 +19,16 @@ RDEPEND=">=media-libs/phonon-4.5"
 DEPEND="${RDEPEND}
 	>=dev-util/automoc-0.9.87
 	dev-util/pkgconfig
+	media-libs/opengl-apple
+	sys-devel/gcc-apple[objc]
 "
 
 # needs OpenGL, how do I specify this properly?
+# I just depended on opengl-apple, hope this is what you meant -- grobian
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=( "${FILESDIR}/${PN}-noshow.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-noshow.patch"
+	"${FILESDIR}"/${P}-QWidget-cast-dynamic.patch
+)