ghostscript: patched sources to allow building with Fujitsu compilers (#18345)

2 files changed, 85 insertions, 0 deletions

diff --git a/var/spack/repos/builtin/packages/ghostscript/nogoto.patch b/var/spack/repos/builtin/packages/ghostscript/nogoto.patch
new file mode 100644
index 0000000000..2f4e13cf78
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ghostscript/nogoto.patch
@@ -0,0 +1,83 @@
+diff -u -r -N a/devices/vector/gdevpsf2.c b/devices/vector/gdevpsf2.c
+--- a/devices/vector/gdevpsf2.c	2019-10-15 18:05:37.000000000 +0900
++++ b/devices/vector/gdevpsf2.c	2020-08-21 20:32:33.000000000 +0900
+@@ -1402,7 +1402,9 @@
+      * Therefore, we start by assuming the largest reasonable value for all
+      * the sizes and iterate until everything converges.
+      */
+- iter:
++    int iter = true;
++ while(true){
++  if(iter){
+     swrite_position_only(&poss);
+     writer.strm = &poss;
+ 
+@@ -1418,7 +1420,7 @@
+         cff_Index_size(charstrings_count, charstrings_size);
+     Subrs_offset = Private_size;  /* relative to Private Dict */
+ 
+- write:
++  }
+     if(check_ioerror(writer.strm))
+         return_error(gs_error_ioerror);
+     start_pos = stell(writer.strm);
+@@ -1499,14 +1501,16 @@
+         /* The iteration has converged.  Write the result. */
+         if (writer.strm == &poss) {
+             writer.strm = s;
+-            goto write;
++            iter = false;
++        } else {
++        	break;
+         }
+     } else {
+         /* No convergence yet. */
+         End_offset = offset;
+-        goto iter;
++        iter = true;
+     }
+-
++ }
+     /* All done. */
+     gs_free_object(pfont->memory, std_string_items, "psf_write_type2_font");
+     gs_free_object(pfont->memory, subset.glyphs.subset_data, "psf_write_type2_font");
+@@ -1716,7 +1720,9 @@
+      * Therefore, we start by assuming the largest reasonable value for all
+      * the sizes and iterate until everything converges.
+      */
+- iter:
++    int iter = true;
++ while(true){
++  if(iter){
+     swrite_position_only(&poss);
+     writer.strm = &poss;
+ 
+@@ -1732,7 +1738,7 @@
+                "[l]GSubrs at %u, charset at %u, FDSelect at %u, CharStrings at %u\n",
+                GSubrs_offset, charset_offset, FDSelect_offset, CharStrings_offset);
+ 
+- write:
++  }
+     start_pos = stell(writer.strm);
+     if_debug1m('l', s->memory, "[l]start_pos = %ld\n", start_pos);
+     /* Write the header, setting offset_size. */
+@@ -1867,14 +1873,16 @@
+         /* The iteration has converged.  Write the result. */
+         if (writer.strm == &poss) {
+             writer.strm = s;
+-            goto write;
++            iter = false;
++        } else {
++        	break;
+         }
+     } else {
+         /* No convergence yet. */
+         End_offset = offset;
+-        goto iter;
++        iter = true;
+     }
+-
++ }
+     /* All done. */
+     return 0;
+ }
diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py
index 72f3e6f3e0..ee14758dd1 100644
--- a/var/spack/repos/builtin/packages/ghostscript/package.py
+++ b/var/spack/repos/builtin/packages/ghostscript/package.py
@@ -30,6 +30,8 @@ class Ghostscript(AutotoolsPackage):
     depends_on('libxext')
     depends_on('gtkplus')
 
+    patch('nogoto.patch', when='%fj')
+
     def url_for_version(self, version):
         baseurl = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs{0}/ghostscript-{1}.tar.gz"
         return baseurl.format(version.joined, version.dotted)