6870c4c605
* New package: gnuplot 5.2.0 This is a first version of the package using the included mingw make file which has some limitations. Will look whether the default makefile can produce a better result. * Removing bf_test.exe Makefile fails on CI due to permission problems * Adding maintainer info, removing unnecessary code
142 lines
4.6 KiB
Diff
142 lines
4.6 KiB
Diff
diff -Naur gnuplot-5.2.0.orig/config/mingw/Makefile gnuplot-5.2.0/config/mingw/Makefile
|
|
--- gnuplot-5.2.0.orig/config/mingw/Makefile 2017-07-31 04:02:24.000000000 +0200
|
|
+++ gnuplot-5.2.0/config/mingw/Makefile 2017-09-10 18:36:11.300817700 +0200
|
|
@@ -236,8 +236,8 @@
|
|
|
|
ifndef TARGET
|
|
TARGET=wgnuplot.exe
|
|
-#TARGET=wgnuplot_pipes.exe
|
|
-#TARGET=gnuplot.exe
|
|
+TARGET=wgnuplot_pipes.exe
|
|
+TARGET=gnuplot.exe
|
|
endif
|
|
|
|
# Set PIPES and CONSOLE according to the target
|
|
@@ -571,7 +571,7 @@
|
|
$(MAKE) TARGET=gnuplot.exe gnuplot.pdf tutorial.pdf \
|
|
ps_symbols.pdf ps_fontfile_doc.pdf ps_guide.pdf
|
|
|
|
-support: $(HELPFILE) $(M)bf_test.exe $(QT_TARGET) $(QT_TRANSLATION) demo_plugin.dll $(LUATARGETS) $(HELPFILEJA)
|
|
+support: $(QT_TARGET) $(QT_TRANSLATION) $(LUATARGETS)
|
|
|
|
ja: $(HELPFILEJA)
|
|
|
|
@@ -598,8 +598,8 @@
|
|
$(CC) -c $(CFLAGS) $(CFLAGSEXTRA) -MMD -MT '$*.$$(O)' -MF $*.d -o $@ $<
|
|
|
|
LDLIBS = -lkernel32 -lgdi32 -lwinspool -lcomdlg32 -lcomctl32 -ladvapi32 -lshell32 -lmsimg32 -lgdiplus -lshlwapi -ld2d1 -ldwrite -lole32
|
|
-LDLIBS += -lhtmlhelp
|
|
-LDFLAGS2 += -L$(HHWPATH)lib
|
|
+#LDLIBS += -lhtmlhelp
|
|
+#LDFLAGS2 += -L$(HHWPATH)lib
|
|
ifdef MINGW64
|
|
LDFLAGS2 += -L.
|
|
endif
|
|
@@ -717,24 +717,24 @@
|
|
$(CC) $(CFLAGS) -I$(M)plugin -shared -o $@ $<
|
|
|
|
# convert gnuplot.doc to windows/wgnuplot.html
|
|
-$(BUILDHELPFILE): doc2html.exe $(D)gnuplot.doc $(D)windows/wgnuplot.hhp $(D)windows/wgnuplot.hhk \
|
|
- $(D)windows/wgnuplot.stp $(D)plotstyles.gnu $(CORETERM)
|
|
- ./doc2html $(D)gnuplot.doc $(D)windows/
|
|
- -./$(TARGET) -d -e "winhelp=1; cd '$(D)'" plotstyles.gnu
|
|
- -$(HHC) $(D)windows/wgnuplot.hhp
|
|
-
|
|
-$(HELPFILE): $(BUILDHELPFILE)
|
|
- $(CP) $^ $@
|
|
-
|
|
-htmlhelp.lib: htmlhelp.def
|
|
- dlltool -d htmlhelp.def -l htmlhelp.lib
|
|
-
|
|
-htmlhelp.def:
|
|
-ifndef MINGW64
|
|
- pexports c/Windows/System32/hhctrl.ocx > htmlhelp.def
|
|
-else
|
|
- gendef - /c/Windows/System32/hhctrl.ocx > htmlhelp.def
|
|
-endif
|
|
+#$(BUILDHELPFILE): doc2html.exe $(D)gnuplot.doc $(D)windows/wgnuplot.hhp $(D)windows/wgnuplot.hhk \
|
|
+# $(D)windows/wgnuplot.stp $(D)plotstyles.gnu $(CORETERM)
|
|
+# ./doc2html $(D)gnuplot.doc $(D)windows/
|
|
+# -./$(TARGET) -d -e "winhelp=1; cd '$(D)'" plotstyles.gnu
|
|
+# -$(HHC) $(D)windows/wgnuplot.hhp
|
|
+#
|
|
+#$(HELPFILE): $(BUILDHELPFILE)
|
|
+# $(CP) $^ $@
|
|
+#
|
|
+#htmlhelp.lib: htmlhelp.def
|
|
+# dlltool -d htmlhelp.def -l htmlhelp.lib
|
|
+
|
|
+#htmlhelp.def:
|
|
+#ifndef MINGW64
|
|
+# pexports c/Windows/System32/hhctrl.ocx > htmlhelp.def
|
|
+#else
|
|
+# gendef - /c/Windows/System32/hhctrl.ocx > htmlhelp.def
|
|
+#endif
|
|
|
|
# Working directory for patched Japanese sources
|
|
JA = ja/
|
|
@@ -973,9 +973,9 @@
|
|
cp -p wgnuplot_pipes.exe $(DESTDIR)/bin/
|
|
cp -p $(W)/wgnuplot.mnu $(DESTDIR)/bin/
|
|
cp -p $(W)/wgnuplot-ja.mnu $(DESTDIR)/bin/
|
|
- cp -p $(HELPFILE) $(DESTDIR)/bin/
|
|
+ #cp -p $(HELPFILE) $(DESTDIR)/bin/
|
|
ifdef HELPFILEJA
|
|
- cp -p $(HELPFILEJA) $(DESTDIR)/bin/
|
|
+ #cp -p $(HELPFILEJA) $(DESTDIR)/bin/
|
|
endif
|
|
# configuration files
|
|
mkdir -p $(DESTDIR)/$(GNUPLOT_SHARE_DIR)
|
|
@@ -1037,12 +1037,12 @@
|
|
cp -p $(TOP)/FAQ.pdf $(DESTDIR)/docs/
|
|
-cp -p tutorial.pdf $(DESTDIR)/docs/
|
|
mkdir -p $(DESTDIR)/docs/psdoc
|
|
- cp -p $(D)psdoc/ps_file.doc $(DESTDIR)/docs/psdoc/ps_file_doc.txt
|
|
- cp -p $(D)psdoc/ps_guide.ps $(DESTDIR)/docs/psdoc/
|
|
- -cp -p ps_guide.pdf $(DESTDIR)/docs/psdoc/
|
|
- -cp -p ps_symbols.ps $(DESTDIR)/docs/psdoc/
|
|
- -cp -p ps_symbols.pdf $(DESTDIR)/docs/psdoc/
|
|
- -cp -p ps_fontfile_doc.pdf $(DESTDIR)/docs/psdoc/
|
|
+ #cp -p $(D)psdoc/ps_file.doc $(DESTDIR)/docs/psdoc/ps_file_doc.txt
|
|
+ #cp -p $(D)psdoc/ps_guide.ps $(DESTDIR)/docs/psdoc/
|
|
+ #-cp -p ps_guide.pdf $(DESTDIR)/docs/psdoc/
|
|
+ #-cp -p ps_symbols.ps $(DESTDIR)/docs/psdoc/
|
|
+ #-cp -p ps_symbols.pdf $(DESTDIR)/docs/psdoc/
|
|
+ #-cp -p ps_fontfile_doc.pdf $(DESTDIR)/docs/psdoc/
|
|
# runtime libraries, configuration files etc.
|
|
ifdef EXTRADIST
|
|
cp -pR $(EXTRADIST)/* $(DESTDIR)/
|
|
diff -Naur gnuplot-5.2.0.orig/src/command.c gnuplot-5.2.0/src/command.c
|
|
--- gnuplot-5.2.0.orig/src/command.c 2017-08-30 20:48:26.000000000 +0200
|
|
+++ gnuplot-5.2.0/src/command.c 2017-09-10 18:33:08.422397000 +0200
|
|
@@ -129,7 +129,7 @@
|
|
# else
|
|
# include <alloc.h>
|
|
# endif /* !MSC */
|
|
-# include <htmlhelp.h>
|
|
+//# include <htmlhelp.h>
|
|
# include "win/winmain.h"
|
|
#endif /* _Windows */
|
|
|
|
@@ -2857,7 +2857,7 @@
|
|
|
|
|
|
#ifdef NO_GIH
|
|
-#if defined(_Windows)
|
|
+#if defined(_Windows) && !defined (__MINGW32__)
|
|
void
|
|
help_command()
|
|
{
|
|
diff -Naur gnuplot-5.2.0.orig/src/win/winmain.c gnuplot-5.2.0/src/win/winmain.c
|
|
--- gnuplot-5.2.0.orig/src/win/winmain.c 2017-07-30 18:44:02.000000000 +0200
|
|
+++ gnuplot-5.2.0/src/win/winmain.c 2017-09-10 18:29:06.999408000 +0200
|
|
@@ -56,7 +56,7 @@
|
|
#include <commctrl.h>
|
|
#include <shlobj.h>
|
|
#include <shlwapi.h>
|
|
-#include <htmlhelp.h>
|
|
+//#include <htmlhelp.h>
|
|
#include <dos.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|