mxe-octave: src/gnuplot-1-fixes.patch annotate

annotate src/gnuplot-1-fixes.patch @ 4177:16b2ee1a1b5d

gnuplot: update for 5.0.4 * src/gnuplot.mk: update version, checksum * src/gnuplot-1-fixes.patch: updated patch

author	"lostbard" <john.donoghue@ieee.org>
date	Fri, 15 Jul 2016 10:24:05 -0400
parents	717e989767e3
children	851b9f4a6b1c

rev	line source
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	1 diff -ur gnuplot-5.0.4.orig/config/mingw/Makefile gnuplot-5.0.4/config/mingw/Makefile
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	2 --- gnuplot-5.0.4.orig/config/mingw/Makefile 2016-07-21 13:47:52.025061617 -0400
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	3 +++ gnuplot-5.0.4/config/mingw/Makefile 2016-07-21 13:48:27.859547002 -0400
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	4 @@ -119,14 +119,14 @@
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	5 # Requires libcaca version 0.99.beta15 or newer. A post-beta18
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	6 # svn version is recommended since it contains an improved
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	7 # win32 backend.
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	8 -CACA=1
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	9 +#CACA=1
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	10
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	11 # Uncomment if you have libiconv
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	12 ICONV=1
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	13
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	14 # Uncomment if you have libcerf
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	15 # http://sourceforge.net/projects/libcerf/
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	16 -CERF=1
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	17 +#CERF=1
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	18
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	19 # Below you can adapt paths according to your software setup:
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	20
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	21 @@ -171,8 +171,8 @@
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	22 # http://go.microsoft.com/fwlink/?LinkId=154968
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	23 # We need to explicitly set the correct path here since we also need
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	24 # adjust the include and library paths.
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	25 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	26 -HHC = $(HHWPATH)hhc
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	27 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	28 +#HHC = $(HHWPATH)hhc
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	29
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	30 # Choose which resource compiler you want to use (GNU windres or MS rc):
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	31 GNU_RC = 1
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	32 @@ -186,7 +186,7 @@
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	33
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	34 # Inno Setup Compiler
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	35 # get it from: http://www.jrsoftware.org/isdl.php
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	36 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	37 +#ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	38
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	39 # Directory that might contain extra files to be shipped with the installer.
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	40 # This should include dependencies like DLLs, but also fontconfig configuration files.
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	41 @@ -514,7 +514,7 @@
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	42 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL)
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	43
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	44
848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	45 -default: $(TARGET) $(MENUFILE) support
848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	46 +default: $(TARGET) $(MENUFILE) # support
848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	47
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	48 console:
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	49 $(MAKE) TARGET=gnuplot.exe default
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	50 @@ -556,8 +556,8 @@
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	51 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$.$$(O)' -MF $.d -o $@ $<
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	52
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	53 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	54 -LDLIBS += -lhtmlhelp
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	55 -LDFLAGS2 += -L$(HHWPATH)lib
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	56 +#LDLIBS += -lhtmlhelp
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	57 +#LDFLAGS2 += -L$(HHWPATH)lib
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	58 ifdef MINGW64
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	59 LDFLAGS2 += -L.
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	60 endif
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	61 diff -ur gnuplot-5.0.4.orig/src/command.c gnuplot-5.0.4/src/command.c
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	62 --- gnuplot-5.0.4.orig/src/command.c 2016-07-21 13:47:51.987062163 -0400
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	63 +++ gnuplot-5.0.4/src/command.c 2016-07-21 13:48:27.860546987 -0400
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	64 @@ -125,7 +125,7 @@
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	65 # endif
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	66 #endif /* _Windows */
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	67
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	68 -#ifdef _Windows
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	69 +#ifdef IGNORE_Windows
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	70 # include <windows.h>
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	71 # ifdef __MSC__
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	72 # include <malloc.h>
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	73 @@ -2535,6 +2535,7 @@
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	74 void
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	75 help_command()
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	76 {
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	77 +#ifndef __MINGW32__
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	78 HWND parent;
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	79
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	80 c_token++;
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	81 @@ -2570,6 +2571,7 @@
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	82 link.fIndexOnFail = TRUE;
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	83 HtmlHelp(parent, winhelpname, HH_KEYWORD_LOOKUP, (DWORD_PTR)&link);
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	84 }
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	85 +#endif
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	86 }
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	87 #else /* !_Windows */
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	88 #ifndef VMS
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	89 diff -ur gnuplot-5.0.4.orig/src/internal.c gnuplot-5.0.4/src/internal.c
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	90 --- gnuplot-5.0.4.orig/src/internal.c 2016-07-21 13:47:52.006061890 -0400
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	91 +++ gnuplot-5.0.4/src/internal.c 2016-07-21 13:48:27.861546973 -0400
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	92 @@ -47,7 +47,7 @@
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	93
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	94 #include <math.h>
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	95
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	96 -#ifndef _WIN64
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	97 +#if !defined(__MINGW64_VERSION_MAJOR)
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	98 /*
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	99 * FIXME: This is almost certainly out of date on linux, since the matherr
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	100 * mechanism has been replaced by math_error() and supposedly is only
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	101 diff -ur gnuplot-5.0.4.orig/src/syscfg.h gnuplot-5.0.4/src/syscfg.h
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	102 --- gnuplot-5.0.4.orig/src/syscfg.h 2016-07-21 13:47:51.994062063 -0400
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	103 +++ gnuplot-5.0.4/src/syscfg.h 2016-07-21 13:49:02.401050952 -0400
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	104 @@ -345,7 +345,11 @@
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	105 #endif
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	106
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	107 #ifndef GP_MATHERR
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	108 -# define GP_MATHERR matherr
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	109 +# if __MINGW32__
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	110 +# define GP_MATHERR _matherr
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	111 +#else
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	112 +# define GP_MATHERR matherr
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	113 +#endif
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	114 #endif
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	115
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	116 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H

Mercurial > mxe-octave

annotate src/gnuplot-1-fixes.patch @ 4177:16b2ee1a1b5d