On 11/01 04:05, David Haller wrote:
> Hello,
>
> On Wed, 01 Nov 2017, tu...@posteo.de wrote:
> [..]
> >Thanks a lot for the extensive help, SIR! :)
>
> Thanks.
>
> [..]
> >The patch itself was found (so the local thing works fine) and failed.
> >
> >The *.patch.out is attached to the email and after looking into it I
> >think you will find the problem a hundred years faster than me since
> >you created it. It seems some files are not where they are supposed to
> >be.
>
> Not quite. The "not founds" are normal for epatch/eapply trying
> various '-p' levels... But see below in the patch.out (and nice that
> you supplied that right away).
>
> >There is a glitch in the matrix...they have changed something...I
> >see Schroedingers cat twice.
> >
> >Ah! By the way: According to quantum physics the cite at the bottom of
> >you previous email is wrong :
> >"WANTED: Schroedingers Cat, dead or alive."
> >must be
> >"WANTED: Schroedingers Cat, dead and alive."
> >Heisenberg would not accept this kind of uncertainty -- in
> >principle...
> >;)
>
> *g* You're right. But it's just a quote I picked up long time ago ;)
>
> Anyway, here's the deal:
>
> [..]
> >PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch --dry-run -f <
> >'/var/tmp/portage/media-gfx/structure-synth-1.5.0-r1/files/structure-synth-1.5.0-gl.patch'
> >
> >==========================================
> >checking file SyntopiaCore/GLEngine/Raytracer/Sampler.h
> >Hunk #1 FAILED at 1 (different line endings).
> >1 out of 1 hunk FAILED
> >checking file SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
> >Hunk #1 FAILED at 122 (different line endings).
> >1 out of 1 hunk FAILED
> >checking file SyntopiaCore/GLEngine/Sphere.h
> >Hunk #1 FAILED at 1 (different line endings).
> >1 out of 1 hunk FAILED
> >
> >patch program exited with status 1
> >==========================================
>
> Because this failed, epatch goes on, confusing you with more a few
> more 'not found' stuff outputs...
>
> >PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch --dry-run -f <
> >'/var/tmp/portage/media-gfx/structure-synth-1.5.0-r1/files/structure-synth-1.5.0-gl.patch'
> >
> >==========================================
> >can't find file to patch at input line 4
> [..]
>
> Thing is: the source-code of this package has CRLF line endings,
> and, while I added the CRs to my patch, via mail and saving, you
> probably saved them with "just" the LFs.
>
> a) add the '-l' / '--ignore-whitespace' option to patch, don't know if
> that works with epatch/eapply as e.g. 'epatch -l ${FILESDIR}/..', or
>
> b) reencode the line-endings of the patch to match that of the
> source-files. No idea if you can reencode the whole patch or just
> the diff. So ... I'll reattach the patch xzipped, that should keep
> your mail-client from changing the line-endings. xz -d that patch
> then into the files subdir. That's probably the easiest way.
>
> HTH,
> -dnh
>
> --
> Chemie ist auch bloß spezialisierte Physik.
> -- Jens Dittmar in drsst
Moin David,
;)
nope...currently the cat is more dead than alive...
I looked at it!
I did the following:
vim <patchfile>
:set ff
unix
:set ff=dos
:wq
repoman -v manifest (since file has changed)
emerge structure-synth.
BADABOOM! (The fifth element)
See my theorie of uncertainity attached to this mail...
:)
Cheers
Meino
***** structure-synth-1.5.0-gl.patch *****
PWD: /var/tmp/portage/media-gfx/structure-synth-1.5.0-r1/work/Structure Synth
Source Code
PATCH TOOL: patch -> /usr/bin/patch
VERSION INFO:
GNU patch 2.7.5
Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1988 Larry Wall
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Written by Larry Wall and Paul Eggert
==========================================
PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch --dry-run -f <
'/var/tmp/portage/media-gfx/structure-synth-1.5.0-r1/files/structure-synth-1.5.0-gl.patch'
==========================================
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Raytracer/Sampler.h
b/SyntopiaCore/GLEngine/Raytracer/Sampler.h
|--- a/SyntopiaCore/GLEngine/Raytracer/Sampler.h 2010-11-04
20:02:46.000000000 +0100
|+++ b/SyntopiaCore/GLEngine/Raytracer/Sampler.h 2017-11-01
04:42:46.320970684 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 14
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
b/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
|--- a/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2010-09-08
21:25:30.000000000 +0200
|+++ b/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2017-11-01
04:46:51.052969311 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Sphere.h
b/SyntopiaCore/GLEngine/Sphere.h
|--- a/SyntopiaCore/GLEngine/Sphere.h 2010-08-11 15:12:22.000000000 +0200
|+++ b/SyntopiaCore/GLEngine/Sphere.h 2017-11-01 04:42:55.864970632 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
patch program exited with status 1
==========================================
PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch --dry-run -f <
'/var/tmp/portage/media-gfx/structure-synth-1.5.0-r1/files/structure-synth-1.5.0-gl.patch'
==========================================
(Stripping trailing CRs from patch; use --binary to disable.)
checking file SyntopiaCore/GLEngine/Raytracer/Sampler.h
Hunk #1 FAILED at 1 (different line endings).
1 out of 1 hunk FAILED
(Stripping trailing CRs from patch; use --binary to disable.)
checking file SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
Hunk #1 FAILED at 122 (different line endings).
1 out of 1 hunk FAILED
(Stripping trailing CRs from patch; use --binary to disable.)
checking file SyntopiaCore/GLEngine/Sphere.h
Hunk #1 FAILED at 1 (different line endings).
1 out of 1 hunk FAILED
patch program exited with status 1
==========================================
PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch --dry-run -f <
'/var/tmp/portage/media-gfx/structure-synth-1.5.0-r1/files/structure-synth-1.5.0-gl.patch'
==========================================
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Raytracer/Sampler.h
b/SyntopiaCore/GLEngine/Raytracer/Sampler.h
|--- a/SyntopiaCore/GLEngine/Raytracer/Sampler.h 2010-11-04
20:02:46.000000000 +0100
|+++ b/SyntopiaCore/GLEngine/Raytracer/Sampler.h 2017-11-01
04:42:46.320970684 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 14
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
b/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
|--- a/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2010-09-08
21:25:30.000000000 +0200
|+++ b/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2017-11-01
04:46:51.052969311 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Sphere.h
b/SyntopiaCore/GLEngine/Sphere.h
|--- a/SyntopiaCore/GLEngine/Sphere.h 2010-08-11 15:12:22.000000000 +0200
|+++ b/SyntopiaCore/GLEngine/Sphere.h 2017-11-01 04:42:55.864970632 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
patch program exited with status 1
==========================================
PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch --dry-run -f <
'/var/tmp/portage/media-gfx/structure-synth-1.5.0-r1/files/structure-synth-1.5.0-gl.patch'
==========================================
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Raytracer/Sampler.h
b/SyntopiaCore/GLEngine/Raytracer/Sampler.h
|--- a/SyntopiaCore/GLEngine/Raytracer/Sampler.h 2010-11-04
20:02:46.000000000 +0100
|+++ b/SyntopiaCore/GLEngine/Raytracer/Sampler.h 2017-11-01
04:42:46.320970684 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 14
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
b/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
|--- a/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2010-09-08
21:25:30.000000000 +0200
|+++ b/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2017-11-01
04:46:51.052969311 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Sphere.h
b/SyntopiaCore/GLEngine/Sphere.h
|--- a/SyntopiaCore/GLEngine/Sphere.h 2010-08-11 15:12:22.000000000 +0200
|+++ b/SyntopiaCore/GLEngine/Sphere.h 2017-11-01 04:42:55.864970632 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
patch program exited with status 1
==========================================
PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch --dry-run -f <
'/var/tmp/portage/media-gfx/structure-synth-1.5.0-r1/files/structure-synth-1.5.0-gl.patch'
==========================================
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Raytracer/Sampler.h
b/SyntopiaCore/GLEngine/Raytracer/Sampler.h
|--- a/SyntopiaCore/GLEngine/Raytracer/Sampler.h 2010-11-04
20:02:46.000000000 +0100
|+++ b/SyntopiaCore/GLEngine/Raytracer/Sampler.h 2017-11-01
04:42:46.320970684 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 14
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
b/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
|--- a/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2010-09-08
21:25:30.000000000 +0200
|+++ b/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp 2017-11-01
04:46:51.052969311 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
(Stripping trailing CRs from patch; use --binary to disable.)
can't find file to patch at input line 26
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -x '*~' -purN a/SyntopiaCore/GLEngine/Sphere.h
b/SyntopiaCore/GLEngine/Sphere.h
|--- a/SyntopiaCore/GLEngine/Sphere.h 2010-08-11 15:12:22.000000000 +0200
|+++ b/SyntopiaCore/GLEngine/Sphere.h 2017-11-01 04:42:55.864970632 +0100
--------------------------
No file to patch. Skipping patch.
1 out of 1 hunk ignored
patch program exited with status 1
