diff options
| author |   Rob Holland <tigger@gentoo.org> | 2003-06-27 12:38:19 +0000 |
|---|---|---|
| committer | Rob Holland <tigger@gentoo.org> | 2003-06-27 12:38:19 +0000 |
| commit | 1bbbb2dfa75f26cd88194bb00718b13462843a18 (patch) | |
| tree | c81f810ad1b7e00ec05330fa1ed191f9017a1ac3 /media-sound | |
| parent | initial import (diff) | |
| download | historical-1bbbb2dfa75f26cd88194bb00718b13462843a18.tar.gz historical-1bbbb2dfa75f26cd88194bb00718b13462843a18.tar.bz2 historical-1bbbb2dfa75f26cd88194bb00718b13462843a18.zip | |
Fixed overlapping patches. Closes bug #23535. Thanks to jje :)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/xmms/ChangeLog | 5 | ||||
| -rw-r--r-- | media-sound/xmms/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/xmms/xmms-1.2.7-r22.ebuild | 9 |
3 files changed, 11 insertions, 7 deletions
diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog index 561160f60eb8..2ae1bcbf852e 100644 --- a/media-sound/xmms/ChangeLog +++ b/media-sound/xmms/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/xmms # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.51 2003/06/26 11:16:36 robh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.52 2003/06/27 12:36:27 robh Exp $ + + 27 Jun 2003; robh <robh@gentoo.org> xmms-1.2.7-r22.ebuild: + Fixed russian cjk patch overlap. Fixes bug #23535. Thanks to jje :) 26 June 2003; <robh@gentoo.org> xmms-1.2.7-r22.ebuild: Added support for Russian Charset. Thanks to Sergey Kuleshov. Closes #22194 diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest index 0b78a92e62dc..3ee572a6f68e 100644 --- a/media-sound/xmms/Manifest +++ b/media-sound/xmms/Manifest @@ -1,7 +1,7 @@ MD5 5618f4d14fd98b813b7be2b4df0087e7 xmms-1.2.7-r21.ebuild 4830 MD5 e0a84ac531726e6b9cac5c9a227d32e6 xmms-1.2.7-r20.ebuild 4839 -MD5 0d7f987bfad682a9d3192ebd25b8160b xmms-1.2.7-r22.ebuild 4907 -MD5 05b415be2ca9875af0b5e7801c810078 ChangeLog 9583 +MD5 90740c69a0e1cdd3a65b037af5fe8a5a xmms-1.2.7-r22.ebuild 4989 +MD5 ce2d3a304b281703347859d1c5da3199 ChangeLog 9849 MD5 e7e0c91780b115aaad1a1ed534bf7ae8 files/xmms-ipv6-20020408-mmx.patch 9210 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r20 130 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r21 130 diff --git a/media-sound/xmms/xmms-1.2.7-r22.ebuild b/media-sound/xmms/xmms-1.2.7-r22.ebuild index 050b176cf0ec..9bf52f387d25 100644 --- a/media-sound/xmms/xmms-1.2.7-r22.ebuild +++ b/media-sound/xmms/xmms-1.2.7-r22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r22.ebuild,v 1.1 2003/06/26 11:14:13 robh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r22.ebuild,v 1.2 2003/06/27 12:36:27 robh Exp $ inherit libtool flag-o-matic eutils filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE @@ -67,8 +67,12 @@ src_unpack() { fi # Patch for mpg123 to convert Japanese character code of MP3 tag info + # the Japanese patch and the Russian one overlap, so its one or the other if use cjk; then epatch ${FILESDIR}/${P}-mpg123j.patch + else + # add russian charset support + epatch ${FILESDIR}/xmms-russian-charset.patch fi if [ ! -f ${S}/config.rpath ] ; then @@ -76,9 +80,6 @@ src_unpack() { chmod +x ${S}/config.rpath fi - # add russian charset support - epatch ${FILESDIR}/xmms-russian-charset.patch - # We run automake and autoconf here else we get a lot of warning/errors. # I have tested this with gcc-2.95.3 and gcc-3.1. elibtoolize |