Disable static qt plugins wrt bug #311343

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 41 insertions, 5 deletions

diff --git a/media-gfx/wally/ChangeLog b/media-gfx/wally/ChangeLog
index 9f58324ce8ff..52478bc78bc2 100644
--- a/media-gfx/wally/ChangeLog
+++ b/media-gfx/wally/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/wally
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/ChangeLog,v 1.24 2010/03/23 19:09:53 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/ChangeLog,v 1.25 2010/04/19 14:44:48 hwoarang Exp $
+
+  19 Apr 2010; Markos Chandras <hwoarang@gentoo.org> wally-2.3.2.ebuild,
+  +files/wally-2.3.2-disable-plugins.patch:
+  Disable static qt plugins wrt bug #311343
 
 *wally-2.3.2 (23 Mar 2010)
 
diff --git a/media-gfx/wally/Manifest b/media-gfx/wally/Manifest
index 760793a625f6..7e21287bb459 100644
--- a/media-gfx/wally/Manifest
+++ b/media-gfx/wally/Manifest
@@ -1,10 +1,11 @@
 AUX wally-2.2.0-disable-kde4.patch 590 RMD160 eaf5b5a13824fabf57d858458bb9bb73182cf355 SHA1 327978c475a82f90577935e5a263a2a7661b87fa SHA256 240e98a4ac8bebaeb482606fd8fd9c491d7a24365afec81bceae193b890234ab
 AUX wally-2.2.0-disable_popup.patch 665 RMD160 7d4f3c522f5d4cbc517a7f5797df409f2c63b804 SHA1 b2307573e7f8f5be0eda142c46dff08a1a20d0ff SHA256 0371330a3caea92ef7ce024648ee865bae9167126d75a2ca1c43648c99ef9422
+AUX wally-2.3.2-disable-plugins.patch 582 RMD160 ac221d74cd5839ca024985a02108f409c36c5f27 SHA1 eba77db0e19c8d8a247583a29abac3d5ae04a862 SHA256 1283fb1a2cdcdced82b603502ce951943cab94f9245212b65269ab7a221d2d72
 DIST wally-2.3.0.tar.gz 1317692 RMD160 4180ce98aaebac621e4564b1b2d9f491f524046c SHA1 b1b21bc32f7bbb894c460f7bd75d261a47d0e2f9 SHA256 1c8bd335475838f5a5912ffaf62fd997ca1909d337edc346e13101a82ee0f1ea
 DIST wally-2.3.1.tar.gz 1345719 RMD160 0bfbc2c82fd15ac6713a51c1c074a7233e4a7f7e SHA1 f15e3ae832a8a5218e6aaa91257be7df2ac0acf7 SHA256 d3b952dbec7342d93d9de69f869ea52c6960e18a78e45055f031630e5250e63a
 DIST wally-2.3.2.tar.gz 1377912 RMD160 eccd7ca2b8268b185679d083ccd2ad935466396a SHA1 a41e157ff059178b6db3b9b1e2292680d6b6d9dc SHA256 cb30b0e1beb00b944dd293166a31ae88603167a4f9c9ac3a5ea5d0b669a2905d
 EBUILD wally-2.3.0.ebuild 1026 RMD160 0a8a1b6d59c301ebed433bd62dafa82526af6076 SHA1 ee2c5e7a45a789cb2bf3e50be3655f56effd2492 SHA256 c2dacba03e66af3f25985a4f9fae511333e8cae73c144eb8445dc868d9ba4769
 EBUILD wally-2.3.1.ebuild 1030 RMD160 125600d442f3eda5f3bb75a849c4794518e7c5eb SHA1 3dffa685288f310ca2bebf2907c4b0ff004ca8bc SHA256 6fa8a02572c72d84bb796d499209729e1cdd7ec67f8cb0961a52fbecc1a29858
-EBUILD wally-2.3.2.ebuild 1069 RMD160 cbc9635f2c1bfe39a7723f3aeafa9be9fa89b25c SHA1 15f57425211876121c280fc0017c61cbd663ae0e SHA256 ca58dcf2eae7b6db80afa921666d800aa8c87b2f0a733f746135c63cebeaa7d4
-MISC ChangeLog 3535 RMD160 02a9424356215640caa60322b1e651dd5caf860e SHA1 11bec664a9ae8cb99fecd8487e6f714d37f45d45 SHA256 c5ba379e02a2edf0577a3ce2b277910946a192ad949e6207793b2817cbc095e7
+EBUILD wally-2.3.2.ebuild 1209 RMD160 daa73f40e94783ff2da9bfbdeb30ad7317c8deb4 SHA1 29548981da7cf06dcb555c5c55273ec852c45836 SHA256 157276fe85fb4b0af1e5baabdc9eb984139700f7c7ea715580e443927be2b7ec
+MISC ChangeLog 3699 RMD160 7814cadd0ef44cc20d6fd0d55ac22a3bdc1b6e8f SHA1 65d7c6d931974b6b77d57d2434cc8d6f1dc6cdc2 SHA256 55fad627e1226106a19c1cf2b3806a6ef3c9bc33d0b89a937eb665fdf973cdc0
 MISC metadata.xml 276 RMD160 2f8c5d19292f59d08b397664c291a31066e3a95f SHA1 ad5320be3daeac9428333e9f26d381ac1be35595 SHA256 7711ca05305ebb1418d3e1ccad7ddf39f92f94a982c8f72dcd6bb424032c2e08
diff --git a/media-gfx/wally/files/wally-2.3.2-disable-plugins.patch b/media-gfx/wally/files/wally-2.3.2-disable-plugins.patch
new file mode 100644
index 000000000000..a187a93650b5
--- /dev/null
+++ b/media-gfx/wally/files/wally-2.3.2-disable-plugins.patch
@@ -0,0 +1,23 @@
+Index: wally-2.3.2/src/main.cpp
+===================================================================
+--- wally-2.3.2.orig/src/main.cpp
++++ wally-2.3.2/src/main.cpp
+@@ -17,18 +17,6 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
+-#if (!defined(QT_SHARED)) && (!defined(QT_DLL))
+-  #include <QtPlugin>
+-
+-  Q_IMPORT_PLUGIN(qgif)
+-  Q_IMPORT_PLUGIN(qico)
+-  Q_IMPORT_PLUGIN(qjpeg)
+-  Q_IMPORT_PLUGIN(qmng)
+-  Q_IMPORT_PLUGIN(qsvg)
+-  Q_IMPORT_PLUGIN(qtiff)
+-  Q_IMPORT_PLUGIN(qsqlite)
+-#endif
+-
+ #include <QTimer>
+ #include <QMessageBox>
+ 
diff --git a/media-gfx/wally/wally-2.3.2.ebuild b/media-gfx/wally/wally-2.3.2.ebuild
index b50ff0ba9eb1..e2da5672f6e8 100644
--- a/media-gfx/wally/wally-2.3.2.ebuild
+++ b/media-gfx/wally/wally-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.3.2.ebuild,v 1.2 2010/03/23 20:35:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.3.2.ebuild,v 1.3 2010/04/19 14:44:48 hwoarang Exp $
 
 EAPI="2"
 KDE_REQUIRED="optional"
@@ -20,13 +20,21 @@ DEPEND="media-libs/libexif
 	kde? (	>=kde-base/kdelibs-4.2.0 )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.0-disable_popup.patch" )
+PATCHES=( 
+	"${FILESDIR}/${PN}-2.2.0-disable_popup.patch" 
+	"${FILESDIR}/${P}-disable-plugins.patch"
+)
 
 src_prepare() {
 	kde4-base_src_prepare
 	use kde || epatch "${FILESDIR}/${PN}-2.2.0-disable-kde4.patch"
 }
 
+src_configure() {
+	mycmakeargs="${mycmakeargs} -DSTATIC=FALSE"
+	cmake-utils_src_configure
+}
+
 src_install() {
 	cmake-utils_src_install
 	newicon "${S}"/res/images/idle.png wally.png || die