Mercurial > mxe-octave
annotate src/gnuplot-1-fixes.patch @ 4452:c615db675618
gnuplot: update to 5.0.7
* src/gnuplot.mk: update version, checksum
* src/gnuplot-1-fixes.patch: update patch
| author | John D |
|---|---|
| date | Wed, 16 Aug 2017 08:08:03 -0400 |
| parents | 6aa7dd77d82c |
| children | 0fdeee4cfe11 |
| rev | line source |
|---|---|
| 4452 | 1 diff -ur gnuplot-5.0.7.orig/config/mingw/Makefile gnuplot-5.0.7/config/mingw/Makefile |
| 2 --- gnuplot-5.0.7.orig/config/mingw/Makefile 2017-08-16 07:56:54.950650715 -0400 | |
| 3 +++ gnuplot-5.0.7/config/mingw/Makefile 2017-08-16 08:02:13.581632383 -0400 | |
| 4 @@ -101,18 +101,19 @@ | |
| 4343 | 5 # Uncomment the following lines to compile it. |
| 6 #WXT=1 | |
| 7 #CAIROLIBS=1 | |
| 8 +WX_CONFIG ?= wx-config | |
| 9 | |
| 10 # Build qt terminal? | |
| 4452 | 11 #QT=1 |
| 4343 | 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 | |
| 4443 | 18 ifdef M32 |
| 19 -QT_DIR = /mingw32 | |
| 20 +QT_DIR ?= /mingw32 | |
| 21 else | |
| 4343 | 22 -QT_DIR = /mingw64 |
| 23 +QT_DIR ?= /mingw64 | |
| 24 endif | |
| 4443 | 25 endif |
| 4343 | 26 |
| 4452 | 27 @@ -130,7 +131,7 @@ |
|
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
28 |
| 4151 | 29 # Uncomment if you have libcerf |
| 30 # http://sourceforge.net/projects/libcerf/ | |
| 31 -CERF=1 | |
| 32 +#CERF=1 | |
| 33 | |
| 34 # Below you can adapt paths according to your software setup: | |
| 35 | |
| 4452 | 36 @@ -159,6 +160,7 @@ |
|
4191
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
37 |
|
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
38 # Do you want some special optimization / flags? |
| 4443 | 39 #CFLAGS += |
|
4191
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
40 +CFLAGS += -DDISABLE_SPACE_RAISES_CONSOLE |
| 4443 | 41 CWFLAGS += -Wno-unused-function |
|
4191
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
42 ifdef CLANG |
|
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
43 CFLAGS += -fcolor-diagnostics -fansi-escape-codes |
| 4452 | 44 @@ -176,8 +178,8 @@ |
|
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
45 # 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
|
46 # 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
|
47 # adjust the include and library paths. |
|
4177
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
48 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/ |
|
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
49 -HHC = $(HHWPATH)hhc |
|
4177
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
50 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/ |
| 4151 | 51 +#HHC = $(HHWPATH)hhc |
|
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
52 |
|
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
53 # 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
|
54 GNU_RC = 1 |
| 4452 | 55 @@ -193,7 +195,7 @@ |
| 4151 | 56 # get it from: http://www.jrsoftware.org/isdl.php |
| 4443 | 57 # Use unicode version of Inno Setup Compiler but not Standard version |
| 58 # because the setup file of gnuplot installer is now encoded utf-8 with BOM. | |
|
4177
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
59 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc |
|
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
60 +#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
|
61 |
| 4151 | 62 # Directory that might contain extra files to be shipped with the installer. |
| 63 # This should include dependencies like DLLs, but also fontconfig configuration files. | |
| 4452 | 64 @@ -440,9 +442,9 @@ |
| 4297 | 65 |
| 66 ifdef WXT | |
| 67 CFLAGS += -DWXWIDGETS | |
| 68 - WXT_CXXFLAGS := $(shell wx-config --cxxflags) | |
| 69 + WXT_CXXFLAGS := $(shell $(WX_CONFIG) --cxxflags) | |
| 70 CXXFLAGS += $(WXT_CXXFLAGS) | |
| 71 - WX_LIBS := $(shell wx-config --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g") | |
| 72 + WX_LIBS := $(shell $(WX_CONFIG) --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g") | |
| 73 WX_OBJS = wxt_gui.$(O) | |
| 74 endif | |
| 75 | |
| 4452 | 76 @@ -532,7 +534,7 @@ |
| 4343 | 77 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL) |
| 78 | |
| 79 | |
| 80 -default: $(TARGET) $(MENUFILE) support | |
| 81 +default: $(TARGET) $(MENUFILE) #support | |
| 82 | |
| 83 console: | |
| 84 $(MAKE) TARGET=gnuplot.exe default | |
| 4452 | 85 @@ -574,8 +576,8 @@ |
| 4343 | 86 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< |
| 87 | |
| 88 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus | |
| 89 -LDLIBS += -lhtmlhelp | |
| 90 -LDFLAGS2 += -L$(HHWPATH)lib | |
| 91 +#LDLIBS += -lhtmlhelp | |
| 92 +#LDFLAGS2 += -L$(HHWPATH)lib | |
| 93 ifdef MINGW64 | |
| 94 LDFLAGS2 += -L. | |
| 95 endif | |
| 4452 | 96 Only in gnuplot-5.0.7/config/mingw: Makefile.orig |
| 97 diff -ur gnuplot-5.0.7.orig/src/command.c gnuplot-5.0.7/src/command.c | |
| 98 --- gnuplot-5.0.7.orig/src/command.c 2017-08-16 07:56:54.917649785 -0400 | |
| 99 +++ gnuplot-5.0.7/src/command.c 2017-08-16 08:02:13.581632383 -0400 | |
| 4343 | 100 @@ -125,7 +125,7 @@ |
| 4297 | 101 # endif |
| 4343 | 102 #endif /* _Windows */ |
| 103 | |
| 104 -#ifdef _Windows | |
| 105 +#ifdef IGNORE_Windows | |
| 106 # include <windows.h> | |
| 107 # ifdef __MSC__ | |
| 108 # include <malloc.h> | |
| 4452 | 109 @@ -2557,6 +2557,7 @@ |
| 4343 | 110 void |
| 111 help_command() | |
| 112 { | |
| 113 +#ifndef __MINGW32__ | |
| 114 HWND parent; | |
| 4297 | 115 |
| 4343 | 116 c_token++; |
| 4452 | 117 @@ -2592,6 +2593,7 @@ |
| 4343 | 118 link.fIndexOnFail = TRUE; |
| 119 HtmlHelp(parent, winhelpname, HH_KEYWORD_LOOKUP, (DWORD_PTR)&link); | |
| 120 } | |
| 121 +#endif | |
| 122 } | |
| 123 #else /* !_Windows */ | |
| 124 #ifndef VMS | |
| 4452 | 125 Only in gnuplot-5.0.7/src: command.c.orig |
| 126 diff -ur gnuplot-5.0.7.orig/src/internal.c gnuplot-5.0.7/src/internal.c | |
| 127 --- gnuplot-5.0.7.orig/src/internal.c 2017-08-16 07:56:54.932650208 -0400 | |
| 128 +++ gnuplot-5.0.7/src/internal.c 2017-08-16 08:02:13.582632412 -0400 | |
| 4343 | 129 @@ -47,7 +47,7 @@ |
| 130 | |
| 131 #include <math.h> | |
| 132 | |
| 133 -#ifndef _WIN64 | |
| 134 +#if !defined(__MINGW64_VERSION_MAJOR) | |
| 135 /* | |
| 136 * FIXME: This is almost certainly out of date on linux, since the matherr | |
| 137 * mechanism has been replaced by math_error() and supposedly is only | |
| 4452 | 138 diff -ur gnuplot-5.0.7.orig/src/syscfg.h gnuplot-5.0.7/src/syscfg.h |
| 139 --- gnuplot-5.0.7.orig/src/syscfg.h 2017-08-16 07:56:54.921649898 -0400 | |
| 140 +++ gnuplot-5.0.7/src/syscfg.h 2017-08-16 08:02:13.582632412 -0400 | |
| 4443 | 141 @@ -345,7 +345,11 @@ |
| 142 #endif | |
| 4343 | 143 |
| 144 #ifndef GP_MATHERR | |
| 4443 | 145 -# define GP_MATHERR matherr |
| 4343 | 146 +# if __MINGW32__ |
| 147 +# define GP_MATHERR _matherr | |
| 148 +#else | |
| 149 +# define GP_MATHERR matherr | |
| 4443 | 150 +# endif |
| 4343 | 151 #endif |
| 152 | |
| 153 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H |