annotate src/pstoedit-5-use_gs_env.patch @ 6213:5f64fb928091 release

build-gcc: Avoid library clash when calling msgfmt. * src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when calling `msgfmt`. * dist-files.mk: Add patch to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 06 May 2022 19:36:10 +0200
parents 8d61de83cf90
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5889
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 4183
diff changeset
1 diff -ur pstoedit-3.77.orig/src/callgs.cpp pstoedit-3.77/src/callgs.cpp
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 4183
diff changeset
2 --- pstoedit-3.77.orig/src/callgs.cpp 2021-09-06 16:18:29.786833687 -0400
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 4183
diff changeset
3 +++ pstoedit-3.77/src/callgs.cpp 2021-09-06 16:23:10.927193819 -0400
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 4183
diff changeset
4 @@ -368,7 +368,14 @@
4183
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];
5889
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 4183
diff changeset
8 - if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase, verbose)) {
4183
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 + gstocall = getenv("GS");
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
11 +
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
12 + if(gstocall) {
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
13 + if (verbose)
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
14 + errstream << "GS is set to:" << gstocall << endl;
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
15 +
5889
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 4183
diff changeset
16 + } else if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase, verbose)) {
4183
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
17 if (verbose) {
5889
8d61de83cf90 pstoedit: update to v3.77
John Donoghue <john.donoghue@ieee.org>
parents: 4183
diff changeset
18 (void)dumpgsvers(gsregbase, verbose);
4183
cc549d1865cb pstoedit: use GS environment var if set in windows
John D
parents:
diff changeset
19 if (getPstoeditsetDLLUsage()) errstream << "Latest GS DLL is " << buf << endl;