When trying to upgrade sawfish this morning, the emerge failed due to the new patch from bug 33609. Portage saves /var/tmp/portage/sawfish-1.3-r3/temp/sawfish-1.3-state-below.patch-3268.out due to the failure, whose contents follow: ***** sawfish-1.3-state-below.patch ***** ========================================= PATCH COMMAND: patch -g0 -p0 < /usr/portage/x11-wm/sawfish/files/sawfish-1.3-state-below.patch ========================================= patching file sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl Hunk #1 FAILED at 125. 1 out of 1 hunk FAILED -- saving rejects to file sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl.rej ========================================= PATCH COMMAND: patch -g0 -p1 < /usr/portage/x11-wm/sawfish/files/sawfish-1.3-state-below.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: -------------------------- |--- /var/tmp/portage/sawfish-1.3-r2/work/sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-11-16 16:13:33.000000000 +0100 |+++ sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-03-16 21:56:48.000000000 +0100 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ========================================= PATCH COMMAND: patch -g0 -p2 < /usr/portage/x11-wm/sawfish/files/sawfish-1.3-state-below.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: -------------------------- |--- /var/tmp/portage/sawfish-1.3-r2/work/sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-11-16 16:13:33.000000000 +0100 |+++ sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-03-16 21:56:48.000000000 +0100 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ========================================= PATCH COMMAND: patch -g0 -p3 < /usr/portage/x11-wm/sawfish/files/sawfish-1.3-state-below.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: -------------------------- |--- /var/tmp/portage/sawfish-1.3-r2/work/sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-11-16 16:13:33.000000000 +0100 |+++ sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-03-16 21:56:48.000000000 +0100 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ========================================= PATCH COMMAND: patch -g0 -p4 < /usr/portage/x11-wm/sawfish/files/sawfish-1.3-state-below.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: -------------------------- |--- /var/tmp/portage/sawfish-1.3-r2/work/sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-11-16 16:13:33.000000000 +0100 |+++ sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl 2003-03-16 21:56:48.000000000 +0100 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored Reproducible: Always Steps to Reproduce: 1. emerge sync 2. emerge -u sawfish 3. Actual Results: The emerge failed due to a problem with patch. Expected Results: The patch should have been applied and sawfish should have been updated. Portage 2.0.49-r15 (default-x86-1.4, gcc-3.2.3, glibc-2.3.2-r3, 2.4.20-gentoo-r8) ================================================================= System uname: 2.4.20-gentoo-r8 i686 AMD Athlon(tm) XP 2000+ Gentoo Base System version 1.4.3.10p1 distcc 2.11.1 i686-pc-linux-gnu (protocols 1 and 2) (default port 3632) [enabled] ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CFLAGS="-mcpu=athlon-xp -O2 -fomit-frame-pointer -pipe" CHOST="i686-pc-linux-gnu" COMPILER="gcc3" 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" CXXFLAGS="-mcpu=athlon-xp -O2 -fomit-frame-pointer -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoaddcvs sandbox ccache distcc userpriv" GENTOO_MIRRORS="ftp://ftp.ussg.iu.edu/pub/linux/gentoo ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo http://gentoo.oregonstate.edu" MAKEOPTS="-j3" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="" SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage" USE="x86 oss apm crypt foomaticdb libg++ libwww mad mikmod nls quicktime spell xmms zlib gdbm berkdb slang svga java guile sdl gpm tcpd pam esd qt kde motif mozilla 3dnow mmx aalib cdr cups fbcon maildir ncurses pda readline sasl ssl perl python postgresql xml xml2 X xv gtk gtkhtml gnome -arts truetype gif imlib jpeg pdflib png tiff avi dvd encode mpeg opengl oggvorbis"
Same here. Portage 2.0.49-r15 (default-x86-1.4, gcc-3.3.2, glibc-2.3.2-r8, 2.6.0-test9) ================================================================= System uname: 2.6.0-test9 i686 Intel(R) Pentium(R) 4 CPU 2.00GHz Gentoo Base System version 1.4.3.12 ACCEPT_KEYWORDS="x86 ~x86" AUTOCLEAN="yes" CFLAGS="-march=pentium3 -mcpu=pentium4 -O2 -fstack-protector -finline-functions -falign-jumps=5 -falign-loops=5 -falign-functions=64 -pipe" CHOST="i686-pc-linux-gnu" COMPILER="gcc3" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config /usr/X11R6/lib/X11/xkb /usr/kde/3.1/share/config /usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/ /usr/share/config /var/qmail/control /var/qmail/alias" CONFIG_PROTECT_MASK="/etc/gconf /etc/env.d" CXXFLAGS="-march=pentium3 -mcpu=pentium4 -O2 -fstack-protector -finline-functions -falign-jumps=5 -falign-loops=5 -falign-functions=64 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="sandbox ccache autoaddcvs nostrip" GENTOO_MIRRORS="ftp://ftp.gtlib.cc.gatech.edu/pub/gentoo http://distro.ibiblio.org/gentoo http://gentoo.oregonstate.edu " MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://rsync.us.gentoo.org/gentoo-portage" USE="x86 oss apm avi crypt encode foomaticdb gif jpeg libg++ mad mikmod mpeg ncurses nls pdflib png quicktime spell truetype xml2 xmms xv zlib gtkhtml gdbm berkdb slang readline arts tetex bonobo tcltk java guile mysql postgres X sdl gpm tcpd pam libwww ssl perl python esd imlib oggvorbis gnome gtk qt kde motif opengl mozilla cdr -svga gtk2 alsa innodb cups ldap i8x0 kerberos sse tktcl samba"
agriffis, would you mind taking maintainership of sawfish in metadata.xml ? It's ok to leave gnome as a herd in there, but then these bugs go to you as well immediately.
The patch says - (defvar wm-spec-below-depth -2) + (defvar wm-spec-below-depth +2) (defvar wm-spec-above-depth +2) while the source contains (defvar wm-spec-below-depth +2) (defvar wm-spec-above-depth +2) So either the source has already been patched, or the patch should be applied in reverse sense. From my understanding it would be the latter. I applied the patch reversely, and up to now, sawfish seems to be working OK.
Fixed the patch and added myself to metadata.xml
