I just noticed this in the build logs. Looks like the patch isn't applied at all. I think the problem is that there is a relative path in the filenames, while the working ones just have the filename, i.e. this doesn't work:
|--- pd/src/g_text.c 4 Oct 2006 19:35:06 -0000 1.15 |+++ pd/src/g_text.c 12 Feb 2007 03:45:43 -0000
This works:
--- g_rtext.c 6 Sep 2004 20:20:34 -0000 1.4 +++ g_rtext.c 14 Dec 2005 03:59:31 -0000
.hc
Applying /home/pd/auto-build/pd-extended/packages/patches/ add_string_support.patch can't find file to patch at input line 8 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: pd/src/g_text.c |=================================================================== |RCS file: /cvsroot/pure-data/pd/src/g_text.c,v |retrieving revision 1.15 |diff -u -w -r1.15 g_text.c |--- pd/src/g_text.c 4 Oct 2006 19:35:06 -0000 1.15 |+++ pd/src/g_text.c 12 Feb 2007 03:45:43 -0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 3 out of 3 hunks ignored can't find file to patch at input line 49 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: pd/src/m_atom.c |=================================================================== |RCS file: /cvsroot/pure-data/pd/src/m_atom.c,v |retrieving revision 1.4 |diff -u -w -r1.4 m_atom.c |--- pd/src/m_atom.c 11 Aug 2006 20:09:07 -0000 1.4 |+++ pd/src/m_atom.c 12 Feb 2007 03:45:43 -0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 71 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: pd/src/m_binbuf.c |=================================================================== |RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v |retrieving revision 1.13 |diff -u -w -r1.13 m_binbuf.c |--- pd/src/m_binbuf.c 4 Oct 2006 19:35:06 -0000 1.13 |+++ pd/src/m_binbuf.c 12 Feb 2007 03:45:44 -0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 89 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: pd/src/m_class.c |=================================================================== |RCS file: /cvsroot/pure-data/pd/src/m_class.c,v |retrieving revision 1.7 |diff -u -w -r1.7 m_class.c |--- pd/src/m_class.c 15 Aug 2006 04:54:15 -0000 1.7 |+++ pd/src/m_class.c 12 Feb 2007 03:45:44 -0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 9 out of 9 hunks ignored can't find file to patch at input line 206 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: pd/src/m_imp.h |=================================================================== |RCS file: /cvsroot/pure-data/pd/src/m_imp.h,v |retrieving revision 1.4 |diff -u -w -r1.4 m_imp.h |--- pd/src/m_imp.h 19 Aug 2005 23:28:03 -0000 1.4 |+++ pd/src/m_imp.h 12 Feb 2007 03:45:44 -0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 229 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: pd/src/m_obj.c |=================================================================== |RCS file: /cvsroot/pure-data/pd/src/m_obj.c,v |retrieving revision 1.4 |diff -u -w -r1.4 m_obj.c |--- pd/src/m_obj.c 18 May 2005 04:28:51 -0000 1.4 |+++ pd/src/m_obj.c 12 Feb 2007 03:45:44 -0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 6 out of 6 hunks ignored can't find file to patch at input line 334 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: pd/src/m_pd.c |=================================================================== |RCS file: /cvsroot/pure-data/pd/src/m_pd.c,v |retrieving revision 1.4 |diff -u -w -r1.4 m_pd.c |--- pd/src/m_pd.c 28 Nov 2004 21:20:42 -0000 1.4 |+++ pd/src/m_pd.c 12 Feb 2007 03:45:44 -0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 354 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: pd/src/m_pd.h |=================================================================== |RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v |retrieving revision 1.17 |diff -u -w -r1.17 m_pd.h |--- pd/src/m_pd.h 22 Oct 2006 21:46:11 -0000 1.17 |+++ pd/src/m_pd.h 12 Feb 2007 03:45:44 -0000 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 10 out of 10 hunks ignored
------------------------------------------------------------------------ ----
I have the audacity to believe that peoples everywhere can have three meals a day for their bodies, education and culture for their minds, and dignity, equality and freedom for their spirits. - Martin Luther King, Jr.
Hans-Christoph Steiner wrote:
I just noticed this in the build logs. Looks like the patch isn't applied at all. I think the problem is that there is a relative path in the filenames, while the working ones just have the filename, i.e. this doesn't work:
|--- pd/src/g_text.c 4 Oct 2006 19:35:06 -0000 1.15 |+++ pd/src/g_text.c 12 Feb 2007 03:45:43 -0000
This works:
--- g_rtext.c 6 Sep 2004 20:20:34 -0000 1.4 +++ g_rtext.c 14 Dec 2005 03:59:31 -0000
.hc
Applying /home/pd/auto-build/pd-extended/packages/patches/ add_string_support.patch can't find file to patch at input line 8 Perhaps you used the wrong -p or --strip option?
so perhaps you used the wrong -p or --strip option...
try "-p 2"
fmga.sdr IOhannes
On Apr 29, 2007, at 11:19 AM, IOhannes m zmoelnig wrote:
Hans-Christoph Steiner wrote:
I just noticed this in the build logs. Looks like the patch isn't applied at all. I think the problem is that there is a relative path in the filenames, while the working ones just have the filename, i.e. this doesn't work:
|--- pd/src/g_text.c 4 Oct 2006 19:35:06 -0000 1.15 |+++ pd/src/g_text.c 12 Feb 2007 03:45:43 -0000
This works:
--- g_rtext.c 6 Sep 2004 20:20:34 -0000 1.4 +++ g_rtext.c 14 Dec 2005 03:59:31 -0000
.hc
Applying /home/pd/auto-build/pd-extended/packages/patches/ add_string_support.patch can't find file to patch at input line 8 Perhaps you used the wrong -p or --strip option?
so perhaps you used the wrong -p or --strip option...
try "-p 2"
This is automated, so that would mean changing all the patches in packages/patches. I think it would be much easier to change that one patch to remove the path information.
.hc
fmga.sdr IOhannes
------------------------------------------------------------------------ ----
"[W]e have invented the technology to eliminate scarcity, but we are deliberately throwing it away to benefit those who profit from scarcity." -John Gilmore
Quoting Hans-Christoph Steiner hans@eds.org:
Perhaps you used the wrong -p or --strip option?
so perhaps you used the wrong -p or --strip option...
try "-p 2"
This is automated, so that would mean changing all the patches in packages/patches. I think it would be much easier to change that one patch to remove the path information.
i see. of course i thought of that not before clicking on send.
a more generic solution might be to pipe the diff-file through a sed script that removes all the unnecessary path information.
another note: are these patches only to be applied to the pd-sources (and NOT to any externals)? i guess currently there are just patches against the pd-sources, but wouldn't it be nice to have a generic solution that could be applied to the entire pure-data CVS? in this case, i would vote for mandatory paths relative to CVSROOT for all patches.
mfg.asdr IOhannes
Quoting Hans-Christoph Steiner hans@eds.org:
try "-p 2"
This is automated, so that would mean changing all the patches in packages/patches. I think it would be much easier to change that one patch to remove the path information.
the last one was another mail where i clicked "send" before thinking.
the "-p 2" would strip _at most_ the first 2 "path-elements" (see 'man patch' for a better explanation) of the filenames. so "pd/src/g_rtext.c" becomes "g_rtext.c", while "src/g_canvas.c" becomes "g_canvas.c" and "m_pd.h" stays the same.
so all patches should apply just as fine as they do now, and the string-support patch would apply too.
apart from that, i agree that all patches should be "normalized" in a way. (and that "string" really should be "blob")
mfg,.asr IOhannes
On May 1, 2007, at 2:59 AM, zmoelnig@iem.at wrote:
Quoting Hans-Christoph Steiner hans@eds.org:
try "-p 2"
This is automated, so that would mean changing all the patches in packages/patches. I think it would be much easier to change that one patch to remove the path information.
the last one was another mail where i clicked "send" before thinking.
the "-p 2" would strip _at most_ the first 2 "path-elements" (see 'man patch' for a better explanation) of the filenames. so "pd/src/g_rtext.c" becomes "g_rtext.c", while "src/g_canvas.c" becomes "g_canvas.c" and "m_pd.h" stays the same.
so all patches should apply just as fine as they do now, and the string-support patch would apply too.
apart from that, i agree that all patches should be "normalized" in a way. (and that "string" really should be "blob")
Feel free to add this stuff to the build system, as long as it works on all platforms. an older sed is installed on everything in the auto-build farm. But it might save more trouble in the long run to keep a consistent format. Hard to say...
.hc
mfg,.asr IOhannes
PD-dev mailing list PD-dev@iem.at http://lists.puredata.info/listinfo/pd-dev
------------------------------------------------------------------------
Terrorism is not an enemy. It cannot be defeated. It's a tactic. It's about as sensible to say we declare war on night attacks and expect we're going to win that war. We're not going to win the war on terrorism. - retired U.S. Army general, William Odom
-
Hans-Christoph Steiner -
IOhannes m zmoelnig -
zmoelnig＠iem.at