Mercurial > mxe-octave

comparison src/gnuplot-1-fixes.patch @ 4151:717e989767e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: update to 5.0.3 * src/gnuplot.mk: update version, checksum * src/gnuplot-1-fixes.patch: update patch
author John Donoghue
date Fri, 27 May 2016 09:58:12 -0400
parents a397ccee4b57
children 16b2ee1a1b5d
comparison
equal deleted inserted replaced
4150:5e57f06cd77f 4151:717e989767e3
1 diff -ur gnuplot-4.6.7/config/mingw/Makefile gnuplot-4.6.7-commit/config/mingw/Makefile 1 diff -ur gnuplot-5.0.3.orig/config/config.mgw gnuplot-5.0.3/config/config.mgw
2 --- gnuplot-4.6.7/config/mingw/Makefile 2014-06-13 01:56:55.000000000 +0900 2 --- gnuplot-5.0.3.orig/config/config.mgw 2016-05-25 15:58:26.763608353 -0400
3 +++ gnuplot-4.6.7-commit/config/mingw/Makefile 2015-05-16 11:46:53.704000000 +0900 3 +++ gnuplot-5.0.3/config/config.mgw 2016-05-27 08:00:58.093953296 -0400
4 @@ -27,7 +27,7 @@ 4 @@ -671,5 +671,5 @@
5 #endif
5 6
6 # Use more modern HTML help instead of no longer supported Windows help system 7 /* gnuplot.gih is not used by wgnuplot */
7 # Please update the HHWPATH below if necessary. 8 -#define NO_GIH 1
8 -HTML_HELP=1 9 +/*#define NO_GIH 1*/
9 +#HTML_HELP=1 10 #define HELPFILE "wgnuplot.chm"
11 diff -ur gnuplot-5.0.3.orig/config/mingw/Makefile gnuplot-5.0.3/config/mingw/Makefile
12 --- gnuplot-5.0.3.orig/config/mingw/Makefile 2016-05-25 15:58:26.763608353 -0400
13 +++ gnuplot-5.0.3/config/mingw/Makefile 2016-05-27 07:49:18.557940422 -0400
14 @@ -91,14 +91,14 @@
15 # Requires libcaca version 0.99.beta15 or newer. A post-beta18
16 # svn version is recommended since it contains an improved
17 # win32 backend.
18 -CACA=1
19 +#CACA=1
10 20
11 # GIF, PNG, JPEG device drivers 21 # Uncomment if you have libiconv
12 # Requires gd library. There are two possibilities how to configure these 22 ICONV=1
13 @@ -127,29 +127,29 @@
14 # -mpentiumpro means optimize for Pentium II and Pro processors
15 #CFLAGS +=
16 23
17 -ifdef HTML_HELP 24 # Uncomment if you have libcerf
18 +# ifdef HTML_HELP 25 # http://sourceforge.net/projects/libcerf/
26 -CERF=1
27 +#CERF=1
19 28
20 # To compile the .chm file you need the Microsoft HTML Help 1.4 SDK 29 # Below you can adapt paths according to your software setup:
21 # It can be obtained here: 30
31 @@ -140,8 +140,8 @@
22 # http://go.microsoft.com/fwlink/?LinkId=154968 32 # http://go.microsoft.com/fwlink/?LinkId=154968
23 # We need to explicitly set the correct path here since we also need 33 # We need to explicitly set the correct path here since we also need
24 # adjust the include and library paths. 34 # adjust the include and library paths.
25 -HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" 35 -HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/"
26 -HHC = $(HHWPATH)hhc 36 -HHC = $(HHWPATH)hhc
27 +# HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" 37 +#HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/"
28 +# HHC = $(HHWPATH)hhc 38 +#HHC = $(HHWPATH)hhc
29
30 -else
31 +# else
32
33 # To compile the .hlp file you need hcw either out of Microsoft SDK or MS Help
34 # Workshop. The latter can be obtained from either of
35 # ftp://ftp.microsoft.com/softlib/mslfiles/hcwsetup.exe
36 # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=34D35502-4DE9-4676-952C-34CC7F64F098
37 # Put the path to hcw here unless it is already in PATH:
38 -HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/"
39 -HCW = $(HCWPATH)hcw
40 +# HCWPATH = "$(PROGRAMFILES)/Help\ Workshop/"
41 +# HCW = $(HCWPATH)hcw
42 # Switches are for HCW 4.03:
43 -HCWFLAG =
44 +# HCWFLAG =
45
46 -endif
47 +# endif
48 39
49 # Choose which resource compiler you want to use (GNU windres or MS rc): 40 # Choose which resource compiler you want to use (GNU windres or MS rc):
50 GNU_RC = 1 41 GNU_RC = 1
51 @@ -382,8 +382,9 @@ 42 @@ -155,7 +155,7 @@
52 endif
53 43
54 ifdef ICONV 44 # Inno Setup Compiler
55 - CFLAGS += -DHAVE_ICONV 45 # get it from: http://www.jrsoftware.org/isdl.php
56 - TERMLIBS += -liconv 46 -ISCC = "$(PROGRAMFILES)/Inno Setup 5/iscc"
57 + CFLAGS += -DHAVE_ICONV $(ICONV_CFLAGS) 47 +#ISCC = "$(PROGRAMFILES)/Inno Setup 5/iscc"
58 + LDFLAGS += $(ICONV_LDFLAGS)
59 + TERMLIBS += -liconv
60 endif
61 48
62 ifdef GNU_RC 49 # Directory that might contain extra files to be shipped with the installer.
63 @@ -401,7 +402,7 @@ 50 # This should include dependencies like DLLs, but also fontconfig configuration files.
64 RES2COFF = res2coff -i wgnuplot.res -o wgplt_res.$(O) 51 @@ -445,7 +445,7 @@
65 endif 52 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL)
53
66 54
67 -default: $(TARGET) $(MENUFILE) support 55 -default: $(TARGET) $(MENUFILE) support
68 +default: $(TARGET) $(MENUFILE) # support 56 +default: $(TARGET) $(MENUFILE) # support
69 57
70 console: 58 console:
71 $(MAKE) TARGET=gnuplot.exe gnuplot.exe 59 $(MAKE) TARGET=gnuplot.exe default
72 @@ -443,7 +444,7 @@ 60 @@ -487,8 +487,8 @@
73 LDFLAGS2 += -L$(HHWPATH)lib 61 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $<
74 endif
75 62
76 -$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) texticon.ico grpicon.ico 63 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus
77 +$(TARGET): $(OBJS) $(WINOBJS) wgplt_res.$(O) TEXTICON.ico GRPICON.ico 64 -LDLIBS += -lhtmlhelp
65 -LDFLAGS2 += -L$(HHWPATH)lib
66 +#LDLIBS += -lhtmlhelp
67 +#LDFLAGS2 += -L$(HHWPATH)lib
68
69 $(TARGET): $(VERSIONING) $(OBJS) $(WINOBJS) wgplt_res.$(O) Makefile
78 $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\ 70 $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\
79 $(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS) 71 Only in gnuplot-5.0.3/config/mingw: .Makefile.swp
72 diff -ur gnuplot-5.0.3.orig/src/command.c gnuplot-5.0.3/src/command.c
73 --- gnuplot-5.0.3.orig/src/command.c 2016-05-25 15:58:26.693609393 -0400
74 +++ gnuplot-5.0.3/src/command.c 2016-05-27 07:55:44.467430876 -0400
75 @@ -117,7 +117,7 @@
76 #endif /* OS2_IPC */
80 77
81 @@ -458,7 +459,7 @@
82 78
83 # explicit rules 79 -#ifndef _Windows
80 +#ifndef IGNORE_Windows
81 # include "help.h"
82 #else
83 # ifdef USE_OWN_WINSYSTEM_FUNCTION
84 @@ -125,7 +125,7 @@
85 # endif
86 #endif /* _Windows */
84 87
85 -wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h texticon.ico grpicon.ico 88 -#ifdef _Windows
86 +wgplt_res.$(O): $(W)/wgnuplot.rc $(W)/wgnuplib.rc $(W)/wresourc.h TEXTICON.ico GRPICON.ico 89 +#ifdef IGNORE_Windows
87 $(RC) $(RCFLAGS) $< $(RCOUT) 90 # include <windows.h>
88 $(RES2COFF) 91 # ifdef __MSC__
92 # include <malloc.h>
93 diff -ur gnuplot-5.0.3.orig/src/internal.c gnuplot-5.0.3/src/internal.c
94 --- gnuplot-5.0.3.orig/src/internal.c 2016-05-25 15:58:26.743608650 -0400
95 +++ gnuplot-5.0.3/src/internal.c 2016-05-27 07:36:23.856997094 -0400
96 @@ -47,7 +47,7 @@
89 97
90 @@ -494,13 +495,13 @@ 98 #include <math.h>
91 $(CC) -c $(CFLAGS) $(CXXFLAGS) $(PANGOCAIRO_CFLAGS) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $<
92 99
93 # extract icons from wgnuplot.rc 100 -#ifndef _WIN64
94 -texticon.ico: grpicon.ico 101 +#if !defined(__MINGW64_VERSION_MAJOR)
95 +TEXTICON.ico: GRPICON.ico 102 /*
96 103 * FIXME: This is almost certainly out of date on linux, since the matherr
97 -grpicon.ico: geticon.exe $(W)/wgnuplot.rc 104 * mechanism has been replaced by math_error() and supposedly is only
98 +GRPICON.ico: geticon $(W)/wgnuplot.rc 105 diff -ur gnuplot-5.0.3.orig/src/syscfg.h gnuplot-5.0.3/src/syscfg.h
99 ./geticon $(W)/wgnuplot.rc 106 --- gnuplot-5.0.3.orig/src/syscfg.h 2016-05-25 15:58:26.698609318 -0400
100 107 +++ gnuplot-5.0.3/src/syscfg.h 2016-05-27 07:51:03.707439227 -0400
101 -geticon.exe: $(W)/geticon.c 108 @@ -341,11 +341,19 @@
102 - $(LD) $(LDFLAGS) -o $@ $<
103 +geticon: $(W)/geticon.c
104 + gcc -o $@ $<
105
106 ifdef HTML_HELP
107 # convert gnuplot.doc to windows/wgnuplot.html
108 @@ -703,7 +704,7 @@
109 $(RM) config.h wgnuplot.map wgnuplot.res $(W)/gnuplot.rtf
110 $(RM) *.$(O) *.po *.o *.co *.d
111 $(RM) doc2*.exe $(W)/wgnuplib.res wgnuplib.map wgnuplot.lib
112 - $(RM) $(M)bf_test.exe *.ico geticon.exe allterm.h allterm.c
113 + $(RM) $(M)bf_test.exe *.ico geticon allterm.h allterm.c
114 $(RM) *.aux *.log *.dvi *.toc
115 $(RM) gnuplot.tex gnuplot-figures.tex pdffigures.tex figure_*.pdf
116 $(RM) titlepag.tex toc_entr.sty VERSION
117 @@ -802,7 +803,7 @@
118
119 installer:
120 $(MAKE) DESTDIR=./dist install
121 - cp -p grpicon.ico ./dist/bin/
122 + cp -p GRPICON.ico ./dist/bin/
123 cp -p $(TOP)/win/*.iss ./dist
124 (cd ./dist; $(ISCC) gnuplot.iss)
125 ifdef RELEASE
126
127 diff -ur gnuplot-4.6.7/src/syscfg.h gnuplot-4.6.7-commit/src/syscfg.h
128 --- gnuplot-4.6.7/src/syscfg.h 2014-08-01 01:56:25.000000000 +0900
129 +++ gnuplot-4.6.7-commit/src/syscfg.h 2015-05-16 15:27:58.612000000 +0900
130 @@ -317,11 +317,19 @@
131 #endif 109 #endif
132 110
133 #ifndef GP_EXCEPTION_NAME 111 #ifndef GP_EXCEPTION_NAME
134 -# define GP_EXCEPTION_NAME exception 112 -# define GP_EXCEPTION_NAME exception
135 +# if __MINGW32__ 113 +# if __MINGW32__
136 +# define GP_EXCEPTION_NAME _exception
137 +# else
138 +# define GP_EXCEPTION_NAME exception 114 +# define GP_EXCEPTION_NAME exception
139 +# endif 115 +#else
116 +# define GP_EXCEPTION_NAME exception
117 +#endif
140 #endif 118 #endif
141 119
142 #ifndef GP_MATHERR 120 #ifndef GP_MATHERR
143 -# define GP_MATHERR matherr 121 -# define GP_MATHERR matherr
144 +# if __MINGW32__ 122 +# if __MINGW32__
145 +# define GP_MATHERR _matherr 123 +# define GP_MATHERR _matherr
146 +# else 124 +#else
147 +# define GP_MATHERR matherr 125 +# define GP_MATHERR matherr
148 +# endif 126 +#endif
149 #endif 127 #endif
150 128
151 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H 129 #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 @@
157 * rc -30 -k -dMSRC win\wgnuplot.rc wgnuplot.exe
158 */
159
160 -GRPICON ICON "grpicon.ico"
161 -TEXTICON ICON "texticon.ico"
162 +GRPICON ICON "GRPICON.ico"
163 +TEXTICON ICON "TEXTICON.ico"
164
165 #else
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