diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-09-18 16:11:29 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-09-18 16:11:29 +0000 |
| commit | aba0f418dbb76e05bcde63ea33bc8e2e183212d0 (patch) | |
| tree | 526a3bdfbb8ec694cfe574f1f183799951e5b19a /media-sound | |
| parent | trim whitespace (diff) | |
| download | gentoo-2-aba0f418dbb76e05bcde63ea33bc8e2e183212d0.tar.gz gentoo-2-aba0f418dbb76e05bcde63ea33bc8e2e183212d0.tar.bz2 gentoo-2-aba0f418dbb76e05bcde63ea33bc8e2e183212d0.zip | |
Added patch to compile with qt 3.3.5 from amaroK's SVN repository. Closes bug #106366.
(Portage version: 2.0.52-r1)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/amarok/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-1.3.1-r2.ebuild | 5 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-1.3.1-qt-3.3.5.patch | 40 |
3 files changed, 49 insertions, 3 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/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&K</string> ++ <string>&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> |