Mercurial > mxe-octave

comparison src/gnuplot-1-fixes.patch @ 4177:16b2ee1a1b5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: update for 5.0.4 * src/gnuplot.mk: update version, checksum * src/gnuplot-1-fixes.patch: updated patch
author "lostbard" <john.donoghue@ieee.org>
date Fri, 15 Jul 2016 10:24:05 -0400
parents 717e989767e3
children 851b9f4a6b1c
comparison
equal deleted inserted replaced
4176:a543952ed731 4177:16b2ee1a1b5d
1 diff -ur gnuplot-5.0.3.orig/config/config.mgw gnuplot-5.0.3/config/config.mgw 1 diff -ur gnuplot-5.0.4.orig/config/mingw/Makefile gnuplot-5.0.4/config/mingw/Makefile
2 --- gnuplot-5.0.3.orig/config/config.mgw 2016-05-25 15:58:26.763608353 -0400 2 --- gnuplot-5.0.4.orig/config/mingw/Makefile 2016-07-21 13:47:52.025061617 -0400
3 +++ gnuplot-5.0.3/config/config.mgw 2016-05-27 08:00:58.093953296 -0400 3 +++ gnuplot-5.0.4/config/mingw/Makefile 2016-07-21 13:48:27.859547002 -0400
4 @@ -671,5 +671,5 @@ 4 @@ -119,14 +119,14 @@
5 #endif
6
7 /* gnuplot.gih is not used by wgnuplot */
8 -#define NO_GIH 1
9 +/*#define NO_GIH 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 5 # Requires libcaca version 0.99.beta15 or newer. A post-beta18
16 # svn version is recommended since it contains an improved 6 # svn version is recommended since it contains an improved
17 # win32 backend. 7 # win32 backend.
18 -CACA=1 8 -CACA=1
19 +#CACA=1 9 +#CACA=1
26 -CERF=1 16 -CERF=1
27 +#CERF=1 17 +#CERF=1
28 18
29 # Below you can adapt paths according to your software setup: 19 # Below you can adapt paths according to your software setup:
30 20
31 @@ -140,8 +140,8 @@ 21 @@ -171,8 +171,8 @@
32 # http://go.microsoft.com/fwlink/?LinkId=154968 22 # http://go.microsoft.com/fwlink/?LinkId=154968
33 # We need to explicitly set the correct path here since we also need 23 # We need to explicitly set the correct path here since we also need
34 # adjust the include and library paths. 24 # adjust the include and library paths.
35 -HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" 25 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
36 -HHC = $(HHWPATH)hhc 26 -HHC = $(HHWPATH)hhc
37 +#HHWPATH = "$(PROGRAMFILES)/HTML Help Workshop/" 27 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
38 +#HHC = $(HHWPATH)hhc 28 +#HHC = $(HHWPATH)hhc
39 29
40 # Choose which resource compiler you want to use (GNU windres or MS rc): 30 # Choose which resource compiler you want to use (GNU windres or MS rc):
41 GNU_RC = 1 31 GNU_RC = 1
42 @@ -155,7 +155,7 @@ 32 @@ -186,7 +186,7 @@
43 33
44 # Inno Setup Compiler 34 # Inno Setup Compiler
45 # get it from: http://www.jrsoftware.org/isdl.php 35 # get it from: http://www.jrsoftware.org/isdl.php
46 -ISCC = "$(PROGRAMFILES)/Inno Setup 5/iscc" 36 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
47 +#ISCC = "$(PROGRAMFILES)/Inno Setup 5/iscc" 37 +#ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
48 38
49 # Directory that might contain extra files to be shipped with the installer. 39 # Directory that might contain extra files to be shipped with the installer.
50 # This should include dependencies like DLLs, but also fontconfig configuration files. 40 # This should include dependencies like DLLs, but also fontconfig configuration files.
51 @@ -445,7 +445,7 @@ 41 @@ -514,7 +514,7 @@
52 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL) 42 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL)
53 43
54 44
55 -default: $(TARGET) $(MENUFILE) support 45 -default: $(TARGET) $(MENUFILE) support
56 +default: $(TARGET) $(MENUFILE) # support 46 +default: $(TARGET) $(MENUFILE) # support
57 47
58 console: 48 console:
59 $(MAKE) TARGET=gnuplot.exe default 49 $(MAKE) TARGET=gnuplot.exe default
60 @@ -487,8 +487,8 @@ 50 @@ -556,8 +556,8 @@
61 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< 51 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $<
62 52
63 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus 53 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus
64 -LDLIBS += -lhtmlhelp 54 -LDLIBS += -lhtmlhelp
65 -LDFLAGS2 += -L$(HHWPATH)lib 55 -LDFLAGS2 += -L$(HHWPATH)lib
66 +#LDLIBS += -lhtmlhelp 56 +#LDLIBS += -lhtmlhelp
67 +#LDFLAGS2 += -L$(HHWPATH)lib 57 +#LDFLAGS2 += -L$(HHWPATH)lib
68 58 ifdef MINGW64
69 $(TARGET): $(VERSIONING) $(OBJS) $(WINOBJS) wgplt_res.$(O) Makefile 59 LDFLAGS2 += -L.
70 $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\ 60 endif
71 Only in gnuplot-5.0.3/config/mingw: .Makefile.swp 61 diff -ur gnuplot-5.0.4.orig/src/command.c gnuplot-5.0.4/src/command.c
72 diff -ur gnuplot-5.0.3.orig/src/command.c gnuplot-5.0.3/src/command.c 62 --- gnuplot-5.0.4.orig/src/command.c 2016-07-21 13:47:51.987062163 -0400
73 --- gnuplot-5.0.3.orig/src/command.c 2016-05-25 15:58:26.693609393 -0400 63 +++ gnuplot-5.0.4/src/command.c 2016-07-21 13:48:27.860546987 -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 */
77
78
79 -#ifndef _Windows
80 +#ifndef IGNORE_Windows
81 # include "help.h"
82 #else
83 # ifdef USE_OWN_WINSYSTEM_FUNCTION
84 @@ -125,7 +125,7 @@ 64 @@ -125,7 +125,7 @@
85 # endif 65 # endif
86 #endif /* _Windows */ 66 #endif /* _Windows */
87 67
88 -#ifdef _Windows 68 -#ifdef _Windows
89 +#ifdef IGNORE_Windows 69 +#ifdef IGNORE_Windows
90 # include <windows.h> 70 # include <windows.h>
91 # ifdef __MSC__ 71 # ifdef __MSC__
92 # include <malloc.h> 72 # include <malloc.h>
93 diff -ur gnuplot-5.0.3.orig/src/internal.c gnuplot-5.0.3/src/internal.c 73 @@ -2535,6 +2535,7 @@
94 --- gnuplot-5.0.3.orig/src/internal.c 2016-05-25 15:58:26.743608650 -0400 74 void
95 +++ gnuplot-5.0.3/src/internal.c 2016-05-27 07:36:23.856997094 -0400 75 help_command()
76 {
77 +#ifndef __MINGW32__
78 HWND parent;
79
80 c_token++;
81 @@ -2570,6 +2571,7 @@
82 link.fIndexOnFail = TRUE;
83 HtmlHelp(parent, winhelpname, HH_KEYWORD_LOOKUP, (DWORD_PTR)&link);
84 }
85 +#endif
86 }
87 #else /* !_Windows */
88 #ifndef VMS
89 diff -ur gnuplot-5.0.4.orig/src/internal.c gnuplot-5.0.4/src/internal.c
90 --- gnuplot-5.0.4.orig/src/internal.c 2016-07-21 13:47:52.006061890 -0400
91 +++ gnuplot-5.0.4/src/internal.c 2016-07-21 13:48:27.861546973 -0400
96 @@ -47,7 +47,7 @@ 92 @@ -47,7 +47,7 @@
97 93
98 #include <math.h> 94 #include <math.h>
99 95
100 -#ifndef _WIN64 96 -#ifndef _WIN64
101 +#if !defined(__MINGW64_VERSION_MAJOR) 97 +#if !defined(__MINGW64_VERSION_MAJOR)
102 /* 98 /*
103 * FIXME: This is almost certainly out of date on linux, since the matherr 99 * FIXME: This is almost certainly out of date on linux, since the matherr
104 * mechanism has been replaced by math_error() and supposedly is only 100 * mechanism has been replaced by math_error() and supposedly is only
105 diff -ur gnuplot-5.0.3.orig/src/syscfg.h gnuplot-5.0.3/src/syscfg.h 101 diff -ur gnuplot-5.0.4.orig/src/syscfg.h gnuplot-5.0.4/src/syscfg.h
106 --- gnuplot-5.0.3.orig/src/syscfg.h 2016-05-25 15:58:26.698609318 -0400 102 --- gnuplot-5.0.4.orig/src/syscfg.h 2016-07-21 13:47:51.994062063 -0400
107 +++ gnuplot-5.0.3/src/syscfg.h 2016-05-27 07:51:03.707439227 -0400 103 +++ gnuplot-5.0.4/src/syscfg.h 2016-07-21 13:49:02.401050952 -0400
108 @@ -341,11 +341,19 @@ 104 @@ -345,7 +345,11 @@
109 #endif
110
111 #ifndef GP_EXCEPTION_NAME
112 -# define GP_EXCEPTION_NAME exception
113 +# if __MINGW32__
114 +# define GP_EXCEPTION_NAME exception
115 +#else
116 +# define GP_EXCEPTION_NAME exception
117 +#endif
118 #endif 105 #endif
119 106
120 #ifndef GP_MATHERR 107 #ifndef GP_MATHERR
121 -# define GP_MATHERR matherr 108 -# define GP_MATHERR matherr
122 +# if __MINGW32__ 109 +# if __MINGW32__