summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-11-12 09:08:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:08:10 (GMT)
commit587b28b551308c8b772d088788452f6ca7420909 (patch)
tree63203af8b8674351fe08d99eae45a2a45b33a487 /meta
parent58bee16296da7d6a6a95e89121ac9ffdf07ca202 (diff)
downloadpoky-587b28b551308c8b772d088788452f6ca7420909.tar.gz
ghostscript: upgrade to 9.15
Rebase cups-no-gcrypt.patch and ghostscript-9.02-parallel-make.patch to 9.15 (From OE-Core rev: b93ef60acf8128cf44d4407fdb65a0ac016791d3) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch19
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch99
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.15.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.14.bb)4
3 files changed, 64 insertions, 58 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
index 1c0a6d5..a1c9368 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
@@ -7,22 +7,25 @@ This addresses the cryto dependency seen during build.
7Upstream-Status: Backport 7Upstream-Status: Backport
8 8
9Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 9Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10
11Rebase the patch to ghostscript-9.15
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10--- 13---
11 cups/libs/cups/http-private.h | 1 - 14 cups/libs/cups/http-private.h | 1 -
12 1 file changed, 1 deletion(-) 15 1 file changed, 1 deletion(-)
13 16
14diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h 17diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h
15index 9c88281..94a9817 100644 18index 99a85c3..a674852 100644
16--- a/cups/libs/cups/http-private.h 19--- a/cups/libs/cups/http-private.h
17+++ b/cups/libs/cups/http-private.h 20+++ b/cups/libs/cups/http-private.h
18@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void); 21@@ -80,7 +80,6 @@ typedef int socklen_t;
19 * The GNU TLS library is more of a "bare metal" SSL/TLS library... 22 # elif defined HAVE_GNUTLS
20 */
21 # include <gnutls/gnutls.h> 23 # include <gnutls/gnutls.h>
24 # include <gnutls/x509.h>
22-# include <gcrypt.h> 25-# include <gcrypt.h>
23 26 # elif defined(HAVE_CDSASSL)
24 typedef struct 27 # include <CoreFoundation/CoreFoundation.h>
25 { 28 # include <Security/Security.h>
26-- 29--
272.0.0 301.9.1
28 31
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
index 601f5f1..ae9da6e 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
@@ -12,6 +12,9 @@ RP: Extended || true to all CP_ operations, they all can race e.g.:
12 12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14 14
15Rebase the patch to ghostscript-9.15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17
15diff --git a/base/expat.mak b/base/expat.mak 18diff --git a/base/expat.mak b/base/expat.mak
16index 4ee9c8c..2e16a9d 100644 19index 4ee9c8c..2e16a9d 100644
17--- a/base/expat.mak 20--- a/base/expat.mak
@@ -39,10 +42,10 @@ index 16f2b95..409f75b 100644
39 # Define the shared version. 42 # Define the shared version.
40 $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE) 43 $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE)
41diff --git a/base/gs.mak b/base/gs.mak 44diff --git a/base/gs.mak b/base/gs.mak
42index 7d75fb0..2a9596c 100644 45index 3fc67df..1fc3e26 100644
43--- a/base/gs.mak 46--- a/base/gs.mak
44+++ b/base/gs.mak 47+++ b/base/gs.mak
45@@ -433,7 +433,7 @@ $(gconfxx_h) : $(ld_tr) 48@@ -434,7 +434,7 @@ $(gconfxx_h) : $(ld_tr)
46 49
47 $(gconfig_h) : $(gconfxx_h) 50 $(gconfig_h) : $(gconfxx_h)
48 $(RM_) $(gconfig_h) 51 $(RM_) $(gconfig_h)
@@ -78,7 +81,7 @@ index bb74630..44617a0 100644
78 # dev file for shared (separately built) jbig2dec library 81 # dev file for shared (separately built) jbig2dec library
79 $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE) 82 $(JBIG2GEN)jbig2dec_1.dev : $(TOP_MAKEFILES) $(JBIG2_MAK) $(ECHOGS_XE)
80diff --git a/base/jpeg.mak b/base/jpeg.mak 83diff --git a/base/jpeg.mak b/base/jpeg.mak
81index 5310a20..43cee63 100644 84index e300a04..9fdad5a 100644
82--- a/base/jpeg.mak 85--- a/base/jpeg.mak
83+++ b/base/jpeg.mak 86+++ b/base/jpeg.mak
84@@ -96,7 +96,7 @@ jconfig_h=$(GLGEN)jconfig.h 87@@ -96,7 +96,7 @@ jconfig_h=$(GLGEN)jconfig.h
@@ -148,7 +151,7 @@ index 5310a20..43cee63 100644
148 151
149 # In order to avoid having to keep the dependency lists for the IJG code 152 # In order to avoid having to keep the dependency lists for the IJG code
150 # accurate, we simply make all of them depend on the only files that 153 # accurate, we simply make all of them depend on the only files that
151@@ -174,40 +174,40 @@ $(JGEN)jpegc0.dev : $(JPEG_MAK) $(ECHOGS_XE) $(jpegc0_) 154@@ -181,40 +181,40 @@ $(JGEN)jpegc0.dev : $(JPEG_MAK) $(ECHOGS_XE) $(jpegc0_)
152 $(SETMOD) $(JGEN)jpegc0 $(jpegc0_) 155 $(SETMOD) $(JGEN)jpegc0 $(jpegc0_)
153 156
154 $(JOBJ)jcomapi.$(OBJ) : $(JSRC)jcomapi.c $(JDEP) 157 $(JOBJ)jcomapi.$(OBJ) : $(JSRC)jcomapi.c $(JDEP)
@@ -196,7 +199,7 @@ index 5310a20..43cee63 100644
196 199
197 jpege6=$(JOBJ)jcapimin.$(OBJ) $(JOBJ)jcapistd.$(OBJ) $(JOBJ)jcinit.$(OBJ) 200 jpege6=$(JOBJ)jcapimin.$(OBJ) $(JOBJ)jcapistd.$(OBJ) $(JOBJ)jcinit.$(OBJ)
198 201
199@@ -223,90 +223,90 @@ $(JGEN)jpege6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpege6) $(jpege 202@@ -230,90 +230,90 @@ $(JGEN)jpege6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpege6) $(jpege
200 $(ADDMOD) $(JGEN)jpege6 -obj $(jpege_3) 203 $(ADDMOD) $(JGEN)jpege6 -obj $(jpege_3)
201 204
202 $(JOBJ)jcapimin.$(OBJ) : $(JSRC)jcapimin.c $(JDEP) 205 $(JOBJ)jcapimin.$(OBJ) : $(JSRC)jcapimin.c $(JDEP)
@@ -304,7 +307,7 @@ index 5310a20..43cee63 100644
304 307
305 jpegd6=$(JOBJ)jdapimin.$(OBJ) $(JOBJ)jdapistd.$(OBJ) $(JOBJ)jdinput.$(OBJ) $(JOBJ)jdhuff.$(OBJ) 308 jpegd6=$(JOBJ)jdapimin.$(OBJ) $(JOBJ)jdapistd.$(OBJ) $(JOBJ)jdinput.$(OBJ) $(JOBJ)jdhuff.$(OBJ)
306 309
307@@ -322,76 +322,76 @@ $(JGEN)jpegd6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpegd6) $(jpegd 310@@ -329,76 +329,76 @@ $(JGEN)jpegd6.dev : $(JPEG_MAK) $(ECHOGS_XE) $(JGEN)jpegc0.dev $(jpegd6) $(jpegd
308 $(ADDMOD) $(JGEN)jpegd6 -obj $(jpegd_3) 311 $(ADDMOD) $(JGEN)jpegd6 -obj $(jpegd_3)
309 312
310 $(JOBJ)jdapimin.$(OBJ) : $(JSRC)jdapimin.c $(JDEP) 313 $(JOBJ)jdapimin.$(OBJ) : $(JSRC)jdapimin.c $(JDEP)
@@ -436,10 +439,10 @@ index 52f750c..33a9c16 100644
436 # dev file for shared (separately built) lcms library 439 # dev file for shared (separately built) lcms library
437 $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE) 440 $(LCMS2GEN)lcms2_1.dev : $(TOP_MAKEFILES) $(LCMS2_MAK) $(ECHOGS_XE)
438diff --git a/base/lcups.mak b/base/lcups.mak 441diff --git a/base/lcups.mak b/base/lcups.mak
439index 0bfb3ac..fcdb170 100644 442index 7504c44..7b9b979 100644
440--- a/base/lcups.mak 443--- a/base/lcups.mak
441+++ b/base/lcups.mak 444+++ b/base/lcups.mak
442@@ -114,7 +114,7 @@ libcups.config-clean : 445@@ -116,7 +116,7 @@ libcups.config-clean :
443 446
444 # instantiate the requested build option (shared or compiled in) 447 # instantiate the requested build option (shared or compiled in)
445 $(LIBCUPSGEN)lcups.dev : $(TOP_MAKEFILES) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev 448 $(LIBCUPSGEN)lcups.dev : $(TOP_MAKEFILES) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev
@@ -448,7 +451,7 @@ index 0bfb3ac..fcdb170 100644
448 451
449 # Define the shared version. 452 # Define the shared version.
450 $(LIBCUPSGEN)lcups_1.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) 453 $(LIBCUPSGEN)lcups_1.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE)
451@@ -131,7 +131,7 @@ $(LIBCUPSGEN)lcups_0.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) \ 454@@ -133,7 +133,7 @@ $(LIBCUPSGEN)lcups_0.dev : $(TOP_MAKEFILES) $(LCUPS_MAK) $(ECHOGS_XE) \
452 # for simplicity we have every source file depend on all headers 455 # for simplicity we have every source file depend on all headers
453 456
454 $(LIBCUPSGEN)$(D)cups$(D)config.h : $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h 457 $(LIBCUPSGEN)$(D)cups$(D)config.h : $(LCUPSSRCDIR)$(D)libs$(D)config$(LCUPSBUILDTYPE).h
@@ -457,7 +460,7 @@ index 0bfb3ac..fcdb170 100644
457 460
458 $(LIBCUPSOBJ)adminutil.$(OBJ) : $(LIBCUPSSRC)adminutil.c $(LIBSCUPSHEADERS) $(LIBCUPSGEN)$(D)cups$(D)config.h 461 $(LIBCUPSOBJ)adminutil.$(OBJ) : $(LIBCUPSSRC)adminutil.c $(LIBSCUPSHEADERS) $(LIBCUPSGEN)$(D)cups$(D)config.h
459 $(LCUPS_CC) $(LCUPSO_)adminutil.$(OBJ) $(C_) $(LIBCUPSSRC)adminutil.c 462 $(LCUPS_CC) $(LCUPSO_)adminutil.$(OBJ) $(C_) $(LIBCUPSSRC)adminutil.c
460@@ -218,7 +218,7 @@ $(LIBCUPSOBJ)mark.$(OBJ) : $(LIBCUPSSRC)mark.c $(LIBSCUPSHEADERS) 463@@ -220,7 +220,7 @@ $(LIBCUPSOBJ)mark.$(OBJ) : $(LIBCUPSSRC)mark.c $(LIBSCUPSHEADERS)
461 $(LCUPS_CC) $(LCUPSO_)mark.$(OBJ) $(C_) $(LIBCUPSSRC)mark.c 464 $(LCUPS_CC) $(LCUPSO_)mark.$(OBJ) $(C_) $(LIBCUPSSRC)mark.c
462 465
463 $(LIBCUPSOBJ)cups_md5.$(OBJ) : $(LIBCUPSSRC)md5.c $(LIBSCUPSHEADERS) 466 $(LIBCUPSOBJ)cups_md5.$(OBJ) : $(LIBCUPSSRC)md5.c $(LIBSCUPSHEADERS)
@@ -466,7 +469,7 @@ index 0bfb3ac..fcdb170 100644
466 $(LCUPS_CC) $(LCUPSO_)cups_md5.$(OBJ) $(C_) $(LIBCUPSGEN)cups_md5.c 469 $(LCUPS_CC) $(LCUPSO_)cups_md5.$(OBJ) $(C_) $(LIBCUPSGEN)cups_md5.c
467 470
468 $(LIBCUPSOBJ)md5passwd.$(OBJ) : $(LIBCUPSSRC)md5passwd.c $(LIBSCUPSHEADERS) 471 $(LIBCUPSOBJ)md5passwd.$(OBJ) : $(LIBCUPSSRC)md5passwd.c $(LIBSCUPSHEADERS)
469@@ -255,7 +255,7 @@ $(LIBCUPSOBJ)snmp.$(OBJ) : $(LIBCUPSSRC)snmp.c $(LIBSCUPSHEADERS) 472@@ -257,7 +257,7 @@ $(LIBCUPSOBJ)snmp.$(OBJ) : $(LIBCUPSSRC)snmp.c $(LIBSCUPSHEADERS)
470 $(LCUPS_CC) $(LCUPSO_)snmp.$(OBJ) $(C_) $(LIBCUPSSRC)snmp.c 473 $(LCUPS_CC) $(LCUPSO_)snmp.$(OBJ) $(C_) $(LIBCUPSSRC)snmp.c
471 474
472 $(LIBCUPSOBJ)cups_snpf.$(OBJ) : $(LIBCUPSSRC)snprintf.c $(LIBSCUPSHEADERS) 475 $(LIBCUPSOBJ)cups_snpf.$(OBJ) : $(LIBCUPSSRC)snprintf.c $(LIBSCUPSHEADERS)
@@ -475,18 +478,18 @@ index 0bfb3ac..fcdb170 100644
475 $(LCUPS_CC) $(LCUPSO_)cups_snpf.$(OBJ) $(C_) $(LIBCUPSGEN)cups_snpf.c 478 $(LCUPS_CC) $(LCUPSO_)cups_snpf.$(OBJ) $(C_) $(LIBCUPSGEN)cups_snpf.c
476 479
477 $(LIBCUPSOBJ)string.$(OBJ) : $(LIBCUPSSRC)string.c $(LIBSCUPSHEADERS) 480 $(LIBCUPSOBJ)string.$(OBJ) : $(LIBCUPSSRC)string.c $(LIBSCUPSHEADERS)
478@@ -271,5 +271,5 @@ $(LIBCUPSOBJ)usersys.$(OBJ) : $(LIBCUPSSRC)usersys.c $(LIBSCUPSHEADERS) 481@@ -279,5 +279,5 @@ $(LIBCUPSOBJ)thread.$(OBJ) : $(LIBCUPSSRC)thread.c $(LIBSCUPSHEADERS)
479 $(LCUPS_CC) $(LCUPSO_)usersys.$(OBJ) $(C_) $(LIBCUPSSRC)usersys.c 482 $(LCUPS_CC) $(LCUPSO_)thread.$(OBJ) $(C_) $(LIBCUPSSRC)thread.c
480 483
481 $(LIBCUPSOBJ)cups_util.$(OBJ) : $(LIBCUPSSRC)util.c $(LIBSCUPSHEADERS) 484 $(LIBCUPSOBJ)cups_util.$(OBJ) : $(LIBCUPSSRC)util.c $(LIBSCUPSHEADERS)
482- $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c 485- $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c
483+ $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true 486+ $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true
484 $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c 487 $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c
485diff --git a/base/lcupsi.mak b/base/lcupsi.mak 488diff --git a/base/lcupsi.mak b/base/lcupsi.mak
486index ea4047f..0102d93 100644 489index da47da5..fa7d74c 100644
487--- a/base/lcupsi.mak 490--- a/base/lcupsi.mak
488+++ b/base/lcupsi.mak 491+++ b/base/lcupsi.mak
489@@ -73,7 +73,7 @@ libcupsi.config-clean : 492@@ -59,7 +59,7 @@ libcupsi.config-clean :
490 493
491 # instantiate the requested build option (shared or compiled in) 494 # instantiate the requested build option (shared or compiled in)
492 $(LIBCUPSIGEN)lcupsi.dev : $(TOP_MAKEFILES) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev 495 $(LIBCUPSIGEN)lcupsi.dev : $(TOP_MAKEFILES) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev
@@ -509,10 +512,10 @@ index 3f50892..97c76a0 100644
509 # external link .dev 512 # external link .dev
510 $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE) 513 $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE)
511diff --git a/base/lib.mak b/base/lib.mak 514diff --git a/base/lib.mak b/base/lib.mak
512index 3ad7db3..87b4f01 100644 515index 90c9249..fb11aba 100644
513--- a/base/lib.mak 516--- a/base/lib.mak
514+++ b/base/lib.mak 517+++ b/base/lib.mak
515@@ -343,7 +343,7 @@ md5_=$(GLOBJ)md5.$(OBJ) 518@@ -350,7 +350,7 @@ md5_=$(GLOBJ)md5.$(OBJ)
516 $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE) 519 $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE)
517 $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22 520 $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22
518 $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h 521 $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h
@@ -521,7 +524,7 @@ index 3ad7db3..87b4f01 100644
521 $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c 524 $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c
522 $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h 525 $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h
523 526
524@@ -624,19 +624,19 @@ $(GLOBJ)gconfig.$(OBJ) : $(gconfig_h) $(GLSRC)gconf.c $(AK) $(gx_h)\ 527@@ -631,19 +631,19 @@ $(GLOBJ)gconfig.$(OBJ) : $(gconfig_h) $(GLSRC)gconf.c $(AK) $(gx_h)\
525 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\ 528 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\
526 $(MAKEDDIRS) 529 $(MAKEDDIRS)
527 $(RM_) $(GLGEN)gconfig.c 530 $(RM_) $(GLGEN)gconfig.c
@@ -544,7 +547,7 @@ index 3ad7db3..87b4f01 100644
544 $(GLCCAUX) $(C_) $(AUXO_)gscdefs.$(OBJ) $(AUX)gscdefs.c 547 $(GLCCAUX) $(C_) $(AUXO_)gscdefs.$(OBJ) $(AUX)gscdefs.c
545 548
546 $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\ 549 $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\
547@@ -1527,7 +1527,7 @@ $(GLOBJ)sjpegc_0.$(OBJ) : $(GLSRC)sjpegc.c $(AK) $(stdio__h) $(string__h)\ 550@@ -1535,7 +1535,7 @@ $(GLOBJ)sjpegc_0.$(OBJ) : $(GLSRC)sjpegc.c $(AK) $(stdio__h) $(string__h)\
548 $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c 551 $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c
549 552
550 $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) 553 $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ)
@@ -553,7 +556,7 @@ index 3ad7db3..87b4f01 100644
553 556
554 # sdcparam is used by the filter operator and the PS/PDF writer. 557 # sdcparam is used by the filter operator and the PS/PDF writer.
555 # It is not included automatically in sdcte/d. 558 # It is not included automatically in sdcte/d.
556@@ -1555,7 +1555,7 @@ $(GLOBJ)sdcte_0.$(OBJ) : $(GLSRC)sdcte.c $(AK)\ 559@@ -1563,7 +1563,7 @@ $(GLOBJ)sdcte_0.$(OBJ) : $(GLSRC)sdcte.c $(AK)\
557 $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c 560 $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c
558 561
559 $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) 562 $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
@@ -562,7 +565,7 @@ index 3ad7db3..87b4f01 100644
562 565
563 566
564 $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ 567 $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\
565@@ -1571,7 +1571,7 @@ $(GLOBJ)sjpege_0.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ 568@@ -1579,7 +1579,7 @@ $(GLOBJ)sjpege_0.$(OBJ) : $(GLSRC)sjpege.c $(AK)\
566 $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c 569 $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c
567 570
568 $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) 571 $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
@@ -571,7 +574,7 @@ index 3ad7db3..87b4f01 100644
571 574
572 # sdeparam is used by the filter operator and the PS/PDF writer. 575 # sdeparam is used by the filter operator and the PS/PDF writer.
573 # It is not included automatically in sdcte. 576 # It is not included automatically in sdcte.
574@@ -1603,7 +1603,7 @@ $(GLOBJ)sdctd_0.$(OBJ) : $(GLSRC)sdctd.c $(AK)\ 577@@ -1611,7 +1611,7 @@ $(GLOBJ)sdctd_0.$(OBJ) : $(GLSRC)sdctd.c $(AK)\
575 $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c 578 $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c
576 579
577 $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) 580 $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
@@ -580,7 +583,7 @@ index 3ad7db3..87b4f01 100644
580 583
581 584
582 $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ 585 $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\
583@@ -1620,7 +1620,7 @@ $(GLOBJ)sjpegd_0.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ 586@@ -1628,7 +1628,7 @@ $(GLOBJ)sjpegd_0.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\
584 587
585 588
586 $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) 589 $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
@@ -589,7 +592,7 @@ index 3ad7db3..87b4f01 100644
589 592
590 # sddparam is used by the filter operator. 593 # sddparam is used by the filter operator.
591 # It is not included automatically in sdctd. 594 # It is not included automatically in sdctd.
592@@ -1643,7 +1643,7 @@ $(GLD)lzwe.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwe_) 595@@ -1651,7 +1651,7 @@ $(GLD)lzwe.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwe_)
593 596
594 # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory. 597 # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory.
595 $(GLD)slzwe.dev : $(GLD)lzwe.dev 598 $(GLD)slzwe.dev : $(GLD)lzwe.dev
@@ -598,7 +601,7 @@ index 3ad7db3..87b4f01 100644
598 601
599 $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\ 602 $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\
600 $(slzwx_h) $(strimpl_h) $(MAKEDIRS) 603 $(slzwx_h) $(strimpl_h) $(MAKEDIRS)
601@@ -1659,7 +1659,7 @@ $(GLD)lzwd.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwd_) 604@@ -1667,7 +1667,7 @@ $(GLD)lzwd.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwd_)
602 605
603 # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory. 606 # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory.
604 $(GLD)slzwd.dev : $(GLD)lzwd.dev 607 $(GLD)slzwd.dev : $(GLD)lzwd.dev
@@ -607,7 +610,7 @@ index 3ad7db3..87b4f01 100644
607 610
608 $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\ 611 $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\
609 $(slzwx_h) $(strimpl_h) $(MAKEDIRS) 612 $(slzwx_h) $(strimpl_h) $(MAKEDIRS)
610@@ -1709,7 +1709,7 @@ $(GLOBJ)saes.$(OBJ) : $(GLSRC)saes.c $(AK) $(memory__h)\ 613@@ -1717,7 +1717,7 @@ $(GLOBJ)saes.$(OBJ) : $(GLSRC)saes.c $(AK) $(memory__h)\
611 # ---------------- JBIG2 compression filter ---------------- # 614 # ---------------- JBIG2 compression filter ---------------- #
612 615
613 $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev 616 $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev
@@ -616,7 +619,7 @@ index 3ad7db3..87b4f01 100644
616 619
617 # jbig2dec version 620 # jbig2dec version
618 sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ) 621 sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ)
619@@ -1745,7 +1745,7 @@ $(GLOBJ)sjbig2_luratech.$(OBJ) : $(GLSRC)sjbig2_luratech.c $(AK) \ 622@@ -1753,7 +1753,7 @@ $(GLOBJ)sjbig2_luratech.$(OBJ) : $(GLSRC)sjbig2_luratech.c $(AK) \
620 # ---------------- JPEG 2000 compression filter ---------------- # 623 # ---------------- JPEG 2000 compression filter ---------------- #
621 624
622 $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev 625 $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev
@@ -625,7 +628,7 @@ index 3ad7db3..87b4f01 100644
625 628
626 $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \ 629 $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
627 $(memory__h) $(gsmalloc_h) \ 630 $(memory__h) $(gsmalloc_h) \
628@@ -1874,7 +1874,7 @@ $(GLOBJ)szlibc_0.$(OBJ) : $(GLSRC)szlibc.c $(AK) $(std_h)\ 631@@ -1882,7 +1882,7 @@ $(GLOBJ)szlibc_0.$(OBJ) : $(GLSRC)szlibc.c $(AK) $(std_h)\
629 $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c 632 $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c
630 633
631 $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) 634 $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
@@ -634,7 +637,7 @@ index 3ad7db3..87b4f01 100644
634 637
635 szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ) 638 szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ)
636 $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_) 639 $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_)
637@@ -1890,7 +1890,7 @@ $(GLOBJ)szlibe_0.$(OBJ) : $(GLSRC)szlibe.c $(AK) $(std_h)\ 640@@ -1898,7 +1898,7 @@ $(GLOBJ)szlibe_0.$(OBJ) : $(GLSRC)szlibe.c $(AK) $(std_h)\
638 $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c 641 $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c
639 642
640 $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) 643 $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
@@ -643,7 +646,7 @@ index 3ad7db3..87b4f01 100644
643 646
644 szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ) 647 szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ)
645 $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_) 648 $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_)
646@@ -1906,7 +1906,7 @@ $(GLOBJ)szlibd_0.$(OBJ) : $(GLSRC)szlibd.c $(AK) $(std_h) $(memory__h)\ 649@@ -1914,7 +1914,7 @@ $(GLOBJ)szlibd_0.$(OBJ) : $(GLSRC)szlibd.c $(AK) $(std_h) $(memory__h)\
647 $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c 650 $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c
648 651
649 $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) 652 $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
@@ -652,7 +655,7 @@ index 3ad7db3..87b4f01 100644
652 655
653 # ---------------- Page devices ---------------- # 656 # ---------------- Page devices ---------------- #
654 # We include this here, rather than in devs.mak, because it is more like 657 # We include this here, rather than in devs.mak, because it is more like
655@@ -2796,7 +2796,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\ 658@@ -2804,7 +2804,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\
656 $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c 659 $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c
657 660
658 $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(gp_h) 661 $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(gp_h)
@@ -661,16 +664,16 @@ index 3ad7db3..87b4f01 100644
661 664
662 665
663 $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ 666 $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
664@@ -2808,7 +2808,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ 667@@ -2817,7 +2817,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
665 $(GLLCMS2CC) $(GLO_)gsicc_lcms2_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c
666 668
667 $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(gp_h) 669 $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(gp_h) \
670 $(gxsync_h)
668- $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) 671- $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ)
669+ $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true 672+ $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true
670 673
671 # Note that gsicc_create requires compile with lcms to obtain icc34.h 674 # Note that gsicc_create requires compile with lcms to obtain icc34.h
672 # header file that is used for creating ICC structures from PS objects. 675 # header file that is used for creating ICC structures from PS objects.
673@@ -2828,7 +2828,7 @@ $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\ 676@@ -2837,7 +2837,7 @@ $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\
674 $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c 677 $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c
675 678
676 $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS) 679 $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS)
@@ -679,7 +682,7 @@ index 3ad7db3..87b4f01 100644
679 682
680 683
681 #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */ 684 #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */
682@@ -3132,7 +3132,7 @@ $(GLGEN)gsromfs1_1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS) $(MAKEDIRS) 685@@ -3141,7 +3141,7 @@ $(GLGEN)gsromfs1_1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS) $(MAKEDIRS)
683 $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS) 686 $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS)
684 687
685 $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS) 688 $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS)
@@ -688,7 +691,7 @@ index 3ad7db3..87b4f01 100644
688 691
689 # the following module is only included if the romfs.dev FEATURE is enabled 692 # the following module is only included if the romfs.dev FEATURE is enabled
690 $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ 693 $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \
691@@ -3148,7 +3148,7 @@ $(GLOBJ)gsiorom_0.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ 694@@ -3157,7 +3157,7 @@ $(GLOBJ)gsiorom_0.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \
692 $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c 695 $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c
693 696
694 $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) 697 $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
@@ -711,7 +714,7 @@ index ca1b7cc..ad6446d 100644
711 # external link .dev 714 # external link .dev
712 $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE) 715 $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE)
713diff --git a/base/macos-mcp.mak b/base/macos-mcp.mak 716diff --git a/base/macos-mcp.mak b/base/macos-mcp.mak
714index 4ded7f3..3599ed9 100644 717index 38a2937..2ab7cae 100644
715--- a/base/macos-mcp.mak 718--- a/base/macos-mcp.mak
716+++ b/base/macos-mcp.mak 719+++ b/base/macos-mcp.mak
717@@ -383,11 +383,11 @@ CWPROJ_XML=./ghostscript.mcp.xml 720@@ -383,11 +383,11 @@ CWPROJ_XML=./ghostscript.mcp.xml
@@ -731,7 +734,7 @@ index 4ded7f3..3599ed9 100644
731 734
732 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) 735 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
733diff --git a/base/openjpeg.mak b/base/openjpeg.mak 736diff --git a/base/openjpeg.mak b/base/openjpeg.mak
734index 32be240..4a6b429 100644 737index b194709..dac7901 100644
735--- a/base/openjpeg.mak 738--- a/base/openjpeg.mak
736+++ b/base/openjpeg.mak 739+++ b/base/openjpeg.mak
737@@ -99,7 +99,7 @@ open_jpeg_HDRS = \ 740@@ -99,7 +99,7 @@ open_jpeg_HDRS = \
@@ -744,7 +747,7 @@ index 32be240..4a6b429 100644
744 # external link .dev 747 # external link .dev
745 $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) 748 $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE)
746diff --git a/base/openvms.mak b/base/openvms.mak 749diff --git a/base/openvms.mak b/base/openvms.mak
747index e5ae40b..286ee84 100644 750index 1ea06fe..84378a4 100644
748--- a/base/openvms.mak 751--- a/base/openvms.mak
749+++ b/base/openvms.mak 752+++ b/base/openvms.mak
750@@ -365,7 +365,7 @@ SH= 753@@ -365,7 +365,7 @@ SH=
@@ -757,7 +760,7 @@ index e5ae40b..286ee84 100644
757 # Define the command for deleting (a) file(s) (including wild cards) 760 # Define the command for deleting (a) file(s) (including wild cards)
758 761
759diff --git a/base/png.mak b/base/png.mak 762diff --git a/base/png.mak b/base/png.mak
760index f01c426..8a89884 100644 763index 1725ddb..0d54b80 100644
761--- a/base/png.mak 764--- a/base/png.mak
762+++ b/base/png.mak 765+++ b/base/png.mak
763@@ -79,7 +79,7 @@ png.config-clean : 766@@ -79,7 +79,7 @@ png.config-clean :
@@ -772,7 +775,7 @@ index f01c426..8a89884 100644
772@@ -134,7 +134,7 @@ $(PNGOBJ)pngget.$(OBJ) : $(PNGSRC)pngget.c $(PDEP) 775@@ -134,7 +134,7 @@ $(PNGOBJ)pngget.$(OBJ) : $(PNGSRC)pngget.c $(PDEP)
773 776
774 # Define the version of libpng.dev that we are actually using. 777 # Define the version of libpng.dev that we are actually using.
775 $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev 778 $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(MAKEDIRS)
776- $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev 779- $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev
777+ $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev || true 780+ $(CP_) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev $(PNGGEN)libpng.dev || true
778 781
@@ -841,7 +844,7 @@ index 6aa3599..70a61f8 100644
841 RMN_=rm -f 844 RMN_=rm -f
842 845
843diff --git a/base/zlib.mak b/base/zlib.mak 846diff --git a/base/zlib.mak b/base/zlib.mak
844index 6c50605..7fb8c9b 100644 847index 78d398a..3d48145 100644
845--- a/base/zlib.mak 848--- a/base/zlib.mak
846+++ b/base/zlib.mak 849+++ b/base/zlib.mak
847@@ -83,7 +83,7 @@ $(ZOBJ)zutil.$(OBJ) : $(ZSRC)zutil.c $(ZDEP) 850@@ -83,7 +83,7 @@ $(ZOBJ)zutil.$(OBJ) : $(ZSRC)zutil.c $(ZDEP)
@@ -865,17 +868,17 @@ index 6c50605..7fb8c9b 100644
865@@ -127,7 +127,7 @@ $(ZOBJ)crc32.$(OBJ) : $(ZSRC)crc32.c $(ZDEP) 868@@ -127,7 +127,7 @@ $(ZOBJ)crc32.$(OBJ) : $(ZSRC)crc32.c $(ZDEP)
866 # Decoding (decompression) code. 869 # Decoding (decompression) code.
867 870
868 $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev 871 $(ZGEN)zlibd.dev : $(TOP_MAKEFILES) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(MAKEDIRS)
869- $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev 872- $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev
870+ $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev || true 873+ $(CP_) $(ZGEN)zlibd_$(SHARE_ZLIB).dev $(ZGEN)zlibd.dev || true
871 874
872 $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) 875 $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
873 $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME) 876 $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME)
874diff --git a/devices/devs.mak b/devices/devs.mak 877diff --git a/devices/devs.mak b/devices/devs.mak
875index bc22594..4bd0a11 100644 878index 0a668d4..a19082e 100644
876--- a/devices/devs.mak 879--- a/devices/devs.mak
877+++ b/devices/devs.mak 880+++ b/devices/devs.mak
878@@ -1555,7 +1555,7 @@ libpng_dev=$(PNGGENDIR)$(D)libpng.dev 881@@ -1547,7 +1547,7 @@ libpng_dev=$(PNGGENDIR)$(D)libpng.dev
879 png_i_=-include $(PNGGENDIR)$(D)libpng 882 png_i_=-include $(PNGGENDIR)$(D)libpng
880 883
881 $(DEVOBJ)gdevpng.$(OBJ) : $(DEVSRC)gdevpng.c\ 884 $(DEVOBJ)gdevpng.$(OBJ) : $(DEVSRC)gdevpng.c\
@@ -885,7 +888,7 @@ index bc22594..4bd0a11 100644
885 888
886 $(DD)pngmono.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV) 889 $(DD)pngmono.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV)
887diff --git a/psi/int.mak b/psi/int.mak 890diff --git a/psi/int.mak b/psi/int.mak
888index 62cba0e..a1e963a 100644 891index 7d36e66..71b88f5 100644
889--- a/psi/int.mak 892--- a/psi/int.mak
890+++ b/psi/int.mak 893+++ b/psi/int.mak
891@@ -274,7 +274,7 @@ $(PSOBJ)iconfig.$(OBJ) : $(gconfig_h) $(PSSRC)iconf.c $(stdio__h)\ 894@@ -274,7 +274,7 @@ $(PSOBJ)iconfig.$(OBJ) : $(gconfig_h) $(PSSRC)iconf.c $(stdio__h)\
@@ -925,5 +928,5 @@ index 62cba0e..a1e963a 100644
925 fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ) 928 fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ)
926 929
927-- 930--
9281.8.1.2 9311.9.1
929 932
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.14.bb b/meta/recipes-extended/ghostscript/ghostscript_9.15.bb
index 130dc1c..ee5483c 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.15.bb
@@ -31,8 +31,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
31 file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ 31 file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
32 " 32 "
33 33
34SRC_URI[md5sum] = "586494befb443363338c1b6379f13973" 34SRC_URI[md5sum] = "5a78ab0990ff6ec3a103576bc8777c46"
35SRC_URI[sha256sum] = "ab2ba5ce11c8db396c9acf774a497182d7686d04670976cc3e690ada7db9f0d4" 35SRC_URI[sha256sum] = "27f11e4fe5b89857ae745687281d1e4daf9681edc858a3f7e8e77ef09609777a"
36 36
37EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \ 37EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
38 --with-fontpath=${datadir}/fonts \ 38 --with-fontpath=${datadir}/fonts \