From 67c63fd4534031c22484d278a76b45864eb6a3c1 Mon Sep 17 00:00:00 2001
From: Remko Scharroo <remko.scharroo@eumetsat.int>
Date: Thu, 30 Mar 2023 09:34:57 +0200
Subject: [PATCH] ghostscript: update to 10.01.2

---
 graphics/xfig/Portfile                        |  2 +-
 print/ghostscript/Portfile                    | 13 +++---
 .../ghostscript/files/patch-base_gspaint.diff | 42 +++++++++++++++++++
 .../files/patch-ghostscript-gsicc_lcms2.diff  | 15 -------
 4 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 print/ghostscript/files/patch-base_gspaint.diff
 delete mode 100644 print/ghostscript/files/patch-ghostscript-gsicc_lcms2.diff

diff --git a/graphics/xfig/Portfile b/graphics/xfig/Portfile
index d59a5c0cd9dd4..7789ce3006c87 100644
--- a/graphics/xfig/Portfile
+++ b/graphics/xfig/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 
 name                xfig
 version             3.2.8b
-revision            2
+revision            3
 categories          graphics x11
 license             Permissive
 maintainers         nomaintainer
diff --git a/print/ghostscript/Portfile b/print/ghostscript/Portfile
index 56fa720bc0edd..874fa3cac3415 100644
--- a/print/ghostscript/Portfile
+++ b/print/ghostscript/Portfile
@@ -4,8 +4,8 @@ PortSystem          1.0
 PortGroup           muniversal 1.0
 
 name                ghostscript
-version             9.56.1
-revision            1
+version             10.01.2
+revision            0
 categories          print
 license             AGPL-3 BSD
 maintainers         nomaintainer
@@ -33,12 +33,13 @@ distfiles           ${distname}.tar.gz:source \
                     ${mappingresources_commit}.zip:misc
 
 patchfiles          patch-base_unix-dll.mak.diff \
-                    patch-base_unixinst.mak.diff
+                    patch-base_unixinst.mak.diff \
+                    patch-base_gspaint.diff
 
 checksums           ${distname}.tar.gz \
-                    rmd160  babe8112b085191511fb9aec32f9162926c582d8 \
-                    sha256  6bf362286e359e31f934e5aad49db3d88a2382a3cac44b40572861ee5c536664 \
-                    size    92134638 \
+                    rmd160  4ab5d91715db0ef325298347a00a2a2e634fc54f \
+                    sha256  f30283f01a6966009a2e7b7553decdb5ec805501f3e24e5d86b0017fe16fbdba \
+                    size    93007238 \
                     ghostscript-fonts-other-6.0.tar.gz \
                     rmd160  ab60dbf71e7d91283a106c3df381cadfe173082f \
                     sha256  4fa051e341167008d37fe34c19d241060cd17b13909932cd7ca7fe759243c2de \
diff --git a/print/ghostscript/files/patch-base_gspaint.diff b/print/ghostscript/files/patch-base_gspaint.diff
new file mode 100644
index 0000000000000..91d384a4b7771
--- /dev/null
+++ b/print/ghostscript/files/patch-base_gspaint.diff
@@ -0,0 +1,42 @@
+--- base/gspaint.c.orig	2023-03-27 15:49:35.000000000 +0900
++++ base/gspaint.c	2023-04-27 19:13:03.000000000 +0900
+@@ -208,6 +208,7 @@
+     gs_fixed_rect bbox;
+     gs_int_rect ibox;
+     uint width, raster, band_space;
++    uint dev_width, dev_height;
+     uint height, height2;
+     gs_log2_scale_point log2_scale;
+     gs_memory_t *mem;
+@@ -223,6 +224,7 @@
+     if ((ibox.q.y <= ibox.p.y) || (ibox.q.x <= ibox.p.x))
+         return 2;
+     width = (ibox.q.x - ibox.p.x) << log2_scale.x;
++    dev_width = ibox.q.x << log2_scale.x;
+     raster = bitmap_raster(width);
+     band_space = raster << log2_scale.y;
+     height2 = (ibox.q.y - ibox.p.y);
+@@ -232,6 +234,7 @@
+     if (height > height2)
+         height = height2;
+     height <<= log2_scale.y;
++    dev_height = ibox.q.y << log2_scale.y;
+     mem = pgs->memory;
+     mdev = gs_alloc_struct(mem, gx_device_memory, &st_device_memory,
+                            "alpha_buffer_init");
+@@ -244,13 +247,9 @@
+     }
+     gs_make_mem_abuf_device(mdev, mem, dev, &log2_scale,
+                             alpha_bits, ibox.p.x << log2_scale.x, devn);
+-    mdev->width = width;
+-    mdev->height = height;
++    mdev->width = dev_width;
++    mdev->height = dev_height;
+     mdev->bitmap_memory = mem;
+-    /* Set the horrible hacky flag that tells people that the width/height here
+-     * have been set for *our* convenience, rather than accurately depicting the
+-     * size of the device for callers. */
+-    mdev->non_strict_bounds = 1;
+     if ((*dev_proc(mdev, open_device)) ((gx_device *) mdev) < 0) {
+         /* No room for bits, punt. */
+         gs_free_object(mem, mdev, "alpha_buffer_init");
diff --git a/print/ghostscript/files/patch-ghostscript-gsicc_lcms2.diff b/print/ghostscript/files/patch-ghostscript-gsicc_lcms2.diff
deleted file mode 100644
index 031aed9e62dba..0000000000000
--- a/print/ghostscript/files/patch-ghostscript-gsicc_lcms2.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Undefined symbols for architecture x86_64: 
-  "_gscms_transformm_color_const", referenced from:
-     _gscms_transform_color in gsicc_lcms2.o
-http://git.ghostscript.com/?p=ghostpdl.git;a=commit;f=base/gsicc_lcms2.c;h=830afae5454dea3bff903869d82022306890a96c
---- base/gsicc_lcms2.c.orig	2022-01-21 15:53:42.000000000 -0500
-+++ base/gsicc_lcms2.c	2022-01-21 15:54:00.000000000 -0500
-@@ -462,7 +462,7 @@
- gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
-                              void *outputcolor, int num_bytes)
- {
--    return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
-+    return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
- }
- 
- int