|
From: Ethan A M. <sf...@us...> - 2013-10-01 17:12:11
|
On Tuesday, 01 October, 2013 07:58:35 Allin Cottrell wrote:
> On Sun, 29 Sep 2013, sfeam wrote:
>
> > I plan to put a tarball for gnuplot-4.6.4 on SourceForge next weekend.
> > Any last minute bug reports or other issues?
> > Here's the NEWS section for changes since 4.6.3 [...]
>
> Just wondering. I didn't see a mention of the changes in CVS that support
> a 64-bit Windows build of gnuplot. Any chance of those changes making it
> into 4.6.4?
You are refering to these patches that were applied to 4.7?
2013-08-16 Allin Cottrell <cot...@wf...>
* src/internal.c (GP_MATHERR): 1st part of win64 compatibility patch.
The matherr() mechanism is not used by win64. It's also not used by
current linux but it doesn't hurt to leave it in place for now.
* src/win/wprinter.c src/win/winmain.c src/win/wtext.c src/win/wmenu.c
src/win/wpause.c src/win/wgraph.c:
2nd part of win64 compatability patch. All changes are #ifdef _WIN64.
src/win/wgnuplot.rc src/win/wgnuplot.exe.manifest64:
The file win/wgnuplot.exe.manifest specifies the processorArchitecture
as "X86". For an x86_64 build this must be changed to "amd64"
(or wgnuplot.exe won't start). The manifest file is included by
win/wgnuplot.rc. The modified wgnuplot.rc includes an alternative file
wgnuplot.exe.manifest64 if the symbol _WIN64 is defined. This file
simply substitutes "amd64" for "X86" in two places.
The first of those (to src/internal.c) applies without error to 4.6 also.
But the rest of it would need to be re-spun for 4.6
[51] patch -p0 --dry-run < ../../oldpatches/win64_part1.patch
checking file win/wprinter.c
Hunk #3 FAILED at 219.
Hunk #4 succeeded at 246 with fuzz 1.
Hunk #5 FAILED at 324.
2 out of 5 hunks FAILED
checking file win/winmain.c
Hunk #1 FAILED at 526.
1 out of 1 hunk FAILED
checking file win/wtext.c
Hunk #1 succeeded at 287 (offset 7 lines).
Hunk #2 succeeded at 1024 (offset 7 lines).
Hunk #3 succeeded at 1106 (offset 7 lines).
Hunk #4 succeeded at 1207 (offset 7 lines).
Hunk #5 succeeded at 1880 (offset 7 lines).
Hunk #6 succeeded at 2169 (offset 7 lines).
checking file win/wmenu.c
Hunk #1 succeeded at 827 (offset 3 lines).
Hunk #2 succeeded at 1052 (offset 4 lines).
checking file win/wpause.c
Hunk #2 succeeded at 255 with fuzz 2 (offset 6 lines).
Hunk #3 succeeded at 281 with fuzz 2 (offset 6 lines).
Hunk #4 FAILED at 308.
1 out of 4 hunks FAILED
checking file win/wgnuplot.rc
Hunk #1 succeeded at 3 with fuzz 2.
checking file win/wgraph.c
Hunk #1 succeeded at 433 (offset -2 lines).
Hunk #2 succeeded at 576 (offset -4 lines).
Hunk #3 succeeded at 2631 (offset -350 lines).
Hunk #4 succeeded at 2892 (offset -447 lines).
Hunk #5 succeeded at 2958 (offset -447 lines).
Hunk #6 succeeded at 3142 (offset -446 lines).
Hunk #7 succeeded at 3227 (offset -449 lines).
Hunk #8 succeeded at 3745 (offset -460 lines).
checking file win/wgnuplot.exe.manifest64
If you send me a patch set backported to apply against 4.6 I'd
be happy to apply it. But please test it first, as I'm not set up
to build under windows here.
Ethan
>
> Allin Cottrell
>
> ------------------------------------------------------------------------------
> October Webinars: Code for Performance
> Free Intel webinars can help you accelerate application performance.
> Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
> the latest Intel processors and coprocessors. See abstracts and register >
> http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
> _______________________________________________
> gnuplot-beta mailing list
> gnu...@li...
> Membership management via: https://lists.sourceforge.net/lists/listinfo/gnuplot-beta
|