I had the same problem with "git am" (which uses "git apply" from what I understand). I did a "git fetch" and "git merge" before "git am"
bash-3.2$ git am --whitespace=warn ../mbox Applying: Redesigned wxWidgets Driver /Volumes/home/Users/jim/Development/plplot/plplot-plplot/.git/rebase-apply/patch:13: trailing whitespace. // Needed for clock_gettime /Volumes/home/Users/jim/Development/plplot/plplot-plplot/.git/rebase-apply/patch:14: trailing whitespace. #include <time.h> /Volumes/home/Users/jim/Development/plplot/plplot-plplot/.git/rebase-apply/patch:23: trailing whitespace. const size_t mapSize = 1024 * 1024; /Volumes/home/Users/jim/Development/plplot/plplot-plplot/.git/rebase-apply/patch:28: trailing whitespace. int nTries = 0; /Volumes/home/Users/jim/Development/plplot/plplot-plplot/.git/rebase-apply/patch:29: trailing whitespace. char mapName[PLPLOT_MAX_PATH]; error: patch failed: drivers/wxwidgets_dev.cpp:34 error: drivers/wxwidgets_dev.cpp: patch does not apply Patch failed at 0001 Redesigned wxWidgets Driver The copy of the patch that failed is found in: /Volumes/home/Users/jim/Development/plplot/plplot-plplot/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". On Feb 23, 2015, at 12:23 AM, "Alan W. Irwin" <ir...@beluga.phys.uvic.ca> wrote: > On 2015-02-22 22:04-0500 Jim Dishaw wrote: > >> I just cloned from SF and tried to apply the patch with no success > (see below [where the "git apply" command was used rather than the > correct "git am"]). > > Hi Jim: > > I prepared this (one-patch) patch series with "git format-patch". I am > pretty sure you should use "git am" (not "git apply") to apply it. > Anyhow, "git am" always works fine for me here to apply patch series > created with "git format-patch" so please try "git am" there, and I > think it will "just work". > >> I can say, however, that I was able to successfully > build and run ctest on MacOS X. > > The ctest and cmake commands are part of what you get when you build > the CMake software package. So I presume you did have success > building CMake and that is a really good result. > > What version of CMake? > >> When I run "test-plplot.sh" and > "test_diff.sh", I get a message about missing stdout for all the > examples. > > Thanks for trying some testing, but I believe the errors you have gotten > are because you haven't set up everything first. So here is > what I suggest you do instead of running that bare bash script: > > # In a fresh empty build tree.... > cmake <cmake options including -DBUILD_TEST=ON> <path to pristine PLplot > source tree> >& cmake.out > make test_diff_psc >& test_diff_psc.out > > Note, the test_diff_psc target runs the test-plplot.sh script and a > lot more in a coherent way. > > The test_diff_psc target only tests our examples for all languages produce > consistent results, but that is also a fairly quick test that a large > part of PLplot is built correctly. > > Once the test_diff_psc target is working correctly for you, then > you should be ready to start testing wxwidgets. > > First check the cmake.out file above to make sure wxwidgets system libraries > were found. If not, then you have to install them (likely with > homebrew, macports, or the fink distributions of free sofware, if you > don't want to build all of the wxwidgets software yourself.) Then > once all the wxwidgets software package is installed, start over with PLplot > with a fresh build tree as above, > check cmake.out for wxwidgets, etc. Once cmake.out says > wxwidgets has been found then.. > > #Build first C example: (if you haven't done that already by some > #prior test). > make x01c > > # Build the wxwidgets device (this will fail if clock_gettime is not available > # for modern Mac OS X which is one of the concerns about the above patch > make wxwidgets > > # Test wxwidgets works on the first example and uses a new name # each time > you run it, i.e., randomizing with clock_gettime is working > #on Mac OS X similarly to the way it works on Debian stable: > examples/c/x01c -debug -dev wxwidgets > > # Record the last lines of text generated by that -debug option (the ones > that include the string > # nTries), then try a second invocation > > examples/c/x01c -debug -dev wxwidgets > > # The again record all lines generated that include the string nTries. > > Report back those nTries lines for each of your two invocations above > (and also report back if the first example looked reasonably good with > wxwidgets). > > Once, you demonstrate that wxwidgets is working well for you on Mac OS > X with such hand-run tests, you can do a lot more convenient automated > wxwidgets testing for ~6 of our standard examples (right after cmake > invocation since all dependencies are taken care of automatically) by > running > > make test_c_wxwidgets >& test_c_wxwidgets.out > > If any problems show up in any of the *.out files that capture results > above, then ideally attach all *.out files as a compressed tarball to > your post here that describes the issue. > > By the way, I just used the search box at > http://sourceforge.net/p/plplot/wiki/Home/ using the search term "wx", > and that found 14 different wiki pages (some of which have labels > going back to 2009). So likely a lot of that wxwidgets documentation > material for PLplot is outdated, but let us know which pages Phil or I > should concentrate on updating first. > > Alan > __________________________ > Alan W. Irwin > > Astronomical research affiliation with Department of Physics and Astronomy, > University of Victoria (astrowww.phys.uvic.ca). > > Programming affiliations with the FreeEOS equation-of-state > implementation for stellar interiors (freeeos.sf.net); the Time > Ephemerides project (timeephem.sf.net); PLplot scientific plotting > software package (plplot.sf.net); the libLASi project > (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); > and the Linux Brochure Project (lbproject.sf.net). > __________________________ > > Linux-powered Science > __________________________ ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel