Hi Francesco, It came through, thank you.
Here are my results: 1) I had to 'unix2dos *.diff' to make it work on Windows. 2) I had to move my freshly checked out branch 2.0 dir (named 'harbour-2.0' by default) to b/harbour/ dir to make it work. (it would be nice if the patch would just apply by starting it from root, or one level up, recognizing 'harbour-2.0' dir.) 3) There is one problem in patched ChangeLog @ line 90, where an embedded .dif file content appeared. This has to be fixed. (this was the only one of this kind) 4) I got some error on patching. This first kind is most probably the result of 'unixtodos'. And this means whoever applies this patch should use *nix OS, like you do. --- patching file b/harbour/harbour-wce-spec Hunk #1 FAILED at 127. Hunk #2 FAILED at 252. 2 out of 2 hunks FAILED -- saving rejects to file b/harbour/harbour-wce-spec.rej patching file b/harbour/harbour-win-spec Hunk #1 FAILED at 127. Hunk #2 FAILED at 252. 2 out of 2 hunks FAILED -- saving rejects to file b/harbour/harbour-win-spec.rej patching file b/harbour/mpkg_tgz.sh Hunk #1 FAILED at 22. Hunk #2 FAILED at 99. Hunk #3 FAILED at 132. 3 out of 3 hunks FAILED -- saving rejects to file b/harbour/mpkg_tgz.sh.rej --- 5) And some errors due to patch tool dumbness, to be safely ignored: --- patching file b/harbour/src/codepage/Makefile The next patch would delete the file a/harbour/src/codepage/cphr437.c, which does not exist! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored patching file b/harbour/src/lang/Makefile The next patch would delete the file a/harbour/src/lang/msghr437.c, which does not exist! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored patching file b/harbour/src/lang/msghriso.c The next patch would delete the file a/harbour/src/lang/msgsl437.c, which does not exist! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored --- > A) > 2010-01-13 20:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) > * harbour/src/vm/hashes.c > ! fixed missing HB_STACK_TLS_PRELOAD - thanks to Xavi > [TOMERGE 2.0] > > Can't be applied so TOMERGE 2.0 should be REMOVED. This patch modifies > function hb_hashGetCItemPtr() added by (2010-01-13 09:37 UTC+0100 > Przemyslaw Czerpak) that is not flagged as TOMERGE... That's fine. > B) > 2009-12-28 10:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) > 2009-12-28 01:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) > * src/common/hbtrace.c > > Viktor, I don't know which hunks should be merged, can you provide the > patch or give me some clues ? It looks safe to copy the current latest (r13473) src/common/hbtrace.c from trunk. I didn't verify it though with an actual build (should be before 2.0.1 release). Brgds, Viktor _______________________________________________ Harbour mailing list (attachment size limit: 40KB) Harbour@harbour-project.org http://lists.harbour-project.org/mailman/listinfo/harbour
