pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/print/ghostscript-gpl
Module Name: pkgsrc
Committed By: dholland
Date: Sat Jan 3 03:50:17 UTC 2026
Modified Files:
pkgsrc/print/ghostscript-gpl: distinfo
Added Files:
pkgsrc/print/ghostscript-gpl/patches:
patch-base_rinkj-rinkj--screen--eb.c patch-contrib-gdevlx32.c
patch-contrib-pcl3-src-gdevpcl3.c patch-psi-zgstate.c
Log Message:
print/ghostscript-gpl: fix build with gcc14
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/ghostscript-gpl/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/print/ghostscript-gpl/patches/patch-base_rinkj-rinkj--screen--eb.c \
pkgsrc/print/ghostscript-gpl/patches/patch-contrib-gdevlx32.c \
pkgsrc/print/ghostscript-gpl/patches/patch-contrib-pcl3-src-gdevpcl3.c \
pkgsrc/print/ghostscript-gpl/patches/patch-psi-zgstate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/print/ghostscript-gpl/distinfo
diff -u pkgsrc/print/ghostscript-gpl/distinfo:1.25 pkgsrc/print/ghostscript-gpl/distinfo:1.26
--- pkgsrc/print/ghostscript-gpl/distinfo:1.25 Tue Oct 26 11:12:07 2021
+++ pkgsrc/print/ghostscript-gpl/distinfo Sat Jan 3 03:50:16 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 11:12:07 nia Exp $
+$NetBSD: distinfo,v 1.26 2026/01/03 03:50:16 dholland Exp $
BLAKE2s (ghostscript-9.06.tar.bz2) = a85323a41a02c40da691432471e37b9279d10331aeaa62adbb5547bd39f24988
SHA512 (ghostscript-9.06.tar.bz2) = 99f7a56316bf96d55c0cd7b07c0791ad4e6ee0d3a8f3bfa04ea28890ea9ed822ebcd7084cc8118cc38dc5def27c91c24eebc08a20a630463a9bf9d0193d0923b
@@ -27,7 +27,10 @@ SHA1 (patch-base_gsdevice.c) = fc9a17b3e
SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
SHA1 (patch-base_gsmalloc.c) = 891bdcef49e0f2c435744eaf7bbcd31f5dbcbaba
SHA1 (patch-base_memento.c) = d30cfb9285a0268e743c90cdf831674eaa24789b
+SHA1 (patch-base_rinkj-rinkj--screen--eb.c) = 15ec343b91c668b59228ee0e16013ae7fbbd7224
+SHA1 (patch-contrib-gdevlx32.c) = 878a884752338341d39e3a4b73926b9fa7cf56ba
+SHA1 (patch-contrib-pcl3-src-gdevpcl3.c) = d1e179c5668abbd6210489928f2ec74a05580426
SHA1 (patch-cups_colord.h) = ab5c4bfa7184d2c1756697b87e7046645bdc2bc2
SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 24f15c55cd7961afc1254f6c4bccd6d0c2a5e737
-SHA1 (patch-psi_zfile.c) = 24626fed9b161a77d9ab43233bad4c8391120b16
+SHA1 (patch-psi-zgstate.c) = 9dba89b8b8cbf4637cd0c4328c8d6230529e2c61
SHA1 (patch-psi_fapi__ft.c) = ff9ee32a7332177d9b178452e071dd6f8805af8e
Added files:
Index: pkgsrc/print/ghostscript-gpl/patches/patch-base_rinkj-rinkj--screen--eb.c
diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-base_rinkj-rinkj--screen--eb.c:1.1
--- /dev/null Sat Jan 3 03:50:17 2026
+++ pkgsrc/print/ghostscript-gpl/patches/patch-base_rinkj-rinkj--screen--eb.c Sat Jan 3 03:50:17 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-base_rinkj-rinkj--screen--eb.c,v 1.1 2026/01/03 03:50:17 dholland Exp $
+
+Fix wrong casts. Required with gcc14.
+
+--- base/rinkj/rinkj-screen-eb.c~ 2012-08-08 08:01:36.000000000 +0000
++++ base/rinkj/rinkj-screen-eb.c
+@@ -182,8 +182,8 @@ rinkj_screen_eb_write (RinkjDevice *self
+ for (; status >= 0 && z->yrem < z->height_out; z->yrem += z->height_in)
+ {
+ even_better_line (z->dither,
+- (unsigned char *)out_buf,
+- (unsigned char *)data_permuted);
++ out_buf,
++ (const unsigned char *const *)data_permuted);
+
+ for (i = 0; i < n_planes; i++)
+ {
Index: pkgsrc/print/ghostscript-gpl/patches/patch-contrib-gdevlx32.c
diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-contrib-gdevlx32.c:1.1
--- /dev/null Sat Jan 3 03:50:17 2026
+++ pkgsrc/print/ghostscript-gpl/patches/patch-contrib-gdevlx32.c Sat Jan 3 03:50:17 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-contrib-gdevlx32.c,v 1.1 2026/01/03 03:50:17 dholland Exp $
+
+Need some explicit upcasts for the struct inheritance scheme
+they're using. Fixes build with gcc14.
+
+--- contrib/gdevlx32.c~ 2012-08-08 08:01:36.000000000 +0000
++++ contrib/gdevlx32.c
+@@ -742,7 +742,7 @@ lxm3200_print_page(gx_device_printer *pd
+ if(gendata.scanbuf == NULL ||
+ gendata.outdata == NULL)
+ {
+- freeresources(pdev);
++ freeresources((gx_device *)pdev);
+ return_error(gs_error_VMerror);
+ }
+
+@@ -773,7 +773,7 @@ lxm3200_print_page(gx_device_printer *pd
+ outputepilogue();
+
+ /* Free the allocated resources */
+- freeresources(pdev);
++ freeresources((gx_device *)pdev);
+
+ /* Done. Bye bye, see you on next page. */
+ return(0);
Index: pkgsrc/print/ghostscript-gpl/patches/patch-contrib-pcl3-src-gdevpcl3.c
diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-contrib-pcl3-src-gdevpcl3.c:1.1
--- /dev/null Sat Jan 3 03:50:17 2026
+++ pkgsrc/print/ghostscript-gpl/patches/patch-contrib-pcl3-src-gdevpcl3.c Sat Jan 3 03:50:17 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-contrib-pcl3-src-gdevpcl3.c,v 1.1 2026/01/03 03:50:17 dholland Exp $
+
+Remove extraneous argument. This can't have ever worked.
+
+--- contrib/pcl3/src/gdevpcl3.c~ 2012-08-08 08:01:36.000000000 +0000
++++ contrib/pcl3/src/gdevpcl3.c
+@@ -127,7 +127,7 @@ static const ms_MediaCode
+ /*****************************************************************************/
+
+ /* Forward declaration */
+-static void pcl3_flag_mismatch_reporter(FILE *err,
++static void pcl3_flag_mismatch_reporter(
+ const struct s_eprn_Device *eprn, bool no_match);
+
+ /* Macro for creating device structure instances */
+@@ -428,7 +428,7 @@ static void init(pcl3_Device *dev)
+
+ ******************************************************************************/
+
+-static void pcl3_flag_mismatch_reporter(FILE *err,
++static void pcl3_flag_mismatch_reporter(
+ const struct s_eprn_Device *eprn, bool no_match)
+ {
+ const char *epref = eprn->CUPS_messages? CUPS_ERRPREF: "";
Index: pkgsrc/print/ghostscript-gpl/patches/patch-psi-zgstate.c
diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-psi-zgstate.c:1.1
--- /dev/null Sat Jan 3 03:50:17 2026
+++ pkgsrc/print/ghostscript-gpl/patches/patch-psi-zgstate.c Sat Jan 3 03:50:17 2026
@@ -0,0 +1,58 @@
+$NetBSD: patch-psi-zgstate.c,v 1.1 2026/01/03 03:50:17 dholland Exp $
+
+Don't do illegal things with function pointer.
+
+--- psi/zgstate.c~ 2012-08-08 08:01:36.000000000 +0000
++++ psi/zgstate.c
+@@ -71,6 +71,17 @@ zcurrent_bool(i_ctx_t *i_ctx_p, bool (*c
+ }
+
+ static int
++zset_int(i_ctx_t *i_ctx_p, void (*set_proc)(gs_state *, int))
++{
++ os_ptr op = osp;
++
++ check_type(*op, t_integer);
++ set_proc(igs, op->value.intval);
++ pop(1);
++ return 0;
++}
++
++static int
+ zset_uint(i_ctx_t *i_ctx_p, void (*set_proc)(gs_state *, uint))
+ {
+ os_ptr op = osp;
+@@ -82,6 +93,16 @@ zset_uint(i_ctx_t *i_ctx_p, void (*set_p
+ }
+
+ static int
++zcurrent_int(i_ctx_t *i_ctx_p, int (*current_proc)(const gs_state *))
++{
++ os_ptr op = osp;
++
++ push(1);
++ make_int(op, current_proc(igs));
++ return 0;
++}
++
++static int
+ zcurrent_uint(i_ctx_t *i_ctx_p, uint (*current_proc)(const gs_state *))
+ {
+ os_ptr op = osp;
+@@ -519,14 +540,14 @@ zcurrenttextrenderingmode(i_ctx_t *i_ctx
+ static int
+ zsethpglpathmode(i_ctx_t *i_ctx_p)
+ {
+- return zset_uint(i_ctx_p, gs_sethpglpathmode);
++ return zset_int(i_ctx_p, gs_sethpglpathmode);
+ }
+
+ /* - .currenthpglpathmode <int> */
+ static int
+ zcurrenthpglpathmode(i_ctx_t *i_ctx_p)
+ {
+- return zcurrent_uint(i_ctx_p, gs_currenthpglpathmode);
++ return zcurrent_int(i_ctx_p, gs_currenthpglpathmode);
+ }
+
+ /* ------ Initialization procedure ------ */
Home |
Main Index |
Thread Index |
Old Index