Mercurial > mxe-octave
annotate src/gnuplot-1-fixes.patch @ 4343:16d2b997c31b
gnuplot: update t 5.0.5
* src/gnuplot-1-fixes.patch: update patch
* src/gnuplot.mk: update version, checksum
| author | John D |
|---|---|
| date | Fri, 20 Jan 2017 12:15:15 -0500 |
| parents | 8f864b4ea93b |
| children | 6aa7dd77d82c |
| rev | line source |
|---|---|
| 4343 | 1 diff -ur gnuplot-5.0.5.orig/config/mingw/Makefile gnuplot-5.0.5/config/mingw/Makefile |
| 2 --- gnuplot-5.0.5.orig/config/mingw/Makefile 2017-01-20 12:00:04.522364256 -0500 | |
| 3 +++ gnuplot-5.0.5/config/mingw/Makefile 2017-01-20 12:10:38.856621795 -0500 | |
| 4 @@ -101,15 +101,16 @@ | |
| 5 # Uncomment the following lines to compile it. | |
| 6 #WXT=1 | |
| 7 #CAIROLIBS=1 | |
| 8 +WX_CONFIG ?= wx-config | |
| 9 | |
| 10 # Build qt terminal? | |
| 11 #QT = 1 | |
| 12 # specify QT installation directory | |
| 13 #QT_DIR = /c/Qt/5.2.1/mingw48_32 | |
| 14 ifndef MINGW64 | |
| 15 -QT_DIR = /d/Source/Qt-5.2.1-mingw/5.2.1/mingw48_32 | |
| 16 +QT_DIR ?= /d/Source/Qt-5.2.1-mingw/5.2.1/mingw48_32 | |
| 17 else | |
| 18 -QT_DIR = /mingw64 | |
| 19 +QT_DIR ?= /mingw64 | |
| 20 endif | |
| 21 | |
| 22 # Uncomment the following line to select the lua/tikz terminal | |
| 23 @@ -119,14 +120,14 @@ | |
| 4151 | 24 # Requires libcaca version 0.99.beta15 or newer. A post-beta18 |
| 25 # svn version is recommended since it contains an improved | |
| 26 # win32 backend. | |
| 27 -CACA=1 | |
| 28 +#CACA=1 | |
|
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 |
| 4151 | 30 # Uncomment if you have libiconv |
| 31 ICONV=1 | |
|
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
32 |
| 4151 | 33 # Uncomment if you have libcerf |
| 34 # http://sourceforge.net/projects/libcerf/ | |
| 35 -CERF=1 | |
| 36 +#CERF=1 | |
| 37 | |
| 38 # Below you can adapt paths according to your software setup: | |
| 39 | |
| 4343 | 40 @@ -155,7 +156,7 @@ |
|
4191
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
41 DESTDIR = "$(PROGRAMFILES)/gnuplot" |
|
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
42 |
|
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
43 # 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
|
44 -#CFLAGS += |
|
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
45 +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
|
46 ifdef CLANG |
|
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
47 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
|
48 CFLAGS += -Wno-error=incompatible-ms-struct -Wno-ignored-attributes |
| 4343 | 49 @@ -171,8 +172,8 @@ |
|
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
50 # 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
|
51 # 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
|
52 # adjust the include and library paths. |
|
4177
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
53 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/ |
|
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
54 -HHC = $(HHWPATH)hhc |
|
4177
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
55 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/ |
| 4151 | 56 +#HHC = $(HHWPATH)hhc |
|
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
57 |
|
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
58 # 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
|
59 GNU_RC = 1 |
| 4343 | 60 @@ -186,7 +187,7 @@ |
|
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
61 |
| 4151 | 62 # Inno Setup Compiler |
| 63 # 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
|
64 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc |
|
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
65 +#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
|
66 |
| 4151 | 67 # Directory that might contain extra files to be shipped with the installer. |
| 68 # This should include dependencies like DLLs, but also fontconfig configuration files. | |
| 4297 | 69 @@ -422,9 +423,9 @@ |
| 70 | |
| 71 ifdef WXT | |
| 72 CFLAGS += -DWXWIDGETS | |
| 73 - WXT_CXXFLAGS := $(shell wx-config --cxxflags) | |
| 74 + WXT_CXXFLAGS := $(shell $(WX_CONFIG) --cxxflags) | |
| 75 CXXFLAGS += $(WXT_CXXFLAGS) | |
| 76 - WX_LIBS := $(shell wx-config --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g") | |
| 77 + WX_LIBS := $(shell $(WX_CONFIG) --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g") | |
| 78 WX_OBJS = wxt_gui.$(O) | |
| 79 endif | |
| 80 | |
| 4343 | 81 @@ -514,7 +515,7 @@ |
| 82 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL) | |
| 83 | |
| 84 | |
| 85 -default: $(TARGET) $(MENUFILE) support | |
| 86 +default: $(TARGET) $(MENUFILE) #support | |
| 87 | |
| 88 console: | |
| 89 $(MAKE) TARGET=gnuplot.exe default | |
| 90 @@ -556,8 +557,8 @@ | |
| 91 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< | |
| 92 | |
| 93 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus | |
| 94 -LDLIBS += -lhtmlhelp | |
| 95 -LDFLAGS2 += -L$(HHWPATH)lib | |
| 96 +#LDLIBS += -lhtmlhelp | |
| 97 +#LDFLAGS2 += -L$(HHWPATH)lib | |
| 98 ifdef MINGW64 | |
| 99 LDFLAGS2 += -L. | |
| 100 endif | |
| 101 diff -ur gnuplot-5.0.5.orig/src/command.c gnuplot-5.0.5/src/command.c | |
| 102 --- gnuplot-5.0.5.orig/src/command.c 2017-01-20 12:00:04.431361673 -0500 | |
| 103 +++ gnuplot-5.0.5/src/command.c 2017-01-20 12:04:46.221964530 -0500 | |
| 104 @@ -125,7 +125,7 @@ | |
| 4297 | 105 # endif |
| 4343 | 106 #endif /* _Windows */ |
| 107 | |
| 108 -#ifdef _Windows | |
| 109 +#ifdef IGNORE_Windows | |
| 110 # include <windows.h> | |
| 111 # ifdef __MSC__ | |
| 112 # include <malloc.h> | |
| 113 @@ -2537,6 +2537,7 @@ | |
| 114 void | |
| 115 help_command() | |
| 116 { | |
| 117 +#ifndef __MINGW32__ | |
| 118 HWND parent; | |
| 4297 | 119 |
| 4343 | 120 c_token++; |
| 121 @@ -2572,6 +2573,7 @@ | |
| 122 link.fIndexOnFail = TRUE; | |
| 123 HtmlHelp(parent, winhelpname, HH_KEYWORD_LOOKUP, (DWORD_PTR)&link); | |
| 124 } | |
| 125 +#endif | |
| 126 } | |
| 127 #else /* !_Windows */ | |
| 128 #ifndef VMS | |
| 129 diff -ur gnuplot-5.0.5.orig/src/internal.c gnuplot-5.0.5/src/internal.c | |
| 130 --- gnuplot-5.0.5.orig/src/internal.c 2017-01-20 12:00:04.456279047 -0500 | |
| 131 +++ gnuplot-5.0.5/src/internal.c 2017-01-20 12:05:51.920459353 -0500 | |
| 132 @@ -47,7 +47,7 @@ | |
| 133 | |
| 134 #include <math.h> | |
| 135 | |
| 136 -#ifndef _WIN64 | |
| 137 +#if !defined(__MINGW64_VERSION_MAJOR) | |
| 138 /* | |
| 139 * FIXME: This is almost certainly out of date on linux, since the matherr | |
| 140 * mechanism has been replaced by math_error() and supposedly is only | |
| 141 diff -ur gnuplot-5.0.5.orig/src/syscfg.h gnuplot-5.0.5/src/syscfg.h | |
| 142 --- gnuplot-5.0.5.orig/src/syscfg.h 2017-01-20 12:00:04.441111950 -0500 | |
| 143 +++ gnuplot-5.0.5/src/syscfg.h 2017-01-20 12:06:54.955043738 -0500 | |
| 144 @@ -346,6 +346,11 @@ | |
| 145 | |
| 146 #ifndef GP_MATHERR | |
| 147 # define GP_MATHERR matherr | |
| 148 +# if __MINGW32__ | |
| 149 +# define GP_MATHERR _matherr | |
| 150 +#else | |
| 151 +# define GP_MATHERR matherr | |
| 152 +#endif | |
| 153 #endif | |
| 154 | |
| 155 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H |