[packages/openscad] upstream fix for tests failure with recent ghostscript

atler atler at pld-linux.org
Wed Feb 22 23:23:36 CET 2023


commit 39ba028d050ac421290e5177eb13148e9f99520e
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 22 23:20:10 2023 +0100

    upstream fix for tests failure with recent ghostscript

 openscad.spec |  2 ++
 tests.patch   | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
---
diff --git a/openscad.spec b/openscad.spec
index ded6812..63ccd55 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -18,6 +18,7 @@ Source0:	http://files.openscad.org/%{name}-%{version}.src.tar.gz
 # Source0-md5:	79f8e3a42bcfeeb3ddde9e5bc2311f76
 Patch0:		%{name}-polyclipping.patch
 Patch1:		localedir.patch
+Patch2:		tests.patch
 URL:		http://www.openscad.org/
 BuildRequires:	CGAL-devel >= 4.9
 BuildRequires:	ImageMagick
@@ -146,6 +147,7 @@ expect some API changes, however many things are already working.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # use system package
 %{__rm} -r src/ext/polyclipping
diff --git a/tests.patch b/tests.patch
new file mode 100644
index 0000000..6055b6d
--- /dev/null
+++ b/tests.patch
@@ -0,0 +1,23 @@
+From 9c3406c34fe79419b74867e33b47db00b3a348af Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul at gmx.de>
+Date: Thu, 14 Apr 2022 16:07:04 +0200
+Subject: [PATCH] Remove double quoting of the output file parameter for
+ ghostscript.
+
+---
+ tests/export_pngtest.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/export_pngtest.py b/tests/export_pngtest.py
+index 2293148e75..94c81960e1 100644
+--- a/tests/export_pngtest.py
++++ b/tests/export_pngtest.py
+@@ -82,7 +82,7 @@ def createImport(inputfile, scadfile):
+ if result != 0:
+     failquit('OpenSCAD failed with return code ' + str(result))
+ 
+-convert_cmd = gs_cmd + ["-sOutputFile=\"" + pngfile + "\"", exportfile]
++convert_cmd = gs_cmd + ["-sOutputFile=" + pngfile, exportfile]
+ print('Running Converter:', ' '.join(convert_cmd), file=sys.stderr)
+ result = subprocess.call(convert_cmd)
+ if result != 0:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openscad.git/commitdiff/9b5a7c8a3aecf7811a8f8ccea32d3a56e128a33e



More information about the pld-cvs-commit mailing list