Mercurial > mxe-octave
annotate src/gnuplot-1-fixes.patch @ 5073:9ac443dd92ad
cmake: update to v3.14.4
* src/build-cmake.mk: update version, checksum
* src/cmake.mk: update version, checksum
author | John Donoghue |
---|---|
date | Fri, 17 May 2019 10:09:55 -0400 |
parents | 3768d38e7967 |
children | e2f8b7a140f7 |
rev | line source |
---|---|
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
1 diff -ur gnuplot-5.2.2.orig/config/mingw/Makefile gnuplot-5.2.2/config/mingw/Makefile |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
2 --- gnuplot-5.2.2.orig/config/mingw/Makefile 2018-03-25 07:03:19.453562126 -0400 |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
3 +++ gnuplot-5.2.2/config/mingw/Makefile 2018-03-25 07:24:23.502361443 -0400 |
4991
3768d38e7967
Include lua/tikz terminal in gnuplot for Windows (bug #48474).
Markus Mützel <markus.muetzel@gmx.de>
parents:
4640
diff
changeset
|
4 @@ -107,23 +107,24 @@ |
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 |
4991
3768d38e7967
Include lua/tikz terminal in gnuplot for Windows (bug #48474).
Markus Mützel <markus.muetzel@gmx.de>
parents:
4640
diff
changeset
|
27 # Uncomment the following line to select the lua/tikz terminal |
3768d38e7967
Include lua/tikz terminal in gnuplot for Windows (bug #48474).
Markus Mützel <markus.muetzel@gmx.de>
parents:
4640
diff
changeset
|
28 -#LUA=lua |
3768d38e7967
Include lua/tikz terminal in gnuplot for Windows (bug #48474).
Markus Mützel <markus.muetzel@gmx.de>
parents:
4640
diff
changeset
|
29 +LUA=lua |
3768d38e7967
Include lua/tikz terminal in gnuplot for Windows (bug #48474).
Markus Mützel <markus.muetzel@gmx.de>
parents:
4640
diff
changeset
|
30 |
3768d38e7967
Include lua/tikz terminal in gnuplot for Windows (bug #48474).
Markus Mützel <markus.muetzel@gmx.de>
parents:
4640
diff
changeset
|
31 # Uncomment the following line to select the caca terminal |
3768d38e7967
Include lua/tikz terminal in gnuplot for Windows (bug #48474).
Markus Mützel <markus.muetzel@gmx.de>
parents:
4640
diff
changeset
|
32 # Requires libcaca version 0.99.beta15 or newer. A post-beta18 |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
33 @@ -136,7 +137,7 @@ |
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
34 |
4151 | 35 # Uncomment if you have libcerf |
36 # http://sourceforge.net/projects/libcerf/ | |
37 -CERF=1 | |
38 +#CERF=1 | |
39 | |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
40 # Uncomment if console mode gnuplot should use GNU readline |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
41 # (not recommended) |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
42 @@ -165,10 +166,10 @@ |
4151 | 43 |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
44 # Destination directory, used in 'make install': |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
45 #DESTDIR = /local/opt/gnuplot-4.5 |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
46 -DESTDIR = "$(PROGRAMFILES)/gnuplot" |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
47 +DESTDIR ?= "$(PROGRAMFILES)/gnuplot" |
4191
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
48 |
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
49 # Do you want some special optimization / flags? |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
50 -#CFLAGS += |
4191
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
51 +CFLAGS += -DDISABLE_SPACE_RAISES_CONSOLE |
4443 | 52 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
|
53 ifdef CLANG |
851b9f4a6b1c
Disable space raise console gnuplot for windows (bug #48696)
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
4177
diff
changeset
|
54 CFLAGS += -fcolor-diagnostics -fansi-escape-codes |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
55 @@ -186,8 +187,8 @@ |
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
56 # 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
|
57 # 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
|
58 # adjust the include and library paths. |
4177
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
59 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/ |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
60 -HHC = $(HHWPATH)hhc |
4177
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
61 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/ |
4151 | 62 +#HHC = $(HHWPATH)hhc |
2891
848118c648ae
Include gnuplot as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
63 |
3945
a397ccee4b57
Bump up gnuplot version to 4.6.7
Tatsuro Matsuoka <tmacchant@yahoo.co.jp>
parents:
3281
diff
changeset
|
64 # 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
|
65 GNU_RC = 1 |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
66 @@ -203,7 +204,7 @@ |
4151 | 67 # get it from: http://www.jrsoftware.org/isdl.php |
4443 | 68 # Use unicode version of Inno Setup Compiler but not Standard version |
69 # 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
|
70 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc |
16b2ee1a1b5d
gnuplot: update for 5.0.4
"lostbard" <john.donoghue@ieee.org>
parents:
4151
diff
changeset
|
71 +#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
|
72 |
4151 | 73 # Directory that might contain extra files to be shipped with the installer. |
74 # This should include dependencies like DLLs, but also fontconfig configuration files. | |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
75 @@ -453,9 +454,9 @@ |
4297 | 76 |
77 ifdef WXT | |
78 CFLAGS += -DWXWIDGETS | |
79 - WXT_CXXFLAGS := $(shell wx-config --cxxflags) | |
80 + WXT_CXXFLAGS := $(shell $(WX_CONFIG) --cxxflags) | |
81 CXXFLAGS += $(WXT_CXXFLAGS) | |
82 - WX_LIBS := $(shell wx-config --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g") | |
83 + WX_LIBS := $(shell $(WX_CONFIG) --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g") | |
84 WX_OBJS = wxt_gui.$(O) | |
85 endif | |
86 | |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
87 @@ -479,10 +480,12 @@ |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
88 moc_QtGnuplotWidget.o moc_QtGnuplotScene.o \ |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
89 moc_QtGnuplotEvent.o qrc_QtGnuplotResource.o |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
90 # |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
91 - MOC = $(QT_DIR)/bin/moc |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
92 - UIC = $(QT_DIR)/bin/uic |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
93 - RCC = $(QT_DIR)/bin/rcc |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
94 - LRELEASE = $(QT_DIR)/bin/lrelease |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
95 + QT_BIN_DIR ?= $(QT_DIR)/bin |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
96 + MOC ?= $(QT_BIN_DIR)/moc |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
97 + UIC ?= $(QT_BIN_DIR)/uic |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
98 + RCC ?= $(QT_BIN_DIR)/rcc |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
99 + LRELEASE ?= $(QT_BIN_DIR)/lrelease |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
100 + |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
101 QT_FILES_TARGETS = qrc_QtGnuplotResource.cpp ui_QtGnuplotSettings.h moc_QtGnuplotWindow.cpp moc_QtGnuplotApplication.cpp |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
102 QT_FILES_TARGETS += moc_QtGnuplotWidget.cpp moc_QtGnuplotScene.cpp moc_QtGnuplotEvent.cpp |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
103 QT_TRANSLATION = qtgnuplot_fr.qm qtgnuplot_ja.qm |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
104 @@ -556,7 +559,7 @@ |
4343 | 105 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL) |
106 | |
107 | |
108 -default: $(TARGET) $(MENUFILE) support | |
109 +default: $(TARGET) $(MENUFILE) #support | |
110 | |
111 console: | |
112 $(MAKE) TARGET=gnuplot.exe default | |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
113 @@ -598,8 +601,8 @@ |
4343 | 114 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< |
115 | |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
116 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus -lshlwapi -ld2d1 -ldwrite -lole32 |
4343 | 117 -LDLIBS += -lhtmlhelp |
118 -LDFLAGS2 += -L$(HHWPATH)lib | |
119 +#LDLIBS += -lhtmlhelp | |
120 +#LDFLAGS2 += -L$(HHWPATH)lib | |
121 ifdef MINGW64 | |
122 LDFLAGS2 += -L. | |
123 endif | |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
124 diff -ur gnuplot-5.2.2.orig/src/command.c gnuplot-5.2.2/src/command.c |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
125 --- gnuplot-5.2.2.orig/src/command.c 2018-03-25 07:03:19.367562832 -0400 |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
126 +++ gnuplot-5.2.2/src/command.c 2018-03-25 07:11:31.376521306 -0400 |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
127 @@ -121,7 +121,7 @@ |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
128 # include "help.h" |
4343 | 129 #endif /* _Windows */ |
130 | |
131 -#ifdef _Windows | |
132 +#ifdef IGNORE_Windows | |
133 # include <windows.h> | |
134 # ifdef __MSC__ | |
135 # include <malloc.h> | |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
136 @@ -2861,6 +2861,7 @@ |
4343 | 137 void |
138 help_command() | |
139 { | |
140 +#ifndef __MINGW32__ | |
141 HWND parent; | |
4297 | 142 |
4343 | 143 c_token++; |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
144 @@ -2904,6 +2905,7 @@ |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
145 link.fIndexOnFail = TRUE; |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
146 HtmlHelp(parent, winhelpname, HH_KEYWORD_LOOKUP, (DWORD_PTR)&link); |
4343 | 147 } |
148 +#endif | |
149 } | |
150 #else /* !_Windows */ | |
151 #ifndef VMS | |
4640
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
152 diff -ur gnuplot-5.2.2.orig/src/syscfg.h gnuplot-5.2.2/src/syscfg.h |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
153 --- gnuplot-5.2.2.orig/src/syscfg.h 2018-03-25 07:03:19.380562726 -0400 |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
154 +++ gnuplot-5.2.2/src/syscfg.h 2018-03-25 07:13:12.163693406 -0400 |
fc9edc9be940
gnuplot: update to 5.2.2
John Donoghue <john.donoghue@ieee.org>
parents:
4472
diff
changeset
|
155 @@ -362,7 +362,11 @@ |
4443 | 156 #endif |
4343 | 157 |
158 #ifndef GP_MATHERR | |
4443 | 159 -# define GP_MATHERR matherr |
4343 | 160 +# if __MINGW32__ |
161 +# define GP_MATHERR _matherr | |
162 +#else | |
163 +# define GP_MATHERR matherr | |
4443 | 164 +# endif |
4343 | 165 #endif |
166 | |
167 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H |