view 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
line wrap: on
line source

diff -ur pstoedit-3.77.orig/src/callgs.cpp pstoedit-3.77/src/callgs.cpp
--- pstoedit-3.77.orig/src/callgs.cpp	2021-09-06 16:18:29.786833687 -0400
+++ pstoedit-3.77/src/callgs.cpp	2021-09-06 16:23:10.927193819 -0400
@@ -368,7 +368,14 @@
 		} else {
 		    if (verbose) errstream<< "nothing found in gsview32.ini file - using find_gs to lookup latest version of Ghostscript in registry " << endl;
 			static char buf[1000];
-			if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase, verbose)) { 
+
+	                gstocall = getenv("GS");
+
+                        if(gstocall) {
+		                if (verbose)
+			                errstream << "GS is set to:" << gstocall << endl;
+
+                        } else if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase, verbose)) { 
 				if (verbose) {
 					(void)dumpgsvers(gsregbase, verbose);
 					if (getPstoeditsetDLLUsage()) errstream << "Latest GS DLL is " << buf << endl;