mxe-octave: src/gnuplot-1-fixes.patch annotate

annotate src/gnuplot-1-fixes.patch @ 5893:53a6c7df43f8

Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Thu, 16 Sep 2021 22:37:45 +0200
parents	188f45ec88b1
children	5c4b89a8328d

rev	line source
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	1 diff -ur gnuplot-5.2.2.orig/config/mingw/Makefile gnuplot-5.2.2/config/mingw/Makefile
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	2 --- gnuplot-5.2.2.orig/config/mingw/Makefile 2018-03-25 07:03:19.453562126 -0400
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	3 +++ gnuplot-5.2.2/config/mingw/Makefile 2018-03-25 07:24:23.502361443 -0400
4991 3768d38e7967 Include lua/tikz terminal in gnuplot for Windows (bug #48474). Markus Mützel <markus.muetzel@gmx.de> parents: 4640 diff changeset	4 @@ -107,23 +107,24 @@
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	5 # Uncomment the following lines to compile it.
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	6 #WXT=1
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	7 #CAIROLIBS=1
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	8 +WX_CONFIG ?= wx-config
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	9
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	10 # Build qt terminal?
4452 c615db675618 gnuplot: update to 5.0.7 John D parents: 4443 diff changeset	11 #QT=1
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	12 # specify QT installation directory
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	13 #QT_DIR = /c/Qt/5.2.1/mingw48_32
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	14 ifndef MINGW64
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	15 -QT_DIR = /d/Source/Qt-5.2.1-mingw/5.2.1/mingw48_32
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	16 +QT_DIR ?= /d/Source/Qt-5.2.1-mingw/5.2.1/mingw48_32
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	17 else
4443 6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	18 ifdef M32
6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	19 -QT_DIR = /mingw32
6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	20 +QT_DIR ?= /mingw32
6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	21 else
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	22 -QT_DIR = /mingw64
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	23 +QT_DIR ?= /mingw64
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	24 endif
4443 6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	25 endif
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	26
4991 3768d38e7967 Include lua/tikz terminal in gnuplot for Windows (bug #48474). Markus Mützel <markus.muetzel@gmx.de> parents: 4640 diff changeset	27 # Uncomment the following line to select the lua/tikz terminal
3768d38e7967 Include lua/tikz terminal in gnuplot for Windows (bug #48474). Markus Mützel <markus.muetzel@gmx.de> parents: 4640 diff changeset	28 -#LUA=lua
3768d38e7967 Include lua/tikz terminal in gnuplot for Windows (bug #48474). Markus Mützel <markus.muetzel@gmx.de> parents: 4640 diff changeset	29 +LUA=lua
3768d38e7967 Include lua/tikz terminal in gnuplot for Windows (bug #48474). Markus Mützel <markus.muetzel@gmx.de> parents: 4640 diff changeset	30
3768d38e7967 Include lua/tikz terminal in gnuplot for Windows (bug #48474). Markus Mützel <markus.muetzel@gmx.de> parents: 4640 diff changeset	31 # Uncomment the following line to select the caca terminal
3768d38e7967 Include lua/tikz terminal in gnuplot for Windows (bug #48474). Markus Mützel <markus.muetzel@gmx.de> parents: 4640 diff changeset	32 # Requires libcaca version 0.99.beta15 or newer. A post-beta18
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	33 @@ -136,7 +137,7 @@
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	34
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	35 # Uncomment if you have libcerf
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	36 # http://sourceforge.net/projects/libcerf/
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	37 -CERF=1
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	38 +#CERF=1
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	39
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	40 # Uncomment if console mode gnuplot should use GNU readline
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	41 # (not recommended)
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	42 @@ -165,10 +166,10 @@
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	43
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	44 # Destination directory, used in 'make install':
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	45 #DESTDIR = /local/opt/gnuplot-4.5
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	46 -DESTDIR = "$(PROGRAMFILES)/gnuplot"
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	47 +DESTDIR ?= "$(PROGRAMFILES)/gnuplot"
4191 851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	48
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	49 # Do you want some special optimization / flags?
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	50 -#CFLAGS +=
4191 851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	51 +CFLAGS += -DDISABLE_SPACE_RAISES_CONSOLE
4443 6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	52 CWFLAGS += -Wno-unused-function
4191 851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	53 ifdef CLANG
851b9f4a6b1c Disable space raise console gnuplot for windows (bug #48696) Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 4177 diff changeset	54 CFLAGS += -fcolor-diagnostics -fansi-escape-codes
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	55 @@ -186,8 +187,8 @@
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	56 # 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	57 # 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	58 # adjust the include and library paths.
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	59 -HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	60 -HHC = $(HHWPATH)hhc
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	61 +#HHWPATH = $(PROGRAMFILES32)/HTML\ Help\ Workshop/
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	62 +#HHC = $(HHWPATH)hhc
2891 848118c648ae Include gnuplot as a dependency of Octave John W. Eaton <jwe@octave.org> parents: diff changeset	63
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	64 # 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	65 GNU_RC = 1
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	66 @@ -203,7 +204,7 @@
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	67 # get it from: http://www.jrsoftware.org/isdl.php
4443 6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	68 # Use unicode version of Inno Setup Compiler but not Standard version
6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	69 # because the setup file of gnuplot installer is now encoded utf-8 with BOM.
4177 16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	70 -ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
16b2ee1a1b5d gnuplot: update for 5.0.4 "lostbard" <john.donoghue@ieee.org> parents: 4151 diff changeset	71 +#ISCC = $(PROGRAMFILES32)/Inno\ Setup\ 5/iscc
3945 a397ccee4b57 Bump up gnuplot version to 4.6.7 Tatsuro Matsuoka <tmacchant@yahoo.co.jp> parents: 3281 diff changeset	72
4151 717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	73 # Directory that might contain extra files to be shipped with the installer.
717e989767e3 gnuplot: update to 5.0.3 John Donoghue parents: 3945 diff changeset	74 # This should include dependencies like DLLs, but also fontconfig configuration files.
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	75 @@ -453,9 +454,9 @@
4297 8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	76
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	77 ifdef WXT
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	78 CFLAGS += -DWXWIDGETS
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	79 - WXT_CXXFLAGS := $(shell wx-config --cxxflags)
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	80 + WXT_CXXFLAGS := $(shell $(WX_CONFIG) --cxxflags)
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	81 CXXFLAGS += $(WXT_CXXFLAGS)
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	82 - WX_LIBS := $(shell wx-config --libs \| sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g")
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	83 + WX_LIBS := $(shell $(WX_CONFIG) --libs \| sed -e "s+-Wl,--subsystem,windows++g" -e "s+-mwindows++g")
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	84 WX_OBJS = wxt_gui.$(O)
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	85 endif
8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	86
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	87 @@ -479,10 +480,12 @@
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	88 moc_QtGnuplotWidget.o moc_QtGnuplotScene.o \
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	89 moc_QtGnuplotEvent.o qrc_QtGnuplotResource.o
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	90 #
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	91 - MOC = $(QT_DIR)/bin/moc
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	92 - UIC = $(QT_DIR)/bin/uic
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	93 - RCC = $(QT_DIR)/bin/rcc
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	94 - LRELEASE = $(QT_DIR)/bin/lrelease
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	95 + QT_BIN_DIR ?= $(QT_DIR)/bin
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	96 + MOC ?= $(QT_BIN_DIR)/moc
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	97 + UIC ?= $(QT_BIN_DIR)/uic
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	98 + RCC ?= $(QT_BIN_DIR)/rcc
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	99 + LRELEASE ?= $(QT_BIN_DIR)/lrelease
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	100 +
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	101 QT_FILES_TARGETS = qrc_QtGnuplotResource.cpp ui_QtGnuplotSettings.h moc_QtGnuplotWindow.cpp moc_QtGnuplotApplication.cpp
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	102 QT_FILES_TARGETS += moc_QtGnuplotWidget.cpp moc_QtGnuplotScene.cpp moc_QtGnuplotEvent.cpp
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	103 QT_TRANSLATION = qtgnuplot_fr.qm qtgnuplot_ja.qm
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	104 @@ -556,7 +559,7 @@
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	105 FULLVERSION := $(MAINVERSION) patchlevel $(PATCHLEVEL)
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	106
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	107
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	108 -default: $(TARGET) $(MENUFILE) support
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	109 +default: $(TARGET) $(MENUFILE) #support
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	110
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	111 console:
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	112 $(MAKE) TARGET=gnuplot.exe default
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	113 @@ -598,8 +601,8 @@
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	114 $(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$.$$(O)' -MF $.d -o $@ $<
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	115
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	116 LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus -lshlwapi -ld2d1 -ldwrite -lole32
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	117 -LDLIBS += -lhtmlhelp
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	118 -LDFLAGS2 += -L$(HHWPATH)lib
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	119 +#LDLIBS += -lhtmlhelp
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	120 +#LDFLAGS2 += -L$(HHWPATH)lib
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	121 ifdef MINGW64
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	122 LDFLAGS2 += -L.
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	123 endif
5510 188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	124 @@ -609,7 +612,7 @@ $(TARGET): $(VERSIONING) $(OBJS) $(WINOBJS) wgplt_res.$(O) Makefile htmlhelp.lib
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	125 else
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	126 $(TARGET): $(VERSIONING) $(OBJS) $(WINOBJS) wgplt_res.$(O) Makefile
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	127 endif
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	128 - $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS)\
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	129 + $(LDX) $(LDFLAGS) $(LDFLAGS2) -o $@ $(OBJS) $(WINOBJS) wgplt_res.$(O) $(LDLIBS) \
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	130 $(TERMLIBS) $(WX_LIBS) $(PANGOCAIRO_LIBS)
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	131
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	132 pgnuplot.exe: $(W)/pgnuplot.c version.$(O)
188f45ec88b1 * src/gnuplot-1-fixes.patch: Add missing space character to mingw Makefile. Markus Mützel <markus.muetzel@gmx.de> parents: 5435 diff changeset	133
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	134 diff -ur gnuplot-5.2.2.orig/src/command.c gnuplot-5.2.2/src/command.c
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	135 --- gnuplot-5.2.2.orig/src/command.c 2018-03-25 07:03:19.367562832 -0400
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	136 +++ gnuplot-5.2.2/src/command.c 2018-03-25 07:11:31.376521306 -0400
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	137 @@ -121,7 +121,7 @@
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	138 # include "help.h"
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	139 #endif /* _Windows */
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	140
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	141 -#ifdef _Windows
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	142 +#ifdef IGNORE_Windows
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	143 # include <windows.h>
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	144 # ifdef __MSC__
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	145 # include <malloc.h>
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	146 @@ -2861,6 +2861,7 @@
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	147 void
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	148 help_command()
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	149 {
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	150 +#ifndef __MINGW32__
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	151 HWND parent;
4297 8f864b4ea93b gnuplot: enable wx terminal type John D parents: 4191 diff changeset	152
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	153 c_token++;
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	154 @@ -2904,6 +2905,7 @@
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	155 link.fIndexOnFail = TRUE;
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	156 HtmlHelp(parent, winhelpname, HH_KEYWORD_LOOKUP, (DWORD_PTR)&link);
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	157 }
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	158 +#endif
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	159 }
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	160 #else /* !_Windows */
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	161 #ifndef VMS
4640 fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	162 diff -ur gnuplot-5.2.2.orig/src/syscfg.h gnuplot-5.2.2/src/syscfg.h
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	163 --- gnuplot-5.2.2.orig/src/syscfg.h 2018-03-25 07:03:19.380562726 -0400
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	164 +++ gnuplot-5.2.2/src/syscfg.h 2018-03-25 07:13:12.163693406 -0400
fc9edc9be940 gnuplot: update to 5.2.2 John Donoghue <john.donoghue@ieee.org> parents: 4472 diff changeset	165 @@ -362,7 +362,11 @@
4443 6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	166 #endif
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	167
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	168 #ifndef GP_MATHERR
4443 6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	169 -# define GP_MATHERR matherr
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	170 +# if __MINGW32__
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	171 +# define GP_MATHERR _matherr
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	172 +#else
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	173 +# define GP_MATHERR matherr
4443 6aa7dd77d82c gnuplot: update to v5.0.6 John D parents: 4343 diff changeset	174 +# endif
4343 16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	175 #endif
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	176
16d2b997c31b gnuplot: update t 5.0.5 John D parents: 4297 diff changeset	177 #ifdef HAVE_STRUCT_EXCEPTION_IN_MATH_H
5435 e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	178 diff -ur gnuplot-5.2.8.orig/config/mingw/Makefile gnuplot-5.2.8/config/mingw/Makefile
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	179 --- gnuplot-5.2.8.orig/config/mingw/Makefile 2020-05-28 19:30:10.109744146 -0400
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	180 +++ gnuplot-5.2.8/config/mingw/Makefile 2020-05-28 19:33:01.256347682 -0400
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	181 @@ -44,6 +44,8 @@
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	182 #CCPATH = g:/mingw32/bin/
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	183 #CCPATH = c:/apps/mingw/bin/
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	184
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	185 +PKG_CONFIG ?= pkg-config
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	186 +
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	187 # Path to 32bit programms
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	188 # On 32bit machines:
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	189 #PROGRAMFILES32="$(PROGRAMFILES)"
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	190 @@ -388,7 +390,7 @@
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	191 ifdef NEWGD
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	192 CFLAGS += -DHAVE_LIBGD -DHAVE_GD_H -DHAVE_GD_GIF -DGIF_ANIMATION -DHAVE_GD_PNG
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	193 ifdef GDPKGCONFIG
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	194 - CFLAGS += $(shell pkg-config --cflags gdlib)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	195 + CFLAGS += $(shell $(PKG_CONFIG) --cflags gdlib)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	196 endif
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	197 ifdef JPEG
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	198 CFLAGS += -DHAVE_GD_JPEG
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	199 @@ -414,7 +416,7 @@
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	200 TERMLIBS += $(shell gdlib-config --libs)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	201 endif
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	202 ifdef GDPKGCONFIG
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	203 - TERMLIBS += $(shell pkg-config --libs gdlib)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	204 + TERMLIBS += $(shell $(PKG_CONFIG) --libs gdlib)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	205 endif
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	206 endif
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	207
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	208 @@ -440,9 +442,9 @@
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	209 endif
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	210
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	211 ifdef CAIROLIBS
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	212 - CAIRO_CFLAGS := $(shell pkg-config --cflags cairo \| sed s_-Ic:_-I/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	213 - PANGOCAIRO_CFLAGS := $(shell pkg-config --cflags glib-2.0 gobject-2.0 pangocairo cairo \| sed s_-Ic:_-I/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	214 - PANGOCAIRO_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0 pangocairo cairo \| sed s_-Lc:_-L/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	215 + CAIRO_CFLAGS := $(shell $(PKG_CONFIG) --cflags cairo \| sed s_-Ic:_-I/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	216 + PANGOCAIRO_CFLAGS := $(shell $(PKG_CONFIG) --cflags glib-2.0 gobject-2.0 pangocairo cairo \| sed s_-Ic:_-I/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	217 + PANGOCAIRO_LIBS := $(shell $(PKG_CONFIG) --libs glib-2.0 gobject-2.0 pangocairo cairo \| sed s_-Lc:_-L/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	218 CAIRO_OBJS := gp_cairo.$(O) gp_cairo_helpers.$(O)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	219 TERMFLAGS += $(PANGOCAIRO_CFLAGS)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	220 endif
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	221 diff -ur gnuplot-5.2.8.orig/config/mingw/Makefile gnuplot-5.2.8/config/mingw/Makefile
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	222 --- gnuplot-5.2.8.orig/config/mingw/Makefile 2020-05-28 19:43:45.027724850 -0400
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	223 +++ gnuplot-5.2.8/config/mingw/Makefile 2020-05-28 19:46:47.102198835 -0400
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	224 @@ -444,7 +444,7 @@
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	225 ifdef CAIROLIBS
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	226 CAIRO_CFLAGS := $(shell $(PKG_CONFIG) --cflags cairo \| sed s_-Ic:_-I/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	227 PANGOCAIRO_CFLAGS := $(shell $(PKG_CONFIG) --cflags glib-2.0 gobject-2.0 pangocairo cairo \| sed s_-Ic:_-I/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	228 - PANGOCAIRO_LIBS := $(shell $(PKG_CONFIG) --libs glib-2.0 gobject-2.0 pangocairo cairo \| sed s_-Lc:_-L/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	229 + PANGOCAIRO_LIBS := $(shell $(PKG_CONFIG) --libs glib-2.0 gobject-2.0 pangocairo cairo pangowin32 --static \| sed s_-Lc:_-L/c_g)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	230 CAIRO_OBJS := gp_cairo.$(O) gp_cairo_helpers.$(O)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	231 TERMFLAGS += $(PANGOCAIRO_CFLAGS)
e2f8b7a140f7 * src/gnuplot-1-fixes.patch: update patch to allow setting of PKG_CONFIG John Donoghue <john.donoghue@ieee.org> parents: 4991 diff changeset	232 endif

Mercurial > mxe-octave

annotate src/gnuplot-1-fixes.patch @ 5893:53a6c7df43f8