# HG changeset patch # User Markus Mützel # Date 1549818128 -3600 # Node ID 3768d38e7967ec97856cea934da5c7423bc98d6d # Parent a059052f480742228a18171d206f792da483d128 Include lua/tikz terminal in gnuplot for Windows (bug #48474). * src/gnuplot.mk: Add "lua" as a dependency. Install additional files for tikz. * src/gnuplot-1-fixes.patch: Select lua/tikz terminal. diff -r a059052f4807 -r 3768d38e7967 src/gnuplot-1-fixes.patch --- a/src/gnuplot-1-fixes.patch Sat Mar 02 07:38:59 2019 -0500 +++ b/src/gnuplot-1-fixes.patch Sun Feb 10 18:02:08 2019 +0100 @@ -1,7 +1,7 @@ diff -ur gnuplot-5.2.2.orig/config/mingw/Makefile gnuplot-5.2.2/config/mingw/Makefile --- gnuplot-5.2.2.orig/config/mingw/Makefile 2018-03-25 07:03:19.453562126 -0400 +++ gnuplot-5.2.2/config/mingw/Makefile 2018-03-25 07:24:23.502361443 -0400 -@@ -107,18 +107,19 @@ +@@ -107,23 +107,24 @@ # Uncomment the following lines to compile it. #WXT=1 #CAIROLIBS=1 @@ -24,6 +24,12 @@ endif endif + # Uncomment the following line to select the lua/tikz terminal +-#LUA=lua ++LUA=lua + + # Uncomment the following line to select the caca terminal + # Requires libcaca version 0.99.beta15 or newer. A post-beta18 @@ -136,7 +137,7 @@ # Uncomment if you have libcerf diff -r a059052f4807 -r 3768d38e7967 src/gnuplot.mk --- a/src/gnuplot.mk Sat Mar 02 07:38:59 2019 -0500 +++ b/src/gnuplot.mk Sun Feb 10 18:02:08 2019 +0100 @@ -13,7 +13,7 @@ $(PKG)_EXTRAFLAGS := ifeq ($(MXE_WINDOWS_BUILD),yes) - $(PKG)_DEPS += wxwidgets cairo pango + $(PKG)_DEPS += wxwidgets cairo pango lua $(PKG)_EXTRAFLAGS += CAIROTERMS=1 CAIROLIBS=1 $(PKG)_EXTRAFLAGS += WXT=1 WX_CONFIG=$(MXE_TOOL_PREFIX)wx-config endif @@ -64,6 +64,17 @@ for f in $(1)/term/PostScript/*.txt; do \ $(INSTALL) -m644 "$$f" '$(3)$(HOST_PREFIX)/share/PostScript/'; \ done + # tikz terminal + $(INSTALL) -d '$(3)$(HOST_PREFIX)/share/lua' + $(INSTALL) -m644 "$(1)/term/lua/gnuplot-tikz.lua" '$(3)$(HOST_PREFIX)/share/lua/'; + $(INSTALL) -d '$(3)$(HOST_PREFIX)/share/texmf/tex/latex/gnuplot/' + $(INSTALL) -m644 "$(1)/share/LaTeX/gnuplot-lua-tikz.sty" '$(3)$(HOST_PREFIX)/share/texmf/tex/latex/gnuplot/'; + $(INSTALL) -d '$(3)$(HOST_PREFIX)/share/texmf/tex/plain/gnuplot/' + $(INSTALL) -m644 "$(1)/share/LaTeX/gnuplot-lua-tikz.tex" '$(3)$(HOST_PREFIX)/share/texmf/tex/plain/gnuplot/'; + $(INSTALL) -d '$(3)$(HOST_PREFIX)/share/texmf/tex/context/gnuplot/' + $(INSTALL) -m644 "$(1)/share/LaTeX/t-gnuplot-lua-tikz.tex" '$(3)$(HOST_PREFIX)/share/texmf/tex/context/gnuplot/'; + $(INSTALL) -d '$(3)$(HOST_PREFIX)/share/texmf/tex/generic/gnuplot/' + $(INSTALL) -m644 "$(1)/share/LaTeX/gnuplot-lua-tikz-common.tex" '$(3)$(HOST_PREFIX)/share/texmf/tex/generic/gnuplot/'; ## MG: not sure what to do with these and how to integrate with DESTDIR $(INSTALL) -d '$(TOP_DIR)/gnuplot/bin'