Mercurial > mxe-octave
comparison src/gnuplot-1-fixes.patch @ 3945:a397ccee4b57
Bump up gnuplot version to 4.6.7
* src/gnuplot-1-fixes.patch: update patch, merge into one
* src/gnuplot-2-win64.patch: removed
* src/gnuplot-3-iconv.patch: removed
* dist-files.mk: removed gnuplot-2-win64.patch, gnuplot-3-iconv.patch
* src/gnuplot.mk: update version, checksum
author | Tatsuro Matsuoka <tmacchant@yahoo.co.jp> |
---|---|
date | Thu, 21 May 2015 07:17:32 +0900 |
parents | 53c8b9c843c6 |
children | 717e989767e3 |
comparison
equal
deleted
inserted
replaced
3944:d83f02205481 | 3945:a397ccee4b57 |
---|---|
1 diff -ur gnuplot-4.6.4.orig/config/mingw/Makefile gnuplot-4.6.4/config/mingw/Makefile | 1 diff -ur gnuplot-4.6.7/config/mingw/Makefile gnuplot-4.6.7-commit/config/mingw/Makefile |
2 --- gnuplot-4.6.4.orig/config/mingw/Makefile 2013-11-04 18:26:55.000000000 -0500 | 2 --- gnuplot-4.6.7/config/mingw/Makefile 2014-06-13 01:56:55.000000000 +0900 |
3 +++ gnuplot-4.6.4/config/mingw/Makefile 2013-11-04 18:28:37.000000000 -0500 | 3 +++ gnuplot-4.6.7-commit/config/mingw/Makefile 2015-05-16 11:46:53.704000000 +0900 |
4 @@ -27,7 +27,7 @@ | 4 @@ -27,7 +27,7 @@ |
5 | 5 |
6 # Use more modern HTML help instead of no longer supported Windows help system | 6 # Use more modern HTML help instead of no longer supported Windows help system |
7 # Please update the HHWPATH below if necessary. | 7 # Please update the HHWPATH below if necessary. |
8 -HTML_HELP=1 | 8 -HTML_HELP=1 |
9 +#HTML_HELP=1 | 9 +#HTML_HELP=1 |
10 | 10 |
11 # GIF, PNG, JPEG device drivers | 11 # GIF, PNG, JPEG device drivers |
12 # Requires gd library. There are two possibilities how to configure these | 12 # Requires gd library. There are two possibilities how to configure these |
13 @@ -127,29 +127,29 @@ | 13 @@ -127,29 +127,29 @@ |
14 # -mpentiumpro means optimize for Pentium II and Pro procesors | 14 # -mpentiumpro means optimize for Pentium II and Pro processors |
15 #CFLAGS += | 15 #CFLAGS += |
16 | 16 |
17 -ifdef HTML_HELP | 17 -ifdef HTML_HELP |
18 - | 18 +# ifdef HTML_HELP |
19 -# To compile the .chm file you need the Microsoft HTML Help 1.4 SDK | 19 |
20 -# It can be obtained here: | 20 # To compile the .chm file you need the Microsoft HTML Help 1.4 SDK |
21 -# http://go.microsoft.com/fwlink/?LinkId=154968 | 21 # It can be obtained here: |
22 -# We need to explicitly set the correct path here since we also need | 22 # http://go.microsoft.com/fwlink/?LinkId=154968 |
23 -# adjust the include and linrary paths. | 23 # We need to explicitly set the correct path here since we also need |
24 # adjust the include and library paths. | |
24 -HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" | 25 -HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" |
25 -HHC = $(HHWPATH)hhc | 26 -HHC = $(HHWPATH)hhc |
26 +# ifdef HTML_HELP | 27 +# HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" |
28 +# HHC = $(HHWPATH)hhc | |
27 | 29 |
28 -else | 30 -else |
29 +# # To compile the .chm file you need the Microsoft HTML Help 1.4 SDK | |
30 +# # It can be obtained here: | |
31 +# # http://go.microsoft.com/fwlink/?LinkId=154968 | |
32 +# # We need to explicitly set the correct path here since we also need | |
33 +# # adjust the include and linrary paths. | |
34 +# HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" | |
35 +# HHC = $(HHWPATH)hhc | |
36 + | |
37 +# else | 31 +# else |
38 + | 32 |
39 +# # To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help | 33 # To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help |
40 +# # Workshop. The latter can be obtained from either of | 34 # Workshop. The latter can be obtained from either of |
41 +# # ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe | 35 # ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe |
42 +# # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098 | 36 # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098 |
43 +# # Put the path to hcw here unless it is already in PATH: | 37 # Put the path to hcw here unless it is already in PATH: |
38 -HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/" | |
39 -HCW = $(HCWPATH)hcw | |
44 +# HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/" | 40 +# HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/" |
45 +# HCW = $(HCWPATH)hcw | 41 +# HCW = $(HCWPATH)hcw |
46 +# # Switches are for HCW 4.03: | 42 # Switches are for HCW 4.03: |
43 -HCWFLAG = | |
47 +# HCWFLAG = | 44 +# HCWFLAG = |
48 | 45 |
49 -# To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help | |
50 -# Workshop. The latter can be obtained from either of | |
51 -# ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe | |
52 -# http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098 | |
53 -# Put the path to hcw here unless it is already in PATH: | |
54 -HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/" | |
55 -HCW = $(HCWPATH)hcw | |
56 -# Switches are for HCW 4.03: | |
57 -HCWFLAG = | |
58 - | |
59 -endif | 46 -endif |
60 +# endif | 47 +# endif |
61 | 48 |
62 # Choose which windres/rc do you want to use (GNU windres or MS RC): | 49 # Choose which resource compiler you want to use (GNU windres or MS rc): |
63 GNU_RC = 1 | 50 GNU_RC = 1 |
64 @@ -401,7 +401,7 @@ | 51 @@ -382,8 +382,9 @@ |
52 endif | |
53 | |
54 ifdef ICONV | |
55 - CFLAGS += -DHAVE_ICONV | |
56 - TERMLIBS += -liconv | |
57 + CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS) | |
58 + LDFLAGS += $(ICONV_LDFLAGS) | |
59 + TERMLIBS += -liconv | |
60 endif | |
61 | |
62 ifdef GNU_RC | |
63 @@ -401,7 +402,7 @@ | |
65 RES2COFF = res2coff -i wgnuplot.res -o wgplt_res.$(O) | 64 RES2COFF = res2coff -i wgnuplot.res -o wgplt_res.$(O) |
66 endif | 65 endif |
67 | 66 |
68 -default: $(TARGET) $(MENUFILE) support | 67 -default: $(TARGET) $(MENUFILE) support |
69 +default: $(TARGET) $(MENUFILE) # support | 68 +default: $(TARGET) $(MENUFILE) # support |
70 | 69 |
71 console: | 70 console: |
72 $(MAKE) TARGET=gnuplot.exe gnuplot.exe | 71 $(MAKE) TARGET=gnuplot.exe gnuplot.exe |
73 @@ -443,7 +443,7 @@ | 72 @@ -443,7 +444,7 @@ |
74 LDFLAGS2 += -L$(HHWPATH)lib | 73 LDFLAGS2 += -L$(HHWPATH)lib |
75 endif | 74 endif |
76 | 75 |
77 -$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) texticon.ico grpicon.ico | 76 -$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) texticon.ico grpicon.ico |
78 +$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) TEXTICON.ico GRPICON.ico | 77 +$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) TEXTICON.ico GRPICON.ico |
79 $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\ | 78 $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\ |
80 $(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS) | 79 $(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS) |
81 | 80 |
82 @@ -458,7 +458,7 @@ | 81 @@ -458,7 +459,7 @@ |
83 | 82 |
84 # explicit rules | 83 # explicit rules |
85 | 84 |
86 -wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico | 85 -wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico |
87 +wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico | 86 +wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico |
88 $(RC) $(RCFLAGS) $< $(RCOUT) | 87 $(RC) $(RCFLAGS) $< $(RCOUT) |
89 $(RES2COFF) | 88 $(RES2COFF) |
90 | 89 |
91 @@ -494,13 +494,13 @@ | 90 @@ -494,13 +495,13 @@ |
92 $(CC) -c $(CFLAGS) $(CXXFLAGS) $(PANGOCAIRO_CFLAGS) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< | 91 $(CC) -c $(CFLAGS) $(CXXFLAGS) $(PANGOCAIRO_CFLAGS) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< |
93 | 92 |
94 # extract icons from wgnuplot.rc | 93 # extract icons from wgnuplot.rc |
95 -texticon.ico: grpicon.ico | 94 -texticon.ico: grpicon.ico |
96 +TEXTICON.ico: GRPICON.ico | 95 +TEXTICON.ico: GRPICON.ico |
104 +geticon: $(W)/geticon.c | 103 +geticon: $(W)/geticon.c |
105 + gcc -o $@ $< | 104 + gcc -o $@ $< |
106 | 105 |
107 ifdef HTML_HELP | 106 ifdef HTML_HELP |
108 # convert gnuplot.doc to windows/wgnuplot.html | 107 # convert gnuplot.doc to windows/wgnuplot.html |
109 @@ -703,7 +703,7 @@ | 108 @@ -703,7 +704,7 @@ |
110 $(RM) config.h wgnuplot.map wgnuplot.res $(W)/gnuplot.rtf | 109 $(RM) config.h wgnuplot.map wgnuplot.res $(W)/gnuplot.rtf |
111 $(RM) *.$(O) *.po *.o *.co *.d | 110 $(RM) *.$(O) *.po *.o *.co *.d |
112 $(RM) doc2*.exe $(W)/wgnuplib.res wgnuplib.map wgnuplot.lib | 111 $(RM) doc2*.exe $(W)/wgnuplib.res wgnuplib.map wgnuplot.lib |
113 - $(RM) $(M)bf_test.exe *.ico geticon.exe allterm.h allterm.c | 112 - $(RM) $(M)bf_test.exe *.ico geticon.exe allterm.h allterm.c |
114 + $(RM) $(M)bf_test.exe *.ico geticon allterm.h allterm.c | 113 + $(RM) $(M)bf_test.exe *.ico geticon allterm.h allterm.c |
115 $(RM) *.aux *.log *.dvi *.toc | 114 $(RM) *.aux *.log *.dvi *.toc |
116 $(RM) gnuplot.tex gnuplot-figures.tex pdffigures.tex figure_*.pdf | 115 $(RM) gnuplot.tex gnuplot-figures.tex pdffigures.tex figure_*.pdf |
117 $(RM) titlepag.tex toc_entr.sty VERSION | 116 $(RM) titlepag.tex toc_entr.sty VERSION |
118 @@ -802,7 +802,7 @@ | 117 @@ -802,7 +803,7 @@ |
119 | 118 |
120 installer: | 119 installer: |
121 $(MAKE) DESTDIR=./dist install | 120 $(MAKE) DESTDIR=./dist install |
122 - cp -p grpicon.ico ./dist/bin/ | 121 - cp -p grpicon.ico ./dist/bin/ |
123 + cp -p GRPICON.ico ./dist/bin/ | 122 + cp -p GRPICON.ico ./dist/bin/ |
124 cp -p $(TOP)/win/*.iss ./dist | 123 cp -p $(TOP)/win/*.iss ./dist |
125 (cd ./dist; $(ISCC) gnuplot.iss) | 124 (cd ./dist; $(ISCC) gnuplot.iss) |
126 ifdef RELEASE | 125 ifdef RELEASE |
127 diff -ur gnuplot-4.6.4.orig/src/win/wgnuplot.rc gnuplot-4.6.4/src/win/wgnuplot.rc | 126 |
128 --- gnuplot-4.6.4.orig/src/win/wgnuplot.rc 2013-11-04 18:26:55.000000000 -0500 | 127 diff -ur gnuplot-4.6.7/src/syscfg.h gnuplot-4.6.7-commit/src/syscfg.h |
129 +++ gnuplot-4.6.4/src/win/wgnuplot.rc 2013-11-04 18:27:15.000000000 -0500 | 128 --- gnuplot-4.6.7/src/syscfg.h 2014-08-01 01:56:25.000000000 +0900 |
130 @@ -15,8 +15,8 @@ | 129 +++ gnuplot-4.6.7-commit/src/syscfg.h 2015-05-16 15:27:58.612000000 +0900 |
130 @@ -317,11 +317,19 @@ | |
131 #endif | |
132 | |
133 #ifndef GP_EXCEPTION_NAME | |
134 -# define GP_EXCEPTION_NAME exception | |
135 +# if __MINGW32__ | |
136 +# define GP_EXCEPTION_NAME _exception | |
137 +# else | |
138 +# define GP_EXCEPTION_NAME exception | |
139 +# endif | |
140 #endif | |
141 | |
142 #ifndef GP_MATHERR | |
143 -# define GP_MATHERR matherr | |
144 +# if __MINGW32__ | |
145 +# define GP_MATHERR _matherr | |
146 +# else | |
147 +# define GP_MATHERR matherr | |
148 +# endif | |
149 #endif | |
150 | |
151 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H | |
152 | |
153 diff -ur gnuplot-4.6.7/src/win/wgnuplot.rc gnuplot-4.6.7-commit/src/win/wgnuplot.rc | |
154 --- gnuplot-4.6.7/src/win/wgnuplot.rc 2014-07-08 03:18:41.000000000 +0900 | |
155 +++ gnuplot-4.6.7-commit/src/win/wgnuplot.rc 2015-05-16 11:24:48.912000000 +0900 | |
156 @@ -19,8 +19,8 @@ | |
131 * rc -30 -k -dMSRC win\wgnuplot.rc wgnuplot.exe | 157 * rc -30 -k -dMSRC win\wgnuplot.rc wgnuplot.exe |
132 */ | 158 */ |
133 | 159 |
134 -GRPICON ICON "grpicon.ico" | 160 -GRPICON ICON "grpicon.ico" |
135 -TEXTICON ICON "texticon.ico" | 161 -TEXTICON ICON "texticon.ico" |
136 +GRPICON ICON "GRPICON.ico" | 162 +GRPICON ICON "GRPICON.ico" |
137 +TEXTICON ICON "TEXTICON.ico" | 163 +TEXTICON ICON "TEXTICON.ico" |
138 | 164 |
139 #else | 165 #else |
140 /* using Borland BRC.EXE */ | 166 /* using Borland BRC.EXE */ |
167 | |
168 diff -ur internal.orig.c internal.mod.c | |
169 --- a/src/internal.c 2014-07-08 03:18:40.000000000 +0900 | |
170 +++ b/src/internal.c 2015-05-16 19:29:17.660000000 +0900 | |
171 @@ -58,6 +58,7 @@ | |
172 | |
173 static enum DATA_TYPES sprintf_specifier __PROTO((const char *format)); | |
174 | |
175 +#ifndef __MINGW32__ | |
176 #ifndef _WIN64 | |
177 int | |
178 GP_MATHERR( STRUCT_EXCEPTION_P_X ) | |
179 @@ -65,6 +66,7 @@ | |
180 return (undefined = TRUE); /* don't print error message */ | |
181 } | |
182 #endif | |
183 +#endif | |
184 | |
185 #define BAD_DEFAULT default: int_error(NO_CARET, "internal error : type neither INT or CMPLX"); return; | |
186 |