Mercurial > mxe-octave

annotate src/pstoedit-5-use_gs_env.patch @ 5531:eae508c12529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +0200
parents cc549d1865cb
children 8d61de83cf90
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4183
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
1 diff -ur pstoedit-3.70.orig/src/callgs.cpp pstoedit-3.70/src/callgs.cpp
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
2 --- pstoedit-3.70.orig/src/callgs.cpp 2016-07-27 13:04:53.173499210 -0400
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
3 +++ pstoedit-3.70/src/callgs.cpp 2016-07-27 13:56:54.686649091 -0400
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
4 @@ -364,7 +364,15 @@
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
5 } else {
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
6 if (verbose) errstream<< "nothing found in gsview32.ini file - using find_gs to lookup latest version of Ghostscript in registry " << endl;
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
7 static char buf[1000];
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
8 - if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase)) {
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
9 +
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
10 +
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
11 + gstocall = getenv("GS");
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
12 +
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
13 + if(gstocall) {
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
14 + if (verbose)
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
15 + errstream << "GS is set to:" << gstocall << endl;
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
16 +
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
17 + } else if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase)) {
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
18 if (verbose) {
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
19 (void)dumpgsvers(gsregbase);
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
20 if (getPstoeditsetDLLUsage()) errstream << "Latest GS DLL is " << buf << endl;