Mercurial > mxe-octave

annotate src/gnuplot-1-fixes.patch @ 3945:a397ccee4b57

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