diff --git a/meta/recipes-extended/ghostscript/ghostscript/0001-Fix-32-bit-build.patch b/meta/recipes-extended/ghostscript/ghostscript/0001-Fix-32-bit-build.patch deleted file mode 100644 index 8d1e9d46e6..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/0001-Fix-32-bit-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Wed, 10 Sep 2025 08:55:30 +0100 -Subject: [PATCH] Fix 32-bit build - -Bug #708824 "ghostscript 10.06.0 compilation failure on 32-bit archs" - -nbytes shiouldn't be an intptr_t, it doesn't get used for pointer -arithmetic. Previously it was a uint, should be a int64_t, to fit with -all the other devices. - -Checked other warnings, and found a (very minor) one in gdevdbit.c, fix -that while we're here (signed/unsigned mismatch, we don't really care). - -Upstream-Status: Backport [https://github.com/ArtifexSoftware/ghostpdl/commit/3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f] - -Signed-off-by: Vijay Anusuri ---- - base/gdevdbit.c | 2 +- - base/gdevmpla.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/base/gdevdbit.c b/base/gdevdbit.c -index e07cc3f3b8..1b5c69325b 100644 ---- a/base/gdevdbit.c -+++ b/base/gdevdbit.c -@@ -191,7 +191,7 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x, - fit_copy(dev, data, data_x, raster, id, x, y, width, height); - row_alpha = data; - out_raster = bitmap_raster(width * (size_t)byte_depth); -- if (check_64bit_multiply(out_raster, ncomps, &product) != 0) -+ if (check_64bit_multiply(out_raster, ncomps, (int64_t *) &product) != 0) - return gs_note_error(gs_error_undefinedresult); - gb_buff = gs_alloc_bytes(mem, product, "copy_alpha_hl_color(gb_buff)"); - if (gb_buff == 0) { -diff --git a/base/gdevmpla.c b/base/gdevmpla.c -index 2f0d522561..ffc5ff42e6 100644 ---- a/base/gdevmpla.c -+++ b/base/gdevmpla.c -@@ -1954,12 +1954,12 @@ mem_planar_strip_copy_rop2(gx_device * dev, - int i; - int j; - intptr_t chunky_sraster; -- intptr_t nbytes; -+ int64_t nbytes; - byte **line_ptrs; - byte *sbuf, *buf; - - chunky_sraster = sraster * (intptr_t)mdev->num_planar_planes; -- if (check_64bit_multiply(height, chunky_sraster, (size_t *)&nbytes) != 0) -+ if (check_64bit_multiply(height, chunky_sraster, &nbytes) != 0) - return gs_note_error(gs_error_undefinedresult); - buf = gs_alloc_bytes(mdev->memory, nbytes, "mem_planar_strip_copy_rop(buf)"); - if (buf == NULL) { -@@ -2003,7 +2003,7 @@ mem_planar_strip_copy_rop2(gx_device * dev, - intptr_t i; - intptr_t chunky_t_raster; - int chunky_t_height; -- intptr_t nbytes; -+ int64_t nbytes; - byte **line_ptrs; - byte *tbuf, *buf; - gx_strip_bitmap newtex; diff --git a/meta/recipes-extended/ghostscript/ghostscript/0001-psi-ztype.c-replace-static-const-double-with-macros-.patch b/meta/recipes-extended/ghostscript/ghostscript/0001-psi-ztype.c-replace-static-const-double-with-macros-.patch index 6f310abf2e..534ddf1fb3 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/0001-psi-ztype.c-replace-static-const-double-with-macros-.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/0001-psi-ztype.c-replace-static-const-double-with-macros-.patch @@ -1,4 +1,4 @@ -From 0298799777bd179c455e5ce8d6008b2d84732967 Mon Sep 17 00:00:00 2001 +From 002360316bafe474295be83034576478f65a6029 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 7 Apr 2026 22:40:26 -0700 Subject: [PATCH] psi/ztype.c: replace static const double with macros for @@ -28,6 +28,6 @@ index a01d83f..d454778 100644 + +#define min_int_real ((double)(ALT_MIN_INT) - 1.0) +#define max_int_real ((double)(ALT_MAX_INT) + 1.0) - + #define REAL_CAN_BE_INT(v)\ ((v) > min_int_real && (v) < max_int_real) diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch index d191231c7b..0e09eaf4e2 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch @@ -1,4 +1,4 @@ -From 85905ce3b1bc63f0be9eda9888e40d8e7a803d21 Mon Sep 17 00:00:00 2001 +From 6d40b14e75d742fbccdcd507f0cd425c995fd6e5 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 29 Mar 2018 16:02:05 +0800 Subject: [PATCH] avoid host contamination @@ -15,7 +15,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/devs.mak b/devices/devs.mak -index a5dbc7a..27b55f2 100644 +index 1e44e8d..f4d95da 100644 --- a/devices/devs.mak +++ b/devices/devs.mak @@ -403,7 +403,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch index 0598c3dcd2..48760a008d 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch @@ -1,4 +1,4 @@ -From c23b787f9a38be2cdc57133915c402b69acedd1a Mon Sep 17 00:00:00 2001 +From 960629e0b80998d393b133a17e0f96d7fdfa229a Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 4 May 2015 22:31:48 -0700 Subject: [PATCH] base/gendev.c: fix for -Werror=return-type diff --git a/meta/recipes-extended/ghostscript/ghostscript/out-of-tree.patch b/meta/recipes-extended/ghostscript/ghostscript/out-of-tree.patch index 202c9d6c7c..d5e19a6154 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/out-of-tree.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/out-of-tree.patch @@ -1,14 +1,21 @@ -Fix the build to do out-of-tree properly. +From 9345c565e87a2456e4d780dee5f4b76e0e4e4854 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Thu, 2 Apr 2026 14:41:42 +0100 +Subject: [PATCH] Fix the build to do out-of-tree properly. The patches are in progress but are being submitted upstream. Upstream-Status: Submitted [https://bugs.ghostscript.com/show_bug.cgi?id=709289] Signed-off-by: Ross Burton +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -diff -rU3 a/configure.ac b/configure.ac ---- a/configure.ac 2025-09-09 10:36:39.000000000 +0100 -+++ b/configure.ac 2026-03-31 15:35:08.988262612 +0100 -@@ -400,7 +400,7 @@ +diff --git a/configure.ac b/configure.ac +index d01807b..dd00e86 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -400,7 +400,7 @@ if test x"$with_arch_h" = x""; then *) ARCH_CONF_HEADER= if test x"$host" != x"$build"; then @@ -17,7 +24,7 @@ diff -rU3 a/configure.ac b/configure.ac else ARCH_CONF_HEADER= fi -@@ -869,8 +869,8 @@ +@@ -872,8 +872,8 @@ AC_SUBST(PTHREAD_LIBS) AC_SUBST(RECURSIVE_MUTEXATTR) dnl Tesseract/Leptonica detection @@ -28,7 +35,7 @@ diff -rU3 a/configure.ac b/configure.ac OCR_VERSION=0 OCR_SHARED=0 LEPTONICAINCLUDE= -@@ -886,7 +886,7 @@ +@@ -889,7 +889,7 @@ AC_ARG_WITH([tesseract], AS_HELP_STRING([--without-tesseract], if test x$with_tesseract != xno; then AC_MSG_CHECKING([for local Tesseract library source]) diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.06.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.07.0.bb similarity index 95% rename from meta/recipes-extended/ghostscript/ghostscript_10.06.0.bb rename to meta/recipes-extended/ghostscript/ghostscript_10.07.0.bb index 1363aa281e..1b6cb4aaae 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.06.0.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.07.0.bb @@ -24,12 +24,11 @@ def gs_verdir(v): SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ file://ghostscript-9.16-Werror-return-type.patch \ file://avoid-host-contamination.patch \ - file://0001-Fix-32-bit-build.patch \ file://out-of-tree.patch \ file://0001-psi-ztype.c-replace-static-const-double-with-macros-.patch \ " -SRC_URI[sha256sum] = "5bd6da34794928cc7e616f288e32bd0be7f9a5ca2d3c206a0af2c19a4e3a318f" +SRC_URI[sha256sum] = "ed6ea62022e3f4d5a6569b6efc9361b63a6d118bfcad8f0beb897c37885b5cad" PACKAGECONFIG ??= "" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"