Re: garnome 2.17.4 / hal-0.5.8.1 patch trick?

["Joseph E. Sacco, Ph.D." <joseph_sacco comcast net>]

That's weird.  Let me try.

[using patch version 2.5.4]

        % make extract
        
        % cd work/main.d/hal-0.5.8.1
        
        % patch -p1 < ../../../files/hal-0.5.8.1-fixppc.patch 
        patching file hald/linux/probing/probe-smbios.c
        patching file hald/linux/osspec.c
        patching file hald/linux/osspec.c
        patching file hald/linux/pmu.c
        patching file hald/linux/osspec.c
        patching file hald/linux/osspec.c
        patching file hald/linux/osspec.c

Works fine.

-Joseph

===================================================================

On Thu, 2006-12-21 at 14:27 +0000, Peter wrote:
> When I issue make from w/in freedesktop/hal, all patches seem to apply
> fine. When I manually apply the following patch, I get lots of errors!
> What's the trick? I tried -F3 too.
> 
> # patch -p1 -F3 < hal-0.5.8.1-fixppc.patch 
> 
> patching file hald/linux/probing/probe-smbios.c
> patching file hald/linux/osspec.c
> patching file hald/linux/osspec.c
> Hunk #1 succeeded at 493 (offset -5 lines).
> Hunk #3 succeeded at 613 (offset -5 lines).
> patching file hald/linux/pmu.c
> patching file hald/linux/osspec.c
> Hunk #4 FAILED at 613.
> 1 out of 4 hunks FAILED -- saving rejects to file hald/linux/osspec.c.rej
> patching file hald/linux/osspec.c
> Hunk #1 FAILED at 473.
> Hunk #2 FAILED at 498.
> Hunk #3 FAILED at 520.
> Hunk #4 FAILED at 536.
> Hunk #5 FAILED at 548.
> 5 out of 5 hunks FAILED -- saving rejects to file hald/linux/osspec.c.rej
> patching file hald/linux/osspec.c
> Hunk #1 succeeded at 450 (offset 2 lines).
> Hunk #2 FAILED at 476.
> Hunk #3 FAILED at 536.
> 2 out of 3 hunks FAILED -- saving rejects to file hald/linux/osspec.c.rej
> 
> -- 
> Peter
> 
-- 
joseph_sacco [at] comcast [dot] net