Mercurial > mxe-octave

comparison src/gnuplot-1-fixes.patch @ 4640:fc9edc9be940

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot: update to 5.2.2 * src/gnuplot.mk: update version, checksum * src/gnuplot-1-fixes.patch: update patch
author John Donoghue <john.donoghue@ieee.org>
date Sun, 25 Mar 2018 07:43:20 -0400
parents 0fdeee4cfe11
children 3768d38e7967
comparison
equal deleted inserted replaced
4639:abed69834834 4640:fc9edc9be940
1 diff -ur gnuplot-5.0.7.orig/config/mingw/Makefile gnuplot-5.0.7/config/mingw/Makefile 1 diff -ur gnuplot-5.2.2.orig/config/mingw/Makefile gnuplot-5.2.2/config/mingw/Makefile
2 --- gnuplot-5.0.7.orig/config/mingw/Makefile 2017-08-16 07:56:54.950650715 -0400 2 --- gnuplot-5.2.2.orig/config/mingw/Makefile 2018-03-25 07:03:19.453562126 -0400
3 +++ gnuplot-5.0.7/config/mingw/Makefile 2017-08-16 08:02:13.581632383 -0400 3 +++ gnuplot-5.2.2/config/mingw/Makefile 2018-03-25 07:24:23.502361443 -0400
4 @@ -101,18 +101,19 @@ 4 @@ -107,18 +107,19 @@
5 # Uncomment the following lines to compile it. 5 # Uncomment the following lines to compile it.
6 #WXT=1 6 #WXT=1
7 #CAIROLIBS=1 7 #CAIROLIBS=1
8 +WX_CONFIG ?= wx-config 8 +WX_CONFIG ?= wx-config
9 9
22 -QT_DIR = /mingw64 22 -QT_DIR = /mingw64
23 +QT_DIR ?= /mingw64 23 +QT_DIR ?= /mingw64
24 endif 24 endif
25 endif 25 endif
26 26
27 @@ -130,7 +131,7 @@ 27 @@ -136,7 +137,7 @@
28 28
29 # Uncomment if you have libcerf 29 # Uncomment if you have libcerf
30 # http://sourceforge.net/projects/libcerf/ 30 # http://sourceforge.net/projects/libcerf/
31 -CERF=1 31 -CERF=1
32 +#CERF=1 32 +#CERF=1
33 33
34 # Below you can adapt paths according to your software setup: 34 # Uncomment if console mode gnuplot should use GNU readline
35 # (not recommended)
36 @@ -165,10 +166,10 @@
35 37
36 @@ -159,6 +160,7 @@ 38 # Destination directory, used in 'make install':
39 #DESTDIR = /local/opt/gnuplot-4.5
40 -DESTDIR = "$(PROGRAMFILES)/gnuplot"
41 +DESTDIR ?= "$(PROGRAMFILES)/gnuplot"
37 42
38 # Do you want some special optimization / flags? 43 # Do you want some special optimization / flags?
39 #CFLAGS += 44 -#CFLAGS +=
40 +CFLAGS += -DDISABLE_SPACE_RAISES_CONSOLE 45 +CFLAGS += -DDISABLE_SPACE_RAISES_CONSOLE
41 CWFLAGS += -Wno-unused-function 46 CWFLAGS += -Wno-unused-function
42 ifdef CLANG 47 ifdef CLANG
43 CFLAGS += -fcolor-diagnostics -fansi-escape-codes 48 CFLAGS += -fcolor-diagnostics -fansi-escape-codes
44 @@ -176,8 +178,8 @@ 49 @@ -186,8 +187,8 @@
45 # http://go.microsoft.com/fwlink/?LinkId=154968 50 # http://go.microsoft.com/fwlink/?LinkId=154968
46 # We need to explicitly set the correct path here since we also need 51 # We need to explicitly set the correct path here since we also need
47 # adjust the include and library paths. 52 # adjust the include and library paths.
48 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/ 53 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
49 -HHC = $(HHWPATH)hhc 54 -HHC = $(HHWPATH)hhc
50 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/ 55 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
51 +#HHC = $(HHWPATH)hhc 56 +#HHC = $(HHWPATH)hhc
52 57
53 # Choose which resource compiler you want to use (GNU windres or MS rc): 58 # Choose which resource compiler you want to use (GNU windres or MS rc):
54 GNU_RC = 1 59 GNU_RC = 1
55 @@ -193,7 +195,7 @@ 60 @@ -203,7 +204,7 @@
56 # get it from: http://www.jrsoftware.org/isdl.php 61 # get it from: http://www.jrsoftware.org/isdl.php
57 # Use unicode version of Inno Setup Compiler but not Standard version 62 # Use unicode version of Inno Setup Compiler but not Standard version
58 # because the setup file of gnuplot installer is now encoded utf-8 with BOM. 63 # because the setup file of gnuplot installer is now encoded utf-8 with BOM.
59 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc 64 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
60 +#ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc 65 +#ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
61 66
62 # Directory that might contain extra files to be shipped with the installer. 67 # Directory that might contain extra files to be shipped with the installer.
63 # This should include dependencies like DLLs, but also fontconfig configuration files. 68 # This should include dependencies like DLLs, but also fontconfig configuration files.
64 @@ -440,9 +442,9 @@ 69 @@ -453,9 +454,9 @@
65 70
66 ifdef WXT 71 ifdef WXT
67 CFLAGS += -DWXWIDGETS 72 CFLAGS += -DWXWIDGETS
68 - WXT_CXXFLAGS := $(shell wx-config --cxxflags) 73 - WXT_CXXFLAGS := $(shell wx-config --cxxflags)
69 + WXT_CXXFLAGS := $(shell $(WX_CONFIG) --cxxflags) 74 + WXT_CXXFLAGS := $(shell $(WX_CONFIG) --cxxflags)
71 - WX_LIBS := $(shell wx-config --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g") 76 - WX_LIBS := $(shell wx-config --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g")
72 + WX_LIBS := $(shell $(WX_CONFIG) --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g") 77 + WX_LIBS := $(shell $(WX_CONFIG) --libs | sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g")
73 WX_OBJS = wxt_gui.$(O) 78 WX_OBJS = wxt_gui.$(O)
74 endif 79 endif
75 80
76 @@ -532,7 +534,7 @@ 81 @@ -479,10 +480,12 @@
82 moc_QtGnuplotWidget.o moc_QtGnuplotScene.o \
83 moc_QtGnuplotEvent.o qrc_QtGnuplotResource.o
84 #
85 - MOC = $(QT_DIR)/bin/moc
86 - UIC = $(QT_DIR)/bin/uic
87 - RCC = $(QT_DIR)/bin/rcc
88 - LRELEASE = $(QT_DIR)/bin/lrelease
89 + QT_BIN_DIR ?= $(QT_DIR)/bin
90 + MOC ?= $(QT_BIN_DIR)/moc
91 + UIC ?= $(QT_BIN_DIR)/uic
92 + RCC ?= $(QT_BIN_DIR)/rcc
93 + LRELEASE ?= $(QT_BIN_DIR)/lrelease
94 +
95 QT_FILES_TARGETS = qrc_QtGnuplotResource.cpp ui_QtGnuplotSettings.h moc_QtGnuplotWindow.cpp moc_QtGnuplotApplication.cpp
96 QT_FILES_TARGETS += moc_QtGnuplotWidget.cpp moc_QtGnuplotScene.cpp moc_QtGnuplotEvent.cpp
97 QT_TRANSLATION = qtgnuplot_fr.qm qtgnuplot_ja.qm
98 @@ -556,7 +559,7 @@
77 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL) 99 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL)
78 100
79 101
80 -default: $(TARGET) $(MENUFILE) support 102 -default: $(TARGET) $(MENUFILE) support
81 +default: $(TARGET) $(MENUFILE) #support 103 +default: $(TARGET) $(MENUFILE) #support
82 104
83 console: 105 console:
84 $(MAKE) TARGET=gnuplot.exe default 106 $(MAKE) TARGET=gnuplot.exe default
85 @@ -574,8 +576,8 @@ 107 @@ -598,8 +601,8 @@
86 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $< 108 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $<
87 109
88 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus 110 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus -lshlwapi -ld2d1 -ldwrite -lole32
89 -LDLIBS += -lhtmlhelp 111 -LDLIBS += -lhtmlhelp
90 -LDFLAGS2 += -L$(HHWPATH)lib 112 -LDFLAGS2 += -L$(HHWPATH)lib
91 +#LDLIBS += -lhtmlhelp 113 +#LDLIBS += -lhtmlhelp
92 +#LDFLAGS2 += -L$(HHWPATH)lib 114 +#LDFLAGS2 += -L$(HHWPATH)lib
93 ifdef MINGW64 115 ifdef MINGW64
94 LDFLAGS2 += -L. 116 LDFLAGS2 += -L.
95 endif 117 endif
96 Only in gnuplot-5.0.7/config/mingw: Makefile.orig 118 diff -ur gnuplot-5.2.2.orig/src/command.c gnuplot-5.2.2/src/command.c
97 diff -ur gnuplot-5.0.7.orig/src/command.c gnuplot-5.0.7/src/command.c 119 --- gnuplot-5.2.2.orig/src/command.c 2018-03-25 07:03:19.367562832 -0400
98 --- gnuplot-5.0.7.orig/src/command.c 2017-08-16 07:56:54.917649785 -0400 120 +++ gnuplot-5.2.2/src/command.c 2018-03-25 07:11:31.376521306 -0400
99 +++ gnuplot-5.0.7/src/command.c 2017-08-16 08:02:13.581632383 -0400 121 @@ -121,7 +121,7 @@
100 @@ -125,7 +125,7 @@ 122 # include "help.h"
101 # endif
102 #endif /* _Windows */ 123 #endif /* _Windows */
103 124
104 -#ifdef _Windows 125 -#ifdef _Windows
105 +#ifdef IGNORE_Windows 126 +#ifdef IGNORE_Windows
106 # include <windows.h> 127 # include <windows.h>
107 # ifdef __MSC__ 128 # ifdef __MSC__
108 # include <malloc.h> 129 # include <malloc.h>
109 @@ -2557,6 +2557,7 @@ 130 @@ -2861,6 +2861,7 @@
110 void 131 void
111 help_command() 132 help_command()
112 { 133 {
113 +#ifndef __MINGW32__ 134 +#ifndef __MINGW32__
114 HWND parent; 135 HWND parent;
115 136
116 c_token++; 137 c_token++;
117 @@ -2592,6 +2593,7 @@ 138 @@ -2904,6 +2905,7 @@
118 link.fIndexOnFail = TRUE; 139 link.fIndexOnFail = TRUE;
119 HtmlHelp(parent, winhelpname, HH_KEYWORD_LOOKUP, (DWORD_PTR)&link); 140 HtmlHelp(parent, winhelpname, HH_KEYWORD_LOOKUP, (DWORD_PTR)&link);
120 } 141 }
121 +#endif 142 +#endif
122 } 143 }
123 #else /* !_Windows */ 144 #else /* !_Windows */
124 #ifndef VMS 145 #ifndef VMS
125 Only in gnuplot-5.0.7/src: command.c.orig 146 diff -ur gnuplot-5.2.2.orig/src/syscfg.h gnuplot-5.2.2/src/syscfg.h
126 diff -ur gnuplot-5.0.7.orig/src/internal.c gnuplot-5.0.7/src/internal.c 147 --- gnuplot-5.2.2.orig/src/syscfg.h 2018-03-25 07:03:19.380562726 -0400
127 --- gnuplot-5.0.7.orig/src/internal.c 2017-08-16 07:56:54.932650208 -0400 148 +++ gnuplot-5.2.2/src/syscfg.h 2018-03-25 07:13:12.163693406 -0400
128 +++ gnuplot-5.0.7/src/internal.c 2017-08-16 08:02:13.582632412 -0400 149 @@ -362,7 +362,11 @@
129 @@ -47,7 +47,7 @@
130
131 #include <math.h>
132
133 -#ifndef _WIN64
134 +#if !defined(__MINGW64_VERSION_MAJOR)
135 /*
136 * FIXME: This is almost certainly out of date on linux, since the matherr
137 * mechanism has been replaced by math_error() and supposedly is only
138 diff -ur gnuplot-5.0.7.orig/src/syscfg.h gnuplot-5.0.7/src/syscfg.h
139 --- gnuplot-5.0.7.orig/src/syscfg.h 2017-08-16 07:56:54.921649898 -0400
140 +++ gnuplot-5.0.7/src/syscfg.h 2017-08-16 08:02:13.582632412 -0400
141 @@ -345,7 +345,11 @@
142 #endif 150 #endif
143 151
144 #ifndef GP_MATHERR 152 #ifndef GP_MATHERR
145 -# define GP_MATHERR matherr 153 -# define GP_MATHERR matherr
146 +# if __MINGW32__ 154 +# if __MINGW32__
149 +# define GP_MATHERR matherr 157 +# define GP_MATHERR matherr
150 +# endif 158 +# endif
151 #endif 159 #endif
152 160
153 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H 161 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H
154 diff -ur gnuplot-5.0.7.orig/config/mingw/Makefile gnuplot-5.0.7/config/mingw/Makefile
155 --- gnuplot-5.0.7.orig/config/mingw/Makefile 2017-09-07 17:47:19.588554741 -0400
156 +++ gnuplot-5.0.7/config/mingw/Makefile 2017-09-07 17:52:11.565785085 -0400
157 @@ -468,10 +468,11 @@
158 moc_QtGnuplotWidget.o moc_QtGnuplotScene.o \
159 moc_QtGnuplotEvent.o qrc_QtGnuplotResource.o
160 #
161 - MOC = $(QT_DIR)/bin/moc
162 - UIC = $(QT_DIR)/bin/uic
163 - RCC = $(QT_DIR)/bin/rcc
164 - LRELEASE = $(QT_DIR)/bin/lrelease
165 + QT_BIN_DIR ?= $(QT_DIR)/bin
166 + MOC ?= $(QT_BIN_DIR)/moc
167 + UIC ?= $(QT_BIN_DIR)/uic
168 + RCC ?= $(QT_BIN_DIR)/rcc
169 + LRELEASE ?= $(QT_BIN_DIR)/lrelease
170 QT_FILES_TARGETS = qrc_QtGnuplotResource.cpp ui_QtGnuplotSettings.h moc_QtGnuplotWindow.cpp moc_QtGnuplotApplication.cpp
171 QT_FILES_TARGETS += moc_QtGnuplotWidget.cpp moc_QtGnuplotScene.cpp moc_QtGnuplotEvent.cpp
172 QT_TRANSLATION = qtgnuplot_fr.qm qtgnuplot_ja.qm