When I try to emerge xfree-4.2.1-r2, it fails while trying to apply the patch 013_all_4.2.1-ati-r128-dri-dga.patch.bz2. The last screen of output of emerge is: >>> Checking glide3-headers.tar.bz2's mtime... >>> Checking andale32.exe's mtime... >>> Checking arial32.exe's mtime... >>> Checking arialb32.exe's mtime... >>> Checking comic32.exe's mtime... >>> Checking courie32.exe's mtime... >>> Checking georgi32.exe's mtime... >>> Checking impact32.exe's mtime... >>> Checking times32.exe's mtime... >>> Checking trebuc32.exe's mtime... >>> Checking verdan32.exe's mtime... >>> Checking webdin32.exe's mtime... >>> Not marked as unpacked; recreating WORKDIR... >>> Unpacking source... >>> Unpacking X420src-1.tgz to /var/tmp/portage/xfree-4.2.1-r2/work >>> Unpacking X420src-2.tgz to /var/tmp/portage/xfree-4.2.1-r2/work >>> Unpacking X420src-3.tgz to /var/tmp/portage/xfree-4.2.1-r2/work >>> Unpacking fcpackage.2_1.tar.gz to /var/tmp/portage/xfree-4.2.1-r2/work >>> Unpacking XFree86-4.2.1-patches-1.2.tar.bz2 to /var/tmp/portage/xfree-4.2.1- r2/work * Updating 4.2.0 sources to 4.2.1... [ ok ] * Updating [ ok ] * Applying various patches (bugfixes/updates)... * 001_all_4.2.1-xf-4_2-branch-20021008.patch.bz2... [ ok ] * 002_all_4.2.0-xtermresources.patch.bz2... [ ok ] * 003_all_4.0-broken-includes.patch.bz2... [ ok ] * 004_all_4.2.0-apm-driver-update-cvs-20020617.patch.bz2... [ ok ] * 005_all_4.2.0-ark-driver-update-cvs-20020617.patch.bz2... [ ok ] * 006_all_4.2.0-ati-mach64-rage-XL.patch.bz2... [ ok ] * 007_all_4.2.0-xft-leak.patch.bz2... [ ok ] * 008_all_4.2.0-ati-old-LX-card-fix.patch.bz2... [ ok ] * 009_all_4.2.0-ati-mach64-dsp-rounding-error.patch.bz2... [ ok ] * 010_all_4.2.0-ati-r128-indirectBuffer.patch.bz2... [ ok ] * 011_all_4.2.0-ati-r128-Xv-dma-fix.patch.bz2... [ ok ] * 012_all_4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2... [ ok ] * 013_all_4.2.1-ati-r128-dri-dga.patch.bz2... * Failed Patch: 013_all_4.2.1-ati-r128-dri-dga.patch.bz2! * * Include in your bugreport the contents of: * * /var/tmp/portage/xfree-4.2.1-r2/temp/013_all_4.2.1-ati-r128-dri- dga.patch.bz2-16592.out !!! ERROR: x11-base/xfree-4.2.1-r2 failed. !!! Function epatch, Line 321, Exitcode 0 !!! Failed Patch: 013_all_4.2.1-ati-r128-dri-dga.patch.bz2! The contents of 013_all_4.2.1-ati-r128-dri-dga.patch.bz2-16592.out are: ***** 013_all_4.2.1-ati-r128-dri-dga.patch.bz2 ***** ==================================================== PIPE_COMMAND: bzip2 -dc /var/tmp/portage/xfree-4.2.1- r2/work/patch//013_all_4.2.1-ati-r128-dri-dga.patch.bz2 > /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch PATCH COMMAND: patch -p0 < /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch ==================================================== can't find file to patch at input line 13 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Patch courtesy of Michel Daenzer which fixes a bug on the Radeon and |Rage 128 which occurs while using VMware with DGA while DRI is enabled. | |I've split the patch into 2 separate patches, one for each driver. | |Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c |=================================================================== |RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c,v |retrieving revision 1.6 |diff -p -u -r1.6 r128_dga.c |--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c 27 Jan 2002 20:05:30 -0000 1.6 |+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c 8 Sep 2002 14:47:04 -0000 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ==================================================== PIPE_COMMAND: bzip2 -dc /var/tmp/portage/xfree-4.2.1- r2/work/patch//013_all_4.2.1-ati-r128-dri-dga.patch.bz2 > /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch PATCH COMMAND: patch -p1 < /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch ==================================================== patching file programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c Hunk #1 FAILED at 217. 1 out of 1 hunk FAILED -- saving rejects to file programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c.rej ==================================================== PIPE_COMMAND: bzip2 -dc /var/tmp/portage/xfree-4.2.1- r2/work/patch//013_all_4.2.1-ati-r128-dri-dga.patch.bz2 > /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch PATCH COMMAND: patch -p2 < /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch ==================================================== can't find file to patch at input line 13 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Patch courtesy of Michel Daenzer which fixes a bug on the Radeon and |Rage 128 which occurs while using VMware with DGA while DRI is enabled. | |I've split the patch into 2 separate patches, one for each driver. | |Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c |=================================================================== |RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c,v |retrieving revision 1.6 |diff -p -u -r1.6 r128_dga.c |--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c 27 Jan 2002 20:05:30 -0000 1.6 |+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c 8 Sep 2002 14:47:04 -0000 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ==================================================== PIPE_COMMAND: bzip2 -dc /var/tmp/portage/xfree-4.2.1- r2/work/patch//013_all_4.2.1-ati-r128-dri-dga.patch.bz2 > /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch PATCH COMMAND: patch -p3 < /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch ==================================================== can't find file to patch at input line 13 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Patch courtesy of Michel Daenzer which fixes a bug on the Radeon and |Rage 128 which occurs while using VMware with DGA while DRI is enabled. | |I've split the patch into 2 separate patches, one for each driver. | |Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c |=================================================================== |RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c,v |retrieving revision 1.6 |diff -p -u -r1.6 r128_dga.c |--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c 27 Jan 2002 20:05:30 -0000 1.6 |+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c 8 Sep 2002 14:47:04 -0000 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ==================================================== PIPE_COMMAND: bzip2 -dc /var/tmp/portage/xfree-4.2.1- r2/work/patch//013_all_4.2.1-ati-r128-dri-dga.patch.bz2 > /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch PATCH COMMAND: patch -p4 < /var/tmp/portage/xfree-4.2.1-r2/temp/16592.patch ==================================================== can't find file to patch at input line 13 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Patch courtesy of Michel Daenzer which fixes a bug on the Radeon and |Rage 128 which occurs while using VMware with DGA while DRI is enabled. | |I've split the patch into 2 separate patches, one for each driver. | |Index: programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c |=================================================================== |RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c,v |retrieving revision 1.6 |diff -p -u -r1.6 r128_dga.c |--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c 27 Jan 2002 20:05:30 -0000 1.6 |+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dga.c 8 Sep 2002 14:47:04 -0000 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored Reproducible: Always Steps to Reproduce: 1. Log in as root (or use su or sudo) 2. emerge =x11-base/xfree-4.2.1-r2 Actual Results: emerge outputs that last screen that I included above, and produces a logfile of the patch errors (which I also included above). Expected Results: xfree-4.2.1-r2 should have been emerged successfully without errors. Portage 2.0.48-r1 (default-x86-1.4, gcc-3.2.3, glibc-2.3.2-r1) ================================================================= System uname: 2.4.20-gentoo-r5 i686 Intel(R) Pentium(R) III Mobile CPU 1000MHz GENTOO_MIRRORS="http://gentoo.oregonstate.edu http://distro.ibiblio.org/pub/Linux/distributions/gentoo" CONFIG_PROTECT="/etc /var/qmail/control /usr/kde/2/share/config /usr/kde/3/share /config /usr/X11R6/lib/X11/xkb /usr/kde/3.1/share/config /usr/share/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="" USE="x86 oss 3dnow crypt encode gif jpeg kde gnome libg++ libwww mikmod mmx ncurses nls pdflib png sdl slang spell xml2 xv zlib gdbm berkdb readline arts java X tcpd pam ssl perl python imlib oggvorbis gtk qt motif opengl alsa apache2 apm avi cdr cups dga directfb dvd -esd fbcon gd gphoto2 gpm gtk2 jikes lirc mpeg pcmcia pnp quicktime samba sse -svga truetype usb xmms" COMPILER="gcc3" CHOST="i686-pc-linux-gnu" CFLAGS="-mcpu=pentium3 -O3 -pipe" CXXFLAGS="-mcpu=pentium3 -O3 -pipe" ACCEPT_KEYWORDS="x86 ~x86" MAKEOPTS="-j2" AUTOCLEAN="yes" SYNC="rsync://rsync.gentoo.org/gentoo-portage" FEATURES="sandbox ccache"
This error is because the diff is in dos-format. run it through dos2unix and it will work flawlessly.
New patchset 1.3 on mirrors fixes this issue on your next sync.
