conky-1.3.4-r2-miscbug.patch is applied, then the emerge process goes on to applying conky-1.3.4-arraybounds.patch, but fails. Emerge process tells me to include /var/tmp/portage/conky-1.3.4-r2/temp/conky-1.3.4-arraybounds.patch-10838.out : ***** conky-1.3.4-arraybounds.patch ***** ========================================= PATCH COMMAND: patch -p0 -g0 --no-backup-if-mismatch < /usr/portage/app-admin/conky/files/conky-1.3.4-arraybounds.patch ========================================= patching file src/conky.h Hunk #1 FAILED at 3. Hunk #2 succeeded at 55 with fuzz 2. 1 out of 2 hunks FAILED -- saving rejects to file src/conky.h.rej patching file src/conky.c Hunk #1 FAILED at 3. 1 out of 3 hunks FAILED -- saving rejects to file src/conky.c.rej ========================================= PATCH COMMAND: patch -p1 -g0 --no-backup-if-mismatch < /usr/portage/app-admin/conky/files/conky-1.3.4-arraybounds.patch ========================================= can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- src/conky.h.old 2005-11-30 01:08:25.000000000 -0500 |+++ src/conky.h 2005-11-29 12:35:21.000000000 -0500 -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 25 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | |--- src/conky.c.old 2005-11-30 01:08:26.000000000 -0500 |+++ src/conky.c 2005-11-30 00:52:18.000000000 -0500 -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored ========================================= PATCH COMMAND: patch -p2 -g0 --no-backup-if-mismatch < /usr/portage/app-admin/conky/files/conky-1.3.4-arraybounds.patch ========================================= missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- src/conky.h.old 2005-11-30 01:08:25.000000000 -0500 |+++ src/conky.h 2005-11-29 12:35:21.000000000 -0500 -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored missing header for unified diff at line 25 of patch can't find file to patch at input line 25 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | |--- src/conky.c.old 2005-11-30 01:08:26.000000000 -0500 |+++ src/conky.c 2005-11-30 00:52:18.000000000 -0500 -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored ========================================= PATCH COMMAND: patch -p3 -g0 --no-backup-if-mismatch < /usr/portage/app-admin/conky/files/conky-1.3.4-arraybounds.patch ========================================= missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- src/conky.h.old 2005-11-30 01:08:25.000000000 -0500 |+++ src/conky.h 2005-11-29 12:35:21.000000000 -0500 -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored missing header for unified diff at line 25 of patch can't find file to patch at input line 25 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | |--- src/conky.c.old 2005-11-30 01:08:26.000000000 -0500 |+++ src/conky.c 2005-11-30 00:52:18.000000000 -0500 -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored ========================================= PATCH COMMAND: patch -p4 -g0 --no-backup-if-mismatch < /usr/portage/app-admin/conky/files/conky-1.3.4-arraybounds.patch ========================================= missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- src/conky.h.old 2005-11-30 01:08:25.000000000 -0500 |+++ src/conky.h 2005-11-29 12:35:21.000000000 -0500 -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored missing header for unified diff at line 25 of patch can't find file to patch at input line 25 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | |--- src/conky.c.old 2005-11-30 01:08:26.000000000 -0500 |+++ src/conky.c 2005-11-30 00:52:18.000000000 -0500 -------------------------- No file to patch. Skipping patch. 3 out of 3 hunks ignored Reproducible: Always Steps to Reproduce: 1. emerge sync 2. emerge app-admin/conky-1.3.4-r2 Actual Results: >>> Unpacking conky-1.3.4.tar.bz2 to /var/tmp/portage/conky-1.3.4-r2/work * Applying conky-1.3.4-miscbug.patch ... [ ok ] * Applying conky-1.3.4-arraybounds.patch ... * Failed Patch: conky-1.3.4-arraybounds.patch ! * ( /usr/portage/app-admin/conky/files/conky-1.3.4-arraybounds.patch ) * * Include in your bugreport the contents of: * * /var/tmp/portage/conky-1.3.4-r2/temp/conky-1.3.4-arraybounds.patch-10962.out !!! ERROR: app-admin/conky-1.3.4-r2 failed. !!! Function epatch, Line 350, Exitcode 0 !!! Failed Patch: conky-1.3.4-arraybounds.patch! !!! If you need support, post the topmost build error, NOT this status message. Expected Results: Software should've been emerged and installed. Portage 2.0.51.22-r3 (default-linux/x86/2005.1, gcc-3.4.4, glibc-2.3.5-r2, 2.6.14-gentoo-r4 i686) ================================================================= System uname: 2.6.14-gentoo-r4 i686 Intel(R) Celeron(R) M processor 1.30GHz Gentoo Base System version 1.6.13 ccache version 2.3 [enabled] dev-lang/python: 2.3.5, 2.4.2 sys-apps/sandbox: 1.2.12 sys-devel/autoconf: 2.13, 2.59-r6 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1 sys-devel/binutils: 2.16.1 sys-devel/libtool: 1.5.20 virtual/os-headers: 2.6.11-r2 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=pentium-m -pipe -fomit-frame-pointer" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config /usr/lib/X11/xkb /usr/share/config /usr/share/texmf/dvipdfm/config/ /usr/share/texmf/dvips/config/ /usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /usr/share/texmf/xdvi/ /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d" CXXFLAGS="-O2 -march=pentium-m -pipe -fomit-frame-pointer" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig ccache distlocks sandbox sfperms strict" GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/Linux/distributions/gentoo" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/backup/overlays/ebuildexchange" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="x86 X alsa apm audiofile avi berkdb bitmap-fonts bzip2 cdr crypt curl dts dvd dvdr dvdread emboss encode exif expat firefox foomaticdb fortran gdbm gif glut gpm gstreamer gtk gtk2 imagemagick imlib ipv6 java jpeg lcms libg++ libwww lua mad mikmod mmx mng motif mp3 mpeg ncurses nls nsplugin ogg oggvorbis opengl oss pam pcre pdflib perl png python qt quicktime readline samba sdl spell sse ssl tcltk tcpd tetex tiff truetype truetype-fonts type1-fonts udev usb vorbis wifi win32codecs xine xml2 xv zlib userland_GNU kernel_linux elibc_glibc" Unset: ASFLAGS, CTARGET, LANG, LC_ALL, LDFLAGS, LINGUAS, MAKEOPTS
*** Bug 115172 has been marked as a duplicate of this bug. ***
*** Bug 115174 has been marked as a duplicate of this bug. ***
fixed
Issue has not be resolved.
@@ -3,7 +3,7 @@ * * This program is licensed under BSD license, read COPYING * - * $Id: conky-1.3.4-arraybounds.patch,v 1.2 2005/12/11 11:16:12 dragonheart Exp $ + * $Id: conky-1.3.4-arraybounds.patch,v 1.2 2005/12/11 11:16:12 dragonheart Exp $ */ #include "conky.h" is offending block I do not see why it is even being added to the patch it changes nothing:/
I can confirm with Jory A. Pratt, removing that section from the patch, then running "emerge --digest conky" .. built and installed conky
ok did it properly this time.
daniel, what happened with this? was this my fault (the patch itself)? seems like it got changed slightly as it was posted to gentoo cvs. phil
with regard to comment #5: patches have context lines in them. those lines frame the altered lines around them.
the cvs commit process changes the lines. I just seem to get caught out my it.
k man, thanks much for handling swiftly. i'll test again as soon as it hits my gentoo mirrors.
ah there we go ;) thx
*** Bug 115239 has been marked as a duplicate of this bug. ***