Bug 23535 – xmms-1.2.7-r22 russian charset patch fails

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Jeff Ames 2003-06-26 09:28:50 UTC]

When trying to emerge xmms-1.2.7-r22 (from xmms-1.2.7-r21), applying the
xmms-russian-charset.patch fails, looks like a wrong -p option.  epatch
output in attached file.

Changing the ebuild to patch -p1 < ${FILESDIR}/xmms-russian-charset.patch
moves things along a little, but there is a hunk that fails:

patching file Input/mpg123/fileinfo.c
Hunk #1 succeeded at 26 with fuzz 2 (offset 4 lines).
Hunk #2 FAILED at 50.
Hunk #3 succeeded at 230 (offset 12 lines).
Hunk #4 succeeded at 263 (offset 12 lines).
Hunk #5 succeeded at 280 (offset 12 lines).
Hunk #6 succeeded at 426 (offset 12 lines).
Hunk #7 succeeded at 445 (offset 12 lines).
Hunk #8 succeeded at 461 (offset 12 lines).
1 out of 8 hunks FAILED -- saving rejects to file Input/mpg123/fileinfo.c.rej
patching file Input/mpg123/mpg123.c
Hunk #1 succeeded at 577 (offset 23 lines).
Hunk #2 succeeded at 631 (offset 50 lines).
patching file Input/vorbis/vorbis.c
patching file libxmms/charset_auto_russian.h
patching file libxmms/charset.c
patching file libxmms/charset_config.h
patching file libxmms/charset.h
patching file libxmms/Makefile.am
patching file libxmms/Makefile.in
patching file libxmms/titlestring.c
patching file xmms/charset.c
patching file xmms/charset.h
patching file xmms/input.c
patching file xmms/main.c
Hunk #8 succeeded at 3429 (offset 19 lines).
patching file xmms/main.h
patching file xmms/Makefile.am
patching file xmms/Makefile.in
patching file xmms/playlist.c
patching file xmms/playlist.h
patching file xmms/playlist_list.c
patching file xmms/playlistwin.c
patching file xmms/prefswin.c

---

# emerge info

Portage 2.0.48-r1 (default-x86-1.4, gcc-3.2.3, glibc-2.3.2-r1)
=================================================================
System uname: 2.4.21 i686 Intel(R) Pentium(R) III Mobile CPU      1200MHz
GENTOO_MIRRORS="http://gentoo.oregonstate.edu http://distro.ibiblio.org/pub/Linu
          
x/distributions/gentoo"
CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/confi
          
g /usr/kde/3/share/config /usr/X11R6/lib/X11/xkb /usr/share/texmf/tex/generic/co
          
nfig/ /usr/share/texmf/tex/platex/config/"
CONFIG_PROTECT_MASK="/etc/gconf /etc/env.d"
PORTDIR="/usr/portage"
DISTDIR="/usr/portage/distfiles"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR_OVERLAY="/usr/local/portage"
USE="x86 oss avi crypt cups encode gif jpeg libg++ mikmod mmx mpeg ncurses nls p
          
dflib png quicktime spell truetype xml2 xmms xv zlib gdbm berkdb slang readline
           
aalib bonobo svga java X sdl gpm tcpd pam libwww ssl perl python imlib oggvorbis
          
 gtk qt opengl gphoto2 cdr cjk canna -apm acpi -alsa -3dnow -arts -kde -gnome di
          
rectfb dvd -esd fbcon mozilla pcmcia plotutils samba sse tcltk tetex tiff -motif
          
 imap dga gtk2 xml"
COMPILER="gcc3"
CHOST="i686-pc-linux-gnu"
CFLAGS="-march=pentium3 -O3 -pipe"
CXXFLAGS="-march=pentium3 -O3 -pipe"
ACCEPT_KEYWORDS="x86 ~x86"
MAKEOPTS="-j2"
AUTOCLEAN="yes"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
FEATURES="sandbox ccache"

[Comment 1 Jeff Ames 2003-06-26 09:30:33 UTC]

Created attachment 13898 [details]
epatch output

[Comment 2 Christopher Rude 2003-06-27 02:24:58 UTC]

me too ;) 
 
 

[Comment 3 Martin Holzer (RETIRED) 2003-06-27 03:42:56 UTC]

*** Bug 23551 has been marked as a duplicate of this bug. ***

[Comment 4 rob holland (RETIRED) 2003-06-27 05:45:11 UTC]

should be fixed now, thanks for reporting it :)