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

annotate src/gnuplot-1-fixes.patch @ 4191:851b9f4a6b1c

Disable space raise console gnuplot for windows (bug #48696)

author	Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
date	Tue, 09 Aug 2016 13:03:07 +0900
parents	16b2ee1a1b5d
children	8f864b4ea93b

rev	line source
4191 851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	1 diff -ur a/config/mingw/Makefile b/config/mingw/Makefile
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	2 --- a/config/mingw/Makefile 2016-03-31 12:40:56.000000000 +0900
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	3 +++ b/config/mingw/Makefile 2016-08-09 12:56:38.576941000 +0900
4177 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
4191 851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	21 @@ -155,7 +155,7 @@
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	22 DESTDIR = "$(PROGRAMFILES)/gnuplot"
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	23
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	24 # Do you want some special optimization / flags?
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	25 -#CFLAGS +=
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	26 +CFLAGS += -DDISABLE_SPACE_RAISES_CONSOLE
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	27 ifdef CLANG
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	28 CFLAGS += -fcolor-diagnostics -fansi-escape-codes
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	29 CFLAGS += -Wno-error=incompatible-ms-struct -Wno-ignored-attributes
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	30 @@ -171,8 +171,8 @@
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	31 # 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	32 # 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	33 # adjust the include and library paths.
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	34 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	35 -HHC = $(HHWPATH)hhc
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	36 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	37 +#HHC = $(HHWPATH)hhc
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	38
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	39 # 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	40 GNU_RC = 1
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	41 @@ -186,7 +186,7 @@
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	42
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	43 # Inno Setup Compiler
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	44 # 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	45 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	46 +#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	47
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	48 # 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	49 # 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	50 @@ -514,7 +514,7 @@
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	51 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL)
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	52
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	53
848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	54 -default: $(TARGET) $(MENUFILE) support
848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	55 +default: $(TARGET) $(MENUFILE) # support
848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	56
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	57 console:
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	58 $(MAKE) TARGET=gnuplot.exe default
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	59 @@ -556,8 +556,8 @@
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	60 $(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	61
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	62 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	63 -LDLIBS += -lhtmlhelp
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	64 -LDFLAGS2 += -L$(HHWPATH)lib
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	65 +#LDLIBS += -lhtmlhelp
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	66 +#LDFLAGS2 += -L$(HHWPATH)lib
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	67 ifdef MINGW64
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	68 LDFLAGS2 += -L.
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	69 endif
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	70 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	71 --- 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	72 +++ 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	73 @@ -125,7 +125,7 @@
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	74 # endif
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	75 #endif /* _Windows */
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	76
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	77 -#ifdef _Windows
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	78 +#ifdef IGNORE_Windows
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	79 # include <windows.h>
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	80 # ifdef __MSC__
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	81 # include <malloc.h>
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	82 @@ -2535,6 +2535,7 @@
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	83 void
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	84 help_command()
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	85 {
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	86 +#ifndef __MINGW32__
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	87 HWND parent;
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	88
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	89 c_token++;
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	90 @@ -2570,6 +2571,7 @@
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	91 link.fIndexOnFail = TRUE;
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	92 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	93 }
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	94 +#endif
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	95 }
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	96 #else /* !_Windows */
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	97 #ifndef VMS
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	98 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	99 --- 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	100 +++ 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	101 @@ -47,7 +47,7 @@
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	102
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	103 #include <math.h>
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	104
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	105 -#ifndef _WIN64
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	106 +#if !defined(__MINGW64_VERSION_MAJOR)
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	107 /*
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	108 * 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	109 * 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	110 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	111 --- 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	112 +++ 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	113 @@ -345,7 +345,11 @@
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 #ifndef GP_MATHERR
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	117 -# define GP_MATHERR matherr
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	118 +# if __MINGW32__
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	119 +# define GP_MATHERR _matherr
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	120 +#else
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	121 +# define GP_MATHERR matherr
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	122 +#endif
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	123 #endif
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	124
a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	125 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H

Mercurial > mxe-octave

annotate src/gnuplot-1-fixes.patch @ 4191:851b9f4a6b1c