Added patch to compile with qt 3.3.5 from amaroK's SVN repository. Closes bug #106366.

Package-Manager: portage-2.0.52-r1

4 files changed, 55 insertions, 8 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index c78bfda83cd9..d2fba5e31041 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.72 2005/09/11 12:12:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.73 2005/09/18 16:11:29 flameeyes Exp $
+
+  18 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-qt-3.3.5.patch, amarok-1.3.1-r2.ebuild:
+  Added patch to compile with qt 3.3.5 from amaroK's SVN repository. Closes
+  bug #106366.
 
 *amarok-1.3.1-r2 (11 Sep 2005)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 6fbf72486915..65939bbe5566 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9406dd67e0250ce9756741d9fd9d9548 ChangeLog 11339
-MD5 11c3b972de9d74ea5130cf00cda9136d amarok-1.3.1-r2.ebuild 2991
+MD5 034f3464635e13ac25799107994daefe ChangeLog 11546
+MD5 55daec9c79d8d3f5247ebb8113a57512 amarok-1.3.1-r2.ebuild 3024
 MD5 81f00c356bf82789fc54bdd49f627547 amarok-1.3.1-r1.ebuild 3225
 MD5 91f47828b3a009ecbaa2ef170520aa5f amarok-1.3.ebuild 3001
 MD5 a62708867dd0a86debc654ed4ab63800 amarok-1.2.3.ebuild 2331
@@ -10,6 +10,7 @@ MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 MD5 25af04c1ed653efd29b66d9a0f2fc564 amarok-1.2.4.ebuild 2400
 MD5 2f8b18e60aedeb3c67252be88d60034d files/digest-amarok-1.3.1-r2 66
 MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
+MD5 f0419ae63b32ec21cade0de14b2c8334 files/amarok-1.3.1-qt-3.3.5.patch 1546
 MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
 MD5 ec2d8b44a6a36ca4c78da27e9c09175e files/amarok-1.3.1-gst-onlyoss.patch 1083
 MD5 2f8b18e60aedeb3c67252be88d60034d files/digest-amarok-1.3.1-r1 66
@@ -19,7 +20,7 @@ MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDJB/1j5H05b2HAEkRAsmgAJ45kR17TQHiH4zOY8tkshwT5EEHSwCaAowT
-/CHnVyfLvXC0jy3ZwDyXoX4=
-=Je1o
+iD8DBQFDLZHWj5H05b2HAEkRAjHKAJ0c14tljF+YWrFu0mC3YPm+m2WqWgCgk30S
+AQnM3Zw8l06bM4Lg/Wl+Ark=
+=nq+F
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.3.1-r2.ebuild b/media-sound/amarok/amarok-1.3.1-r2.ebuild
index 89474e5cf896..ec8329a23fc7 100644
--- a/media-sound/amarok/amarok-1.3.1-r2.ebuild
+++ b/media-sound/amarok/amarok-1.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.1-r2.ebuild,v 1.1 2005/09/11 12:12:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.1-r2.ebuild,v 1.2 2005/09/18 16:11:29 flameeyes Exp $
 
 inherit kde eutils
 
@@ -46,7 +46,8 @@ DEPEND="${DEPEND}
 
 need-kde 3.3
 
-PATCHES="${FILESDIR}/${P}-gst-alsaagain.patch"
+PATCHES="${FILESDIR}/${P}-gst-alsaagain.patch
+	${FILESDIR}/${P}-qt-3.3.5.patch"
 
 pkg_setup() {
 	if use arts && ! use xine && ! use gstreamer; then
diff --git a/media-sound/amarok/files/amarok-1.3.1-qt-3.3.5.patch b/media-sound/amarok/files/amarok-1.3.1-qt-3.3.5.patch
new file mode 100644
index 000000000000..006656beafbf
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.3.1-qt-3.3.5.patch
@@ -0,0 +1,40 @@
+Index: amarok/src/Options7.ui
+===================================================================
+--- amarok/src/Options7.ui	(revision 460630)
++++ amarok/src/Options7.ui	(revision 460631)
+@@ -74,7 +74,4 @@
+     </image>
+ </images>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>dbsetup.h</includehint>
+-</includehints>
+ </UI>
+Index: amarok/src/podcastsettingsbase.ui
+===================================================================
+--- amarok/src/podcastsettingsbase.ui	(revision 460630)
++++ amarok/src/podcastsettingsbase.ui	(revision 460631)
+@@ -141,7 +141,7 @@
+                         <cstring>pushButton_ok</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>O&amp;K</string>
++                        <string>&amp;OK</string>
+                     </property>
+                     <property name="autoDefault">
+                         <bool>true</bool>
+Index: amarok/src/firstrunwizard.ui
+===================================================================
+--- amarok/src/firstrunwizard.ui	(revision 460630)
++++ amarok/src/firstrunwizard.ui	(revision 460631)
+@@ -490,10 +490,5 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+     <includehint>kactivelabel.h</includehint>
+-    <includehint>kactivelabel.h</includehint>
+-    <includehint>kactivelabel.h</includehint>
+-    <includehint>kactivelabel.h</includehint>
+-    <includehint>dbsetup.h</includehint>
+-    <includehint>kactivelabel.h</includehint>
+ </includehints>
+ </UI>