r22262 by jghali -

[scribus-commit]

Author: jghali
Date: Mon Dec 18 22:41:37 2017
New Revision: 22262

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22262
Log:
#15077: importing eps-files with Scribus 1.4.6 and Ghostscript 9.22 fails

Modified:
    branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp

Modified: branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22262&path=/branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp	(original)
+++ branches/Version14x/Scribus/scribus/plugins/import/ps/importps.cpp	Mon Dec 18 22:41:37 2017
@@ -42,6 +42,7 @@
 #include "util.h"
 #include "util_color.h"
 #include "util_formats.h"
+#include "util_ghostscript.h"
 #include "util_icon.h"
 #include "util_math.h"
 #ifdef HAVE_PODOFO
@@ -406,11 +407,20 @@
 	System(getShortPathName(PrefsManager::instance()->ghostscriptExecutable()), args, errFile, errFile, &cancel);
 	args.clear();
 */
+	int major = 0, minor = 0;
+	getNumericGSVersion(major, minor);
+	int gsVersion = major * 1000 + minor;
+
 	args.append( "-q" );
 	args.append( "-dNOPAUSE" );
 	args.append( "-dNODISPLAY" );
 	args.append( "-dBATCH" );
-	args.append( "-dDELAYBIND" );
+	// #15077: -dDELAYBIND was deprecated in 9.22 but will be restored in 9.23
+	// See http://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=fa499a5809aab45b2891b5c8b2363d1bca890757
+	if (gsVersion == 9022)
+		args.append( "-dREALLYDELAYBIND" );
+	else
+		args.append( "-dDELAYBIND" );
 	// Add any extra font paths being used by Scribus to gs's font search
 	// path We have to use Scribus's prefs context, not a plugin context, to
 	// get to the required information.