Mercurial > mxe-octave

annotate src/pstoedit-5-use_gs_env.patch @ 4240:724749afb8b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile.in: check if have version of octave and warn if cant find it (Bug #49503) * Makefile.in: in check-requirements, verify and warn if do not have correct octave
author John D
date Thu, 03 Nov 2016 04:08:08 -0400
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;