diff options
| author |   Timo Gurr <tgurr@gentoo.org> | 2008-02-15 16:05:55 +0000 |
|---|---|---|
| committer | Timo Gurr <tgurr@gentoo.org> | 2008-02-15 16:05:55 +0000 |
| commit | f2aad4bb571f47ba94e339653676c794e8f2918a (patch) | |
| tree | 09ede58f6957f0d97289897ba52b103e66168b0b /app-text/ghostscript-gpl | |
| parent | Remove unfunctional ebuilds doing nothing but installing documentation wrt #1... (diff) | |
| download | gentoo-2-f2aad4bb571f47ba94e339653676c794e8f2918a.tar.gz gentoo-2-f2aad4bb571f47ba94e339653676c794e8f2918a.tar.bz2 gentoo-2-f2aad4bb571f47ba94e339653676c794e8f2918a.zip | |
Clean out old ghostscript-gpl patches, everything has been moved into a patchtarball.
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-text/ghostscript-gpl')
23 files changed, 24 insertions, 2377 deletions
diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog index 36135f84ee3b..ca0a05cb5fab 100644 --- a/app-text/ghostscript-gpl/ChangeLog +++ b/app-text/ghostscript-gpl/ChangeLog @@ -1,6 +1,29 @@ # ChangeLog for app-text/ghostscript-gpl # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.41 2008/02/15 15:03:52 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.42 2008/02/15 16:05:55 tgurr Exp $ + + 15 Feb 2008; Timo Gurr <tgurr@gentoo.org> + -files/ghostscript-esp-8.15.2-FAPIcidfmap.cjk, + -files/ghostscript-esp-8.15.2-cidfmap.cjk, + -files/ghostscript-afpl-8.54-big-cmap-post.patch, + -files/ghostscript-afpl-8.54-cups-destdir.diff, + -files/ghostscript-afpl-8.54-cups-lib.patch, + -files/ghostscript-afpl-8.54-destdir.diff, + -files/ghostscript-afpl-8.54-gtk2.patch, + -files/ghostscript-afpl-8.54-ps2epsi-afpl.diff, + -files/ghostscript-afpl-8.54-rinkj.patch, + -files/ghostscript-afpl-8.54-segfault.patch, + -files/ghostscript-afpl-8.57-cups-lib.patch, + -files/ghostscript-8.60-fPIC.patch, + -files/ghostscript-8.60-ijs-krgb.patch, + -files/ghostscript-8.60-include.patch, + -files/ghostscript-8.60-multilib.patch, + -files/ghostscript-8.60-noopt.patch, + -files/ghostscript-8.60-scripts.patch, -files/djvu-gs-gpl-8.60.patch, + -files/ghostscript-CVE-2007-2721.patch, -files/djvu-gs-gpl.patch, + -files/gdevcups.patch, -files/gdevhl12-hl1250.mak: + Clean out old ghostscript-gpl patches, everything has been moved into a + patch tarball. *ghostscript-gpl-8.61-r2 (15 Feb 2008) diff --git a/app-text/ghostscript-gpl/files/djvu-gs-gpl-8.60.patch b/app-text/ghostscript-gpl/files/djvu-gs-gpl-8.60.patch deleted file mode 100644 index ad7b89873ff7..000000000000 --- a/app-text/ghostscript-gpl/files/djvu-gs-gpl-8.60.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ur ghostscript-8.60-gpl.orig/gsdjvu ghostscript-8.60-gpl/gsdjvu ---- ghostscript-8.54-gpl.orig/gsdjvu 2006-12-14 19:14:43.000000000 +0100 -+++ ghostscript-8.54-gpl/gsdjvu 2006-12-14 19:23:16.000000000 +0100 -@@ -56,4 +56,4 @@ - # Step 2 -- execute ghostscript - - gsdir="$progdir" --GS_LIB="$gsdir/lib:$gsdir/fonts:$gsdir" exec "$gsdir/bin/gs" "$@" -+GS_LIB="$gsdir/lib:$gsdir/fonts:$gsdir" exec "/usr/bin/gs" "$@" -diff -ur ghostscript-8.60-gpl.orig/src/gdevdjvu.c ghostscript-8.60-gpl/src/gdevdjvu.c ---- ghostscript-8.60-gpl.orig/src/gdevdjvu.c 2007-05-14 06:01:45.000000000 +0200 -+++ ghostscript-8.60-gpl/src/gdevdjvu.c 2007-08-03 10:18:25.353066136 +0200 -@@ -155,8 +155,8 @@ - private void - lbassertfail(const char *file, int line) - { -- fprintf(STDERR,"Internal error at %s:%d\n", file, line); -- fclose(STDERR); -+ //fprintf(STDERR,"Internal error at %s:%d\n", file, line); -+ //fclose(STDERR); - abort(); - } - -@@ -4940,12 +4942,6 @@ - 0, cdev->width-1, 0, cdev->height-1, comment); - if (code < 0) return code; - } -- /* Print message */ -- if (! cdev->quiet) { -- fprintf(STDOUT, "Page %dx%d (%s )\n", -- cdev->width, cdev->height, comment); -- fflush(STDOUT); -- } - /* Terminate */ - runmap_free(fgmap); - #ifdef DEBUG -@@ -5342,12 +5338,6 @@ - if (code < 0) - return code; - } -- /* Print message */ -- if (! cdev->quiet) { -- fprintf(STDOUT,"Page %dx%d (%s )\n", -- cdev->width, cdev->height, comment); -- fflush(STDOUT); -- } - /* Terminate */ - runmap_free(fgmap); - #ifdef DEBUG diff --git a/app-text/ghostscript-gpl/files/djvu-gs-gpl.patch b/app-text/ghostscript-gpl/files/djvu-gs-gpl.patch deleted file mode 100644 index 590f65813543..000000000000 --- a/app-text/ghostscript-gpl/files/djvu-gs-gpl.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ur ghostscript-8.54-gpl.orig/gsdjvu ghostscript-8.54-gpl/gsdjvu ---- ghostscript-8.54-gpl.orig/gsdjvu 2006-12-14 19:14:43.000000000 +0100 -+++ ghostscript-8.54-gpl/gsdjvu 2006-12-14 19:23:16.000000000 +0100 -@@ -56,4 +56,4 @@ - # Step 2 -- execute ghostscript - - gsdir="$progdir" --GS_LIB="$gsdir/lib:$gsdir/fonts:$gsdir" exec "$gsdir/bin/gs" "$@" -+GS_LIB="$gsdir/lib:$gsdir/fonts:$gsdir" exec "/usr/bin/gs" "$@" -diff -ur ghostscript-8.54-gpl.orig/src/gdevdjvu.c ghostscript-8.54-gpl/src/gdevdjvu.c ---- ghostscript-8.54-gpl.orig/src/gdevdjvu.c 2006-12-14 19:14:17.000000000 +0100 -+++ ghostscript-8.54-gpl/src/gdevdjvu.c 2006-12-14 19:20:17.000000000 +0100 -@@ -133,7 +133,7 @@ - private void - lbassertfail(const char *file, int line) - { -- fprintf(stderr,"Internal error at %s:%d\n", file, line); -+ //printf("Internal error at %s:%d\n", file, line); - abort(); - } - -@@ -164,6 +164,8 @@ - #define p2mem_log2_align log2_obj_align_mod - #define p2mem_align obj_align_mod - -+gs_memory_t *gs_memory_t_default; -+#define gs_memory_default (*gs_memory_t_default) - /* Parent allocator */ - #define p2mem_parent_alloc(size) \ - (void *)gs_alloc_bytes_immovable(&gs_memory_default, size, "p2mem") -@@ -4920,12 +4922,6 @@ - 0, cdev->width-1, 0, cdev->height-1, comment); - if (code < 0) return code; - } -- /* Print message */ -- if (! cdev->quiet) { -- fprintf(stdout,"Page %dx%d (%s )\n", -- cdev->width, cdev->height, comment); -- fflush(stdout); -- } - /* Terminate */ - runmap_free(fgmap); - #ifdef DEBUG -@@ -5322,12 +5318,6 @@ - if (code < 0) - return code; - } -- /* Print message */ -- if (! cdev->quiet) { -- fprintf(stdout,"Page %dx%d (%s )\n", -- cdev->width, cdev->height, comment); -- fflush(stdout); -- } - /* Terminate */ - runmap_free(fgmap); - #ifdef DEBUG -@@ -5383,7 +5373,7 @@ - push(1); - glyph = gs_text_current_glyph(osenum); - if (glyph != gs_no_glyph) -- glyph_ref(glyph, op); -+ glyph_ref(imemory, glyph, op); - else - make_int(op, gs_text_current_char(osenum)); - return 0; -@@ -5498,7 +5488,7 @@ - /* Check argument types */ - check_op(5); - if ( (code = num_params(op, 4, xy)) < 0 || -- (code = obj_string_data(op - 4, &utf8, &utf8len)) < 0 ) -+ (code = obj_string_data(imemory, op - 4, &utf8, &utf8len)) < 0 ) - return code; - /* Check that current device is djvusep */ - dev = gs_currentdevice(igs); diff --git a/app-text/ghostscript-gpl/files/gdevcups.patch b/app-text/ghostscript-gpl/files/gdevcups.patch deleted file mode 100644 index 81f04d536785..000000000000 --- a/app-text/ghostscript-gpl/files/gdevcups.patch +++ /dev/null @@ -1,432 +0,0 @@ ---- aaa/ghostscript-8.53/pstoraster/gdevcups.c 2005-01-24 14:17:24.016026784 +0100 -+++ bbb/ghostscript-8.53/pstoraster/gdevcups.c 2005-01-24 14:16:53.037736200 +0100 -408c408 -< fprintf(stderr, "DEBUG2: cups_close(%p)\n", pdev); ---- -> dpf("DEBUG2: cups_close(%p)\n", pdev); -561c561 -< fprintf(stderr, "DEBUG2: cups_get_matrix(%p, %p)\n", pdev, pmat); ---- -> dpf("DEBUG2: cups_get_matrix(%p, %p)\n", pdev, pmat); -575,576c575,576 -< fprintf(stderr, "DEBUG: cups->header.Duplex = %d\n", cups->header.Duplex); -< fprintf(stderr, "DEBUG: cups->page = %d\n", cups->page); ---- -> dpf("DEBUG: cups->header.Duplex = %d\n", cups->header.Duplex); -> dpf("DEBUG: cups->page = %d\n", cups->page); -580,581c580,581 -< fprintf(stderr, "DEBUG: cupsPPD = %p\n", cupsPPD); -< fprintf(stderr, "DEBUG: cupsPPD->flip_duplex = %d\n", cupsPPD->flip_duplex); ---- -> dpf("DEBUG: cupsPPD = %p\n", cupsPPD); -> dpf("DEBUG: cupsPPD->flip_duplex = %d\n", cupsPPD->flip_duplex); -632c632 -< fprintf(stderr, "DEBUG: width = %d, height = %d\n", cups->width, ---- -> dpf("DEBUG: width = %d, height = %d\n", cups->width, -634c634 -< fprintf(stderr, "DEBUG: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n", ---- -> dpf("DEBUG: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n", -637c637 -< fprintf(stderr, "DEBUG: HWMargins = [ %.3f %.3f %.3f %.3f ]\n", ---- -> dpf("DEBUG: HWMargins = [ %.3f %.3f %.3f %.3f ]\n", -640c640 -< fprintf(stderr, "DEBUG: matrix = [ %.3f %.3f %.3f %.3f %.3f %.3f ]\n", ---- -> dpf("DEBUG: matrix = [ %.3f %.3f %.3f %.3f %.3f %.3f ]\n", -663c663 -< fprintf(stderr, "DEBUG2: cups_get_params(%p, %p)\n", pdev, plist); ---- -> dpf("DEBUG2: cups_get_params(%p, %p)\n", pdev, plist); -671c671 -< fputs("DEBUG2: before gdev_prn_get_params()\n", stderr); ---- -> dputs("DEBUG2: before gdev_prn_get_params()\n"); -678c678 -< fputs("DEBUG2: after gdev_prn_get_params()\n", stderr); ---- -> dputs("DEBUG2: after gdev_prn_get_params()\n"); -686c686 -< fputs("DEBUG2: Adding MediaClass\n", stderr); ---- -> dputs("DEBUG2: Adding MediaClass\n"); -694c694 -< fputs("DEBUG2: Adding AdvanceDistance\n", stderr); ---- -> dputs("DEBUG2: Adding AdvanceDistance\n"); -702c702 -< fputs("DEBUG2: Adding AdvanceDistance\n", stderr); ---- -> dputs("DEBUG2: Adding AdvanceDistance\n"); -710c710 -< fputs("DEBUG2: Adding Collate\n", stderr); ---- -> dputs("DEBUG2: Adding Collate\n"); -718c718 -< fputs("DEBUG2: Adding CutMedia\n", stderr); ---- -> dputs("DEBUG2: Adding CutMedia\n"); -726c726 -< fputs("DEBUG2: Adding InsertSheet\n", stderr); ---- -> dputs("DEBUG2: Adding InsertSheet\n"); -734c734 -< fputs("DEBUG2: Adding Jog\n", stderr); ---- -> dputs("DEBUG2: Adding Jog\n"); -742c742 -< fputs("DEBUG2: Adding LeadingEdge\n", stderr); ---- -> dputs("DEBUG2: Adding LeadingEdge\n"); -750c750 -< fputs("DEBUG2: Adding ManualFeed\n", stderr); ---- -> dputs("DEBUG2: Adding ManualFeed\n"); -758c758 -< fputs("DEBUG2: Adding MediaPosition\n", stderr); ---- -> dputs("DEBUG2: Adding MediaPosition\n"); -766c766 -< fputs("DEBUG2: Adding MirrorPrint\n", stderr); ---- -> dputs("DEBUG2: Adding MirrorPrint\n"); -774c774 -< fputs("DEBUG2: Adding NegativePrint\n", stderr); ---- -> dputs("DEBUG2: Adding NegativePrint\n"); -782c782 -< fputs("DEBUG2: Adding OutputFaceUp\n", stderr); ---- -> dputs("DEBUG2: Adding OutputFaceUp\n"); -790c790 -< fputs("DEBUG2: Adding Separations\n", stderr); ---- -> dputs("DEBUG2: Adding Separations\n"); -798c798 -< fputs("DEBUG2: Adding TraySwitch\n", stderr); ---- -> dputs("DEBUG2: Adding TraySwitch\n"); -806c806 -< fputs("DEBUG2: Adding Tumble\n", stderr); ---- -> dputs("DEBUG2: Adding Tumble\n"); -814c814 -< fputs("DEBUG2: Adding cupsWidth\n", stderr); ---- -> dputs("DEBUG2: Adding cupsWidth\n"); -822c822 -< fputs("DEBUG2: Adding cupsHeight\n", stderr); ---- -> dputs("DEBUG2: Adding cupsHeight\n"); -830c830 -< fputs("DEBUG2: Adding cupsMediaType\n", stderr); ---- -> dputs("DEBUG2: Adding cupsMediaType\n"); -838c838 -< fputs("DEBUG2: Adding cupsBitsPerColor\n", stderr); ---- -> dputs("DEBUG2: Adding cupsBitsPerColor\n"); -846c846 -< fputs("DEBUG2: Adding cupsBitsPerPixel\n", stderr); ---- -> dputs("DEBUG2: Adding cupsBitsPerPixel\n"); -854c854 -< fputs("DEBUG2: Adding cupsBytesPerLine\n", stderr); ---- -> dputs("DEBUG2: Adding cupsBytesPerLine\n"); -862c862 -< fputs("DEBUG2: Adding cupsColorOrder\n", stderr); ---- -> dputs("DEBUG2: Adding cupsColorOrder\n"); -870c870 -< fputs("DEBUG2: Adding cupsColorSpace\n", stderr); ---- -> dputs("DEBUG2: Adding cupsColorSpace\n"); -878c878 -< fputs("DEBUG2: Adding cupsCompression\n", stderr); ---- -> dputs("DEBUG2: Adding cupsCompression\n"); -886c886 -< fputs("DEBUG2: Adding cupsRowCount\n", stderr); ---- -> dputs("DEBUG2: Adding cupsRowCount\n"); -894c894 -< fputs("DEBUG2: Adding cupsRowFeed\n", stderr); ---- -> dputs("DEBUG2: Adding cupsRowFeed\n"); -902c902 -< fputs("DEBUG2: Adding cupsRowStep\n", stderr); ---- -> dputs("DEBUG2: Adding cupsRowStep\n"); -911c911 -< fputs("DEBUG2: Adding cupsNumColors\n", stderr); ---- -> dputs("DEBUG2: Adding cupsNumColors\n"); -919c919 -< fputs("DEBUG2: Adding cupsInteger\n", stderr); ---- -> dputs("DEBUG2: Adding cupsInteger\n"); -931c931 -< fputs("DEBUG2: Adding cupsReal\n", stderr); ---- -> dputs("DEBUG2: Adding cupsReal\n"); -943c943 -< fputs("DEBUG2: Adding cupsString\n", stderr); ---- -> dputs("DEBUG2: Adding cupsString\n"); -955c955 -< fputs("DEBUG2: Adding cupsMarkerType\n", stderr); ---- -> dputs("DEBUG2: Adding cupsMarkerType\n"); -963c963 -< fputs("DEBUG2: Adding cupsRenderingIntent\n", stderr); ---- -> dputs("DEBUG2: Adding cupsRenderingIntent\n"); -972c972 -< fputs("DEBUG2: Leaving cups_get_params()\n", stderr); ---- -> dputs("DEBUG2: Leaving cups_get_params()\n"); -995c995 -< fprintf(stderr, "DEBUG2: cups_get_space_params(%p, %p)\n", pdev, space_params); ---- -> dpf("DEBUG2: cups_get_space_params(%p, %p)\n", pdev, space_params); -1023c1023 -< fprintf(stderr, "DEBUG: cache_size = %.0f\n", cache_size); ---- -> dpf("DEBUG: cache_size = %.0f\n", cache_size); -1071c1071 -< fprintf(stderr, "DEBUG2: cups_map_cmyk(%p, %d, %d, %d, %d, %p)\n", ---- -> dpf("DEBUG2: cups_map_cmyk(%p, %d, %d, %d, %d, %p)\n", -1434c1434 -< fprintf(stderr, "DEBUG2: \\=== COLOR %d\n", out[0]); ---- -> dpf("DEBUG2: \\=== COLOR %d\n", out[0]); -1440c1440 -< fprintf(stderr, "DEBUG2: \\=== COLOR %d, %d, %d\n", ---- -> dpf("DEBUG2: \\=== COLOR %d, %d, %d\n", -1447c1447 -< fprintf(stderr, "DEBUG2: \\=== COLOR %d, %d, %d, %d\n", ---- -> dpf("DEBUG2: \\=== COLOR %d, %d, %d, %d\n", -1465c1465 -< fprintf(stderr, "DEBUG2: cups_map_gray(%p, %d, %p)\n", ---- -> dpf("DEBUG2: cups_map_gray(%p, %d, %p)\n", -1496c1496 -< fprintf(stderr, "DEBUG2: cups_map_rgb(%p, %p, %d, %d, %d, %p)\n", ---- -> dpf("DEBUG2: cups_map_rgb(%p, %p, %d, %d, %d, %p)\n", -1586c1586 -< fprintf(stderr, "DEBUG2: cups_map_cmyk_color(%p, %d, %d, %d, %d)\n", pdev, ---- -> dpf("DEBUG2: cups_map_cmyk_color(%p, %d, %d, %d, %d)\n", pdev, -1701c1701 -< fprintf(stderr, "DEBUG2: CMYK (%d,%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n", ---- -> dpf("DEBUG2: CMYK (%d,%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n", -1731c1731 -< fprintf(stderr, "DEBUG2: cups_map_color_rgb(%p, %d, %p)\n", pdev, ---- -> dpf("DEBUG2: cups_map_color_rgb(%p, %d, %p)\n", pdev, -1743c1743 -< fprintf(stderr, "DEBUG2: COLOR %08x = ", (unsigned)color); ---- -> dpf("DEBUG2: COLOR %08x = ", (unsigned)color); -1921c1921 -< fprintf(stderr, "%d,%d,%d\n", prgb[0], prgb[1], prgb[2]); ---- -> dpf("%d,%d,%d\n", prgb[0], prgb[1], prgb[2]); -1953c1953 -< fprintf(stderr, "DEBUG2: cups_map_rgb_color(%p, %d, %d, %d)\n", pdev, r, g, b); ---- -> dpf("DEBUG2: cups_map_rgb_color(%p, %d, %d, %d)\n", pdev, r, g, b); -2162c2162 -< fprintf(stderr, "DEBUG2: CMY (%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n", ---- -> dpf("DEBUG2: CMY (%d,%d,%d) -> CMYK %08x (%d,%d,%d,%d)\n", -2406c2406 -< fprintf(stderr, "DEBUG2: RGB %d,%d,%d = %08x\n", r, g, b, (unsigned)i); ---- -> dpf("DEBUG2: RGB %d,%d,%d = %08x\n", r, g, b, (unsigned)i); -2425c2425 -< fprintf(stderr, "DEBUG2: cups_open(%p)\n", pdev); ---- -> dpf("DEBUG2: cups_open(%p)\n", pdev); -2432c2432 -< fputs("INFO: Processing page 1...\n", stderr); ---- -> dpf("INFO: Processing page 1...\n"); -2468c2468 -< fprintf(stderr, "DEBUG2: cups_print_pages(%p, %p, %d)\n", pdev, fp, ---- -> dpf("DEBUG2: cups_print_pages(%p, %p, %d)\n", pdev, fp, -2507c2507 -< fprintf(stderr, "DEBUG2: cupsBitsPerPixel = %d, cupsWidth = %d, cupsBytesPerLine = %d, srcbytes = %d\n", ---- -> dpf("DEBUG2: cupsBitsPerPixel = %d, cupsWidth = %d, cupsBytesPerLine = %d, srcbytes = %d\n", -2512c2512 -< src = (unsigned char *)gs_malloc(srcbytes, 1, "cups_print_pages"); ---- -> src = (unsigned char *)gs_malloc(pdev->memory, srcbytes, 1, "cups_print_pages"); -2521c2521 -< dst = (unsigned char *)gs_malloc(cups->header.cupsBytesPerLine, 2, ---- -> dst = (unsigned char *)gs_malloc(pdev->memory, cups->header.cupsBytesPerLine, 2, -2537c2537 -< gs_exit(0); ---- -> gs_exit(pdev->memory, 0); -2555c2555 -< fprintf(stderr, "DEBUG2: cupsWidth = %d, cupsHeight = %d, cupsBytesPerLine = %d\n", ---- -> dpf("DEBUG2: cupsWidth = %d, cupsHeight = %d, cupsBytesPerLine = %d\n", -2585,2586c2585,2586 -< gs_free((char *)src, srcbytes, 1, "cups_print_pages"); -< gs_free((char *)dst, cups->header.cupsBytesPerLine, 1, "cups_print_pages"); ---- -> gs_free(pdev->memory, (char *)src, srcbytes, 1, "cups_print_pages"); -> gs_free(pdev->memory, (char *)dst, cups->header.cupsBytesPerLine, 1, "cups_print_pages"); -2589c2589 -< fprintf(stderr, "INFO: Processing page %d...\n", cups->page); ---- -> dpf("INFO: Processing page %d...\n", cups->page); -2623c2623 -< fprintf(stderr, "DEBUG2: cups_put_params(%p, %p)\n", pdev, plist); ---- -> dpf("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist); -2651c2651 -< fprintf(stderr, "DEBUG: Setting %s to %d...\n", sname, intval); \ ---- -> dpf("DEBUG: Setting %s to %d...\n", sname, intval); \ -2790c2790 -< fprintf(stderr, "DEBUG: Updating PageSize to [%.0f %.0f]...\n", ---- -> dpf("DEBUG: Updating PageSize to [%.0f %.0f]...\n", -2816c2816 -< fprintf(stderr, "DEBUG: size = %s\n", size->name); ---- -> dpf("DEBUG: size = %s\n", size->name); -2845c2845 -< fprintf(stderr, "DEBUG: landscape size = %s\n", size->name); ---- -> dpf("DEBUG: landscape size = %s\n", size->name); -2862c2862 -< fputs("DEBUG: size = Custom\n", stderr); ---- -> dputs("DEBUG: size = Custom\n"); -2869c2869 -< fprintf(stderr, "DEBUG: margins[] = [ %f %f %f %f ]\n", ---- -> dpf("DEBUG: margins[] = [ %f %f %f %f ]\n", -2934c2934 -< fprintf(stderr, "DEBUG: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n", ---- -> dpf("DEBUG: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n", -2948c2948 -< fprintf(stderr, "DEBUG: Setting initial media size, [%.0f %.0f] = %dx%d pixels...\n", ---- -> dpf("DEBUG: Setting initial media size, [%.0f %.0f] = %dx%d pixels...\n", -2957,2958c2957,2958 -< fprintf(stderr, "DEBUG2: ppd = %p\n", cupsPPD); -< fprintf(stderr, "DEBUG2: PageSize = [ %.3f %.3f ]\n", ---- -> dpf("DEBUG2: ppd = %p\n", cupsPPD); -> dpf("DEBUG2: PageSize = [ %.3f %.3f ]\n", -2960c2960 -< fprintf(stderr, "DEBUG2: margins = [ %.3f %.3f %.3f %.3f ]\n", ---- -> dpf("DEBUG2: margins = [ %.3f %.3f %.3f %.3f ]\n", -2962c2962 -< fprintf(stderr, "DEBUG2: HWResolution = [ %.3f %.3f ]\n", ---- -> dpf("DEBUG2: HWResolution = [ %.3f %.3f ]\n", -2964c2964 -< fprintf(stderr, "DEBUG2: width = %d, height = %d\n", ---- -> dpf("DEBUG2: width = %d, height = %d\n", -2966c2966 -< fprintf(stderr, "DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n", ---- -> dpf("DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n", -2992c2992 -< fprintf(stderr, "DEBUG2: cups_set_color_info(%p)\n", pdev); ---- -> dpf("DEBUG2: cups_set_color_info(%p)\n", pdev); -3216c3216 -< fprintf(stderr, "DEBUG2: cupsEncodeLUT[%d] = %d\n", i, cupsEncodeLUT[i]); ---- -> dpf("DEBUG2: cupsEncodeLUT[%d] = %d\n", i, cupsEncodeLUT[i]); -3223c3223 -< fprintf(stderr, "DEBUG: num_components = %d, depth = %d\n", ---- -> dpf("DEBUG: num_components = %d, depth = %d\n", -3225c3225 -< fprintf(stderr, "DEBUG: cupsColorSpace = %d, cupsColorOrder = %d\n", ---- -> dpf("DEBUG: cupsColorSpace = %d, cupsColorOrder = %d\n", -3227c3227 -< fprintf(stderr, "DEBUG: cupsBitsPerPixel = %d, cupsBitsPerColor = %d\n", ---- -> dpf("DEBUG: cupsBitsPerPixel = %d, cupsBitsPerColor = %d\n", -3229c3229 -< fprintf(stderr, "DEBUG: max_gray = %d, dither_grays = %d\n", ---- -> dpf("DEBUG: max_gray = %d, dither_grays = %d\n", -3231c3231 -< fprintf(stderr, "DEBUG: max_color = %d, dither_colors = %d\n", ---- -> dpf("DEBUG: max_color = %d, dither_colors = %d\n", -3246c3246 -< fprintf(stderr, "DEBUG: Using user-defined profile \"%s\"...\n", cupsProfile); ---- -> dpf("DEBUG: Using user-defined profile \"%s\"...\n", cupsProfile); -3252c3252 -< fputs("DEBUG: User-defined profile does not contain 11 integers!\n", stderr); ---- -> dputs("DEBUG: User-defined profile does not contain 11 integers!\n"); -3301c3301 -< fputs("DEBUG: Using color profile in PPD file!\n", stderr); ---- -> dputs("DEBUG: Using color profile in PPD file!\n"); -3322c3322 -< fprintf(stderr, "DEBUG2: cupsMatrix[%d][%d][%d] = %d\n", ---- -> dpf("DEBUG2: cupsMatrix[%d][%d][%d] = %d\n", -3336c3336 -< fprintf(stderr, "DEBUG2: cupsDensity[%d] = %d\n", k, cupsDensity[k]); ---- -> dpf("DEBUG2: cupsDensity[%d] = %d\n", k, cupsDensity[k]); -3355c3355 -< fprintf(stderr, "INFO: Processing page %d...\n", cups->page); ---- -> dpf("INFO: Processing page %d...\n", cups->page); -3388c3388 -< fprintf(stderr, "DEBUG: cups_print_chunked - flip = %d, height = %d\n", ---- -> dpf("DEBUG: cups_print_chunked - flip = %d, height = %d\n", -3404,3405c3404,3405 -< fprintf(stderr, "ERROR: Unable to get scanline %d!\n", y); -< gs_exit(1); ---- -> dpf("ERROR: Unable to get scanline %d!\n", y); -> gs_exit(pdev->memory, 1); -3541c3541 -< fprintf(stderr, "DEBUG: cups_print_banded - flip = %d, height = %d\n", ---- -> dpf("DEBUG: cups_print_banded - flip = %d, height = %d\n", -3559,3560c3559,3560 -< fprintf(stderr, "ERROR: Unable to get scanline %d!\n", y); -< gs_exit(1); ---- -> dpf("ERROR: Unable to get scanline %d!\n", y); -> gs_exit(pdev->memory, 1); -4144,4145c4144,4145 -< fprintf(stderr, "ERROR: Unable to get scanline %d!\n", y); -< gs_exit(1); ---- -> dpf("ERROR: Unable to get scanline %d!\n", y); -> gs_exit(pdev->memory, 1); diff --git a/app-text/ghostscript-gpl/files/gdevhl12-hl1250.mak b/app-text/ghostscript-gpl/files/gdevhl12-hl1250.mak deleted file mode 100644 index 8e1421ad1f03..000000000000 --- a/app-text/ghostscript-gpl/files/gdevhl12-hl1250.mak +++ /dev/null @@ -1,16 +0,0 @@ -### -------------------- The Brother HL-1250 printer -------------------- ### -### This printer is ljet4-compatible, plus support for source tray ### -### selection and special 1200x600 dpi mode. ### - -hl1250_=$(GLOBJ)gdevhl12.$(OBJ) $(HPDLJM) -$(DD)hl1250.dev : $(hl1250_) $(DD)page.dev - $(SETPDEV) $(DD)hl1250 $(hl1250_) - -$(DD)hl1240.dev : $(hl1250_) $(DD)page.dev - $(SETPDEV) $(DD)hl1240 $(hl1250_) - -# Author: Marek Michalkiewicz <marekm@linux.org.pl> -# Printer: Brother HL-1250 (may work with some other models too) -$(GLOBJ)gdevhl12.$(OBJ) : $(GLSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) - $(GLCC) $(GLO_)gdevhl12.$(OBJ) $(C_) $(GLSRC)gdevhl12.c - diff --git a/app-text/ghostscript-gpl/files/ghostscript-8.60-fPIC.patch b/app-text/ghostscript-gpl/files/ghostscript-8.60-fPIC.patch deleted file mode 100644 index 9b4deb23aa22..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-8.60-fPIC.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ghostscript-8.60-r8112/src/lib.mak.fPIC 2007-07-10 17:03:11.000000000 +0100 -+++ ghostscript-8.60-r8112/src/lib.mak 2007-07-10 17:05:56.000000000 +0100 -@@ -874,7 +874,7 @@ - $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\ - $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\ - $(gstypes_h) -- $(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c -+ $(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c - - # Future replacement for gsparams.c - $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\ -@@ -1077,7 +1077,7 @@ - - # Provide a mapping between StandardEncoding and ISOLatin1Encoding. - $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h) -- $(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c -+ $(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c - - ###### Create a pseudo-"feature" for the entire graphics library. - ---- ghostscript-8.60-r8112/src/devs.mak.fPIC 2007-07-10 17:05:00.000000000 +0100 -+++ ghostscript-8.60-r8112/src/devs.mak 2007-07-10 17:05:07.000000000 +0100 -@@ -464,7 +464,7 @@ - $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c - - $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h) -- $(GLCC) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c -+ $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c - - $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\ - $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h) diff --git a/app-text/ghostscript-gpl/files/ghostscript-8.60-ijs-krgb.patch b/app-text/ghostscript-gpl/files/ghostscript-8.60-ijs-krgb.patch deleted file mode 100644 index 2f1e5f19b37f..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-8.60-ijs-krgb.patch +++ /dev/null @@ -1,729 +0,0 @@ -diff -uraN gs-orig/src/gdevijs.c gs-krgb/src/gdevijs.c ---- gs-orig/src/gdevijs.c 2007-04-24 13:00:22.000000000 +0100 -+++ gs-krgb/src/gdevijs.c 2007-04-27 14:44:05.000000000 +0100 -@@ -23,15 +23,50 @@ - * which is a security risk, since any program can be run. - * You should use -dSAFER which sets .LockSafetyParams to true - * before opening this device. -+ * -+ * 11/26/03 David Suffield (gdevijs-krgb-1.0.patch) -+ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP -+ * -+ * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher. -+ * 2. Added krgb support. -+ * -+ * 02/21/05 David Suffield (gdevijs-krgb-1.1.patch) -+ * 1. Fixed segfault issue with 1-bit color space. -+ * 2. Fixed z-order issue with colored text on black rectangle. -+ * -+ * 02/22/06 David Suffield (gdevijs-krgb-1.2.patch) -+ * 1. Fixed krgb buffer overflow issue with out-of-band data in fill_rectangle and copy_mono. -+ * This buffer overflow condition occurred with fullbleed print jobs that had k-band images. -+ * 2. Added Dan Coby (artifex) fix for gsijs_read_string_malloc gs_free *str memory leak. -+ * -+ * 06/02/06 David Suffield (gdevijs-krgb-1.3.patch) -+ * 1. Revisited the krgb buffer overflow issue with out-of-band data in fill_rectangle and -+ * copy_mono. Changed the fill_rectangle and copy_mono to an inner loop buffer check -+ * instead of a outer loop x/y extent check. -+ * 2. As requested by Ralph Giles, added K 1-bit and 8-bit support for krgb, but only 1-bit is -+ * implemented for now. -+ * -+ * KRGB definition: -+ * 1. K=1-bit or 8-bit black plane, RGB=24 bit color raster. -+ * 2. K-plane will only contain objects that are black text and black line drawings. -+ * 3. RGB raster will not contain K-plane objects. -+ * 4. K resolution and RGB resolution will be equal. -+ * 5. K-plane will be byte aligned. -+ * 6. K-plane 1-bit definition; 1=black, 0=nothing (KRGB). -+ * 7. K-plane 8-bit definition; 255=black, 0=nothing (KxRGB). -+ * - */ - - #include "unistd_.h" /* for dup() */ - #include <stdlib.h> -+#include <fcntl.h> - #include "gdevprn.h" - #include "gp.h" - #include "ijs.h" - #include "ijs_client.h" - -+//#define KRGB_DEBUG -+ - /* This should go into gdevprn.h, or, better yet, gdevprn should - acquire an API for changing resolution. */ - int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev, -@@ -49,6 +84,14 @@ - private dev_proc_put_params(gsijs_put_params); - private dev_proc_finish_copydevice(gsijs_finish_copydevice); - -+/* Following definitions are for krgb support. */ -+private dev_proc_create_buf_device(gsijs_create_buf_device); -+private dev_proc_fill_rectangle(gsijs_fill_rectangle); -+private dev_proc_copy_mono(gsijs_copy_mono); -+private dev_proc_fill_mask(gsijs_fill_mask); -+private dev_proc_fill_path(gsijs_fill_path); -+private dev_proc_stroke_path(gsijs_stroke_path); -+ - private const gx_device_procs gsijs_procs = { - gsijs_open, - NULL, /* get_initial_matrix */ -@@ -123,6 +166,15 @@ - - IjsClientCtx *ctx; - int ijs_version; -+ -+ /* Additional parameters for krgb support. */ -+ int krgb_mode; /* 0=false, 1=true */ -+ int k_bits; /* number of bits in k plane, 1 or 8 */ -+ int k_path; /* k plane path, 0=false, 1=true */ -+ int k_width; /* k plane width in pixels */ -+ int k_band_size; /* k plane buffer size in bytes, byte aligned */ -+ unsigned char *k_band; /* k plane buffer */ -+ gx_device_procs prn_procs; /* banding playback procedures */ - }; - - #define DEFAULT_DPI 74 /* See gsijs_set_resolution() below. */ -@@ -150,7 +202,13 @@ - FALSE, /* Tumble_set */ - - NULL, /* IjsClient *ctx */ -- 0 /* ijs_version */ -+ 0, /* ijs_version */ -+ 0, /* krgb_mode */ -+ 0, /* k_bits */ -+ 0, /* k_path */ -+ 0, /* k_width */ -+ 0, /* k_band_size */ -+ NULL /* k_band buffer */ - }; - - -@@ -166,12 +224,299 @@ - - /**************************************************************************/ - --/* ------ Private definitions ------ */ -+/* ---------------- Low-level graphic procedures ---------------- */ -+ -+static unsigned char xmask[] = -+{ -+ 0x80, /* x=0 */ -+ 0x40, /* 1 */ -+ 0x20, /* 2 */ -+ 0x10, /* 3 */ -+ 0x08, /* 4 */ -+ 0x04, /* 5 */ -+ 0x02, /* 6 */ -+ 0x01 /* 7 */ -+}; -+ -+private int gsijs_fill_rectangle(gx_device * dev, int x, int y, int w, int h, -+ gx_color_index color) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ -+ if (ijsdev->krgb_mode && ijsdev->k_path && y >= 0 && x >= 0) -+ { -+ int raster = (ijsdev->k_width+7) >> 3; -+ register unsigned char *dest; -+ int dest_start_bit; -+ int band_height = ijsdev->k_band_size/raster; -+ int i,j; -+ unsigned char *beg = ijsdev->k_band; -+ unsigned char *end = ijsdev->k_band+ijsdev->k_band_size; -+ unsigned char *p; -+ -+ if (h <= 0 || w <= 0) -+ return 0; -+ -+ /* Check for out-of-band graphic. */ -+ if (x >= ijsdev->k_width || y >= band_height) -+ return 0; /* out-of-band */ -+ -+ dest_start_bit = x & 7; -+ dest=ijsdev->k_band+(raster*y)+(x >> 3); -+ -+ /* Note x,y orgin 0,0 is stored first byte 0 left to right. */ -+ -+ if (color==0x0) -+ { -+ /* Color is black, store in k plane band instead of regular band. */ -+ for (j=0; j<h; j++) -+ { -+ for (i=0; i<w; i++) -+ { -+ p = &dest[(dest_start_bit+i)>>3]; -+ if (p >= beg && p <= end) -+ *p |= xmask[(dest_start_bit+i)&7]; -+ } -+ dest+=raster; -+ } -+ return 0; -+ } -+ else -+ { -+ /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */ -+ for (j=0; j<h; j++) -+ { -+ for (i=0; i<w; i++) -+ { -+ p = &dest[(dest_start_bit+i)>>3]; -+ if (p >= beg && p <= end) -+ *p &= ~xmask[(dest_start_bit+i)&7]; -+ } -+ dest+=raster; -+ } -+ } -+ } -+ -+ return (*ijsdev->prn_procs.fill_rectangle)(dev, x, y, w, h, color); -+} -+ -+private int gsijs_copy_mono(gx_device * dev, const byte * data, -+ int dx, int draster, gx_bitmap_id id, -+ int x, int y, int w, int height, gx_color_index zero, gx_color_index one) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ -+ // if (ijsdev->krgb_mode && ijsdev->k_path && one==0x0) -+ if (ijsdev->krgb_mode && ijsdev->k_path) -+ { -+ /* Store in k plane band instead of regular band. */ -+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */ -+ register unsigned char *dest; -+ register const unsigned char *scan; -+ int dest_start_bit; -+ int scan_start_bit; -+ int band_height = ijsdev->k_band_size/raster; -+ int i,h=height; -+ unsigned char *beg = ijsdev->k_band; -+ unsigned char *end = ijsdev->k_band+ijsdev->k_band_size; -+ unsigned char *p; -+ -+ if (h <= 0 || w <= 0) -+ return 0; -+ -+ /* Check for out-of-band graphic. */ -+ if (x >= ijsdev->k_width || y >= band_height) -+ return 0; /* out-of-band */ -+ -+ scan=data+(dx >> 3); -+ dest_start_bit = x & 7; -+ scan_start_bit = dx & 7; -+ dest=ijsdev->k_band+(raster*y)+(x >> 3); -+ -+ if (one==0x0) -+ { -+ /* Color is black, store in k plane band instead of regular band. */ -+ while (h-- > 0) -+ { -+ for (i=0; i<w; i++) -+ { -+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7]) -+ { -+ p = &dest[(dest_start_bit+i)>>3]; -+ if (p >= beg && p <= end) -+ *p |= xmask[(dest_start_bit+i)&7]; -+ } -+ } -+ scan+=draster; -+ dest+=raster; -+ } -+ return 0; -+ } -+ else -+ { -+ /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */ -+ while (h-- > 0) -+ { -+ for (i=0; i<w; i++) -+ { -+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7]) -+ { -+ p = &dest[(dest_start_bit+i)>>3]; -+ if (p >= beg && p <= end) -+ *p &= ~xmask[(dest_start_bit+i)&7]; -+ } -+ } -+ scan+=draster; -+ dest+=raster; -+ } -+ } -+ } -+ -+ return (*ijsdev->prn_procs.copy_mono)(dev, data, dx, draster, id, x, y, w, height, zero, one); -+} -+ -+/* ---------------- High-level graphic procedures ---------------- */ -+ -+private int gsijs_fill_mask(gx_device * dev, -+ const byte * data, int dx, int raster, gx_bitmap_id id, -+ int x, int y, int w, int h, -+ const gx_drawing_color * pdcolor, int depth, -+ gs_logical_operation_t lop, const gx_clip_path * pcpath) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ int code; -+ -+ ijsdev->k_path = 1; -+ -+ code = (*ijsdev->prn_procs.fill_mask)(dev, data, dx, raster, id, x, y, w, h, pdcolor, depth, lop, pcpath); - --/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and -- require some workarounds. When more up-to-date hpijs versions -- become ubiquitous, all these workarounds should be removed. */ --#define HPIJS_1_0_VERSION 29 -+ ijsdev->k_path = 0; -+ -+ return code; -+} -+ -+private int gsijs_fill_path(gx_device * dev, const gs_imager_state * pis, -+ gx_path * ppath, const gx_fill_params * params, -+ const gx_drawing_color * pdcolor, -+ const gx_clip_path * pcpath) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ int code; -+ -+ ijsdev->k_path = 1; -+ -+ code = (*ijsdev->prn_procs.fill_path)(dev, pis, ppath, params, pdcolor, pcpath); -+ -+ ijsdev->k_path = 0; -+ -+ return 0; -+} -+ -+private int gsijs_stroke_path(gx_device * dev, const gs_imager_state * pis, -+ gx_path * ppath, const gx_stroke_params * params, -+ const gx_drawing_color * pdcolor, -+ const gx_clip_path * pcpath) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ int code; -+ -+ ijsdev->k_path = 1; -+ -+ code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params, pdcolor, pcpath); -+ -+ ijsdev->k_path = 0; -+ -+ return code; -+} -+ -+/* ---------------- krgb banding playback procedures ---------------- */ -+ -+private int gsijs_get_bits(gx_device_printer * pdev, int y, byte * str, byte ** actual_data) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev; -+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev; -+ int band_height = cdev->page_info.band_params.BandHeight; -+ int band_number = y/band_height; -+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */ -+ int y1=raster*(y-(band_height*band_number)); -+ -+ if (y1 == 0) -+ { -+ /* First raster for band, clear k_band. Banding playback occurs on first raster. */ -+ memset(ijsdev->k_band, 0, ijsdev->k_band_size); -+ } -+ -+ return gdev_prn_get_bits(pdev, y, str, actual_data); /* get raster from regular band */ -+} -+ -+private int gsijs_k_get_bits(gx_device_printer * pdev, int y, byte ** actual_data) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev; -+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev; -+ int band_height = cdev->page_info.band_params.BandHeight; -+ int band_number = y/band_height; -+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */ -+ int y1=raster*(y-(band_height*band_number)); -+ -+ *actual_data = ijsdev->k_band+y1; -+ -+ return 0; -+} -+ -+private int gsijs_create_buf_device(gx_device **pbdev, gx_device *target, -+ const gx_render_plane_t *render_plane, gs_memory_t *mem, gx_band_complexity_t *band_complexity) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)target; -+ int n_chan = ijsdev->color_info.num_components; -+ int code = gx_default_create_buf_device(pbdev, target, render_plane, mem, band_complexity); -+ if (code < 0 || n_chan != 3) -+ return code; -+ -+ /* Save buffer (vector) procedures so that we can hook them during banding playback. */ -+ ijsdev->prn_procs = (*pbdev)->procs; -+ -+ /* Replace buffer procedures with krgb procedures. */ -+ set_dev_proc(*pbdev, fill_rectangle, gsijs_fill_rectangle); -+ set_dev_proc(*pbdev, copy_mono, gsijs_copy_mono); -+ set_dev_proc(*pbdev, fill_mask, gsijs_fill_mask); -+ set_dev_proc(*pbdev, fill_path, gsijs_fill_path); -+ set_dev_proc(*pbdev, stroke_path, gsijs_stroke_path); -+ -+ return code; -+} -+ -+/* See if IJS server supports krgb. */ -+private int -+gsijs_set_krgb_mode(gx_device_ijs *ijsdev) -+{ -+ char buf[256]; -+ int n_chan = ijsdev->color_info.num_components; -+ int code; -+ -+ ijsdev->krgb_mode = 0; /* default is no krgb */ -+ -+ if (n_chan != 3) -+ return 0; /* no krgb support, not RGB colorspace */ -+ -+ buf[0] = 0; -+ code = ijs_client_enum_param(ijsdev->ctx, 0, "ColorSpace", buf, sizeof(buf)-1); -+ if (code >= 0) -+ buf[code] = 0; -+ if (strstr(buf, "KRGB") != NULL) -+ { -+ ijsdev->krgb_mode = 1; /* yes KRGB is supported */ -+ ijsdev->k_bits = 1; /* KRGB = 1x8x8x8 */ -+ } -+ else if (strstr(buf, "KxRGB") != NULL) -+ { -+ ijsdev->krgb_mode = 1; /* yes KRGB is supported */ -+ ijsdev->k_bits = 8; /* KRGB = 8x8x8x8 */ -+ } -+ -+ return 0; -+} -+ -+/* ------ Private definitions ------ */ - - private int - gsijs_parse_wxh (const char *val, int size, double *pw, double *ph) -@@ -209,34 +554,6 @@ - } - - /** -- * gsijs_set_generic_params_hpijs: Set generic IJS parameters. -- * -- * This version is specialized for hpijs 1.0 through 1.0.2, and -- * accommodates a number of quirks. -- **/ --private int --gsijs_set_generic_params_hpijs(gx_device_ijs *ijsdev) --{ -- char buf[256]; -- int code = 0; -- -- /* IjsParams, Duplex, and Tumble get set at this point because -- they may affect margins. */ -- if (ijsdev->IjsParams) { -- code = gsijs_client_set_param(ijsdev, "IjsParams", ijsdev->IjsParams); -- } -- -- if (code == 0 && ijsdev->Duplex_set) { -- int duplex_val; -- -- duplex_val = ijsdev->Duplex ? (ijsdev->IjsTumble ? 1 : 2) : 0; -- sprintf (buf, "%d", duplex_val); -- code = gsijs_client_set_param(ijsdev, "Duplex", buf); -- } -- return code; --} -- --/** - * gsijs_set_generic_params: Set generic IJS parameters. - **/ - private int -@@ -247,9 +564,6 @@ - int i, j; - char *value; - -- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) -- return gsijs_set_generic_params_hpijs(ijsdev); -- - /* Split IjsParams into separate parameters and send to ijs server */ - value = NULL; - for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) { -@@ -290,68 +604,6 @@ - } - - /** -- * gsijs_set_margin_params_hpijs: Do margin negotiation with IJS server. -- * -- * This version is specialized for hpijs 1.0 through 1.0.2, and -- * accommodates a number of quirks. -- **/ --private int --gsijs_set_margin_params_hpijs(gx_device_ijs *ijsdev) --{ -- char buf[256]; -- int code = 0; -- -- if (code == 0) { -- sprintf(buf, "%d", ijsdev->width); -- code = gsijs_client_set_param(ijsdev, "Width", buf); -- } -- if (code == 0) { -- sprintf(buf, "%d", ijsdev->height); -- code = gsijs_client_set_param(ijsdev, "Height", buf); -- } -- -- if (code == 0) { -- double printable_width, printable_height; -- double printable_left, printable_top; -- float m[4]; -- -- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableArea", -- buf, sizeof(buf)); -- if (code == IJS_EUNKPARAM) -- /* IJS server doesn't support margin negotiations. -- That's ok. */ -- return 0; -- else if (code >= 0) { -- code = gsijs_parse_wxh(buf, code, -- &printable_width, &printable_height); -- } -- -- if (code == 0) { -- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableTopLeft", -- buf, sizeof(buf)); -- if (code == IJS_EUNKPARAM) -- return 0; -- else if (code >= 0) { -- code = gsijs_parse_wxh(buf, code, -- &printable_left, &printable_top); -- } -- } -- -- if (code == 0) { -- m[0] = printable_left; -- m[1] = ijsdev->MediaSize[1] * (1.0 / 72) - -- printable_top - printable_height; -- m[2] = ijsdev->MediaSize[0] * (1.0 / 72) - -- printable_left - printable_width; -- m[3] = printable_top; -- gx_device_set_margins((gx_device *)ijsdev, m, true); -- } -- } -- -- return code; --} -- --/** - * gsijs_set_margin_params: Do margin negotiation with IJS server. - **/ - private int -@@ -362,9 +614,6 @@ - int i, j; - char *value; - -- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) -- return gsijs_set_margin_params_hpijs(ijsdev); -- - /* Split IjsParams into separate parameters and send to ijs server */ - value = NULL; - for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) { -@@ -531,12 +780,18 @@ - char buf[256]; - bool use_outputfd; - int fd = -1; -+ long max_bitmap = ijsdev->space_params.MaxBitmap; - - if (strlen(ijsdev->IjsServer) == 0) { - eprintf("ijs server not specified\n"); - return gs_note_error(gs_error_ioerror); - } - -+ ijsdev->space_params.MaxBitmap = 0; /* force banding */ -+ -+ /* Set create_buf_device in printer device, so that we can hook the banding playback procedures. */ -+ ijsdev->printer_procs.buf_procs.create_buf_device = gsijs_create_buf_device; -+ - /* Decide whether to use OutputFile or OutputFD. Note: how to - determine this is a tricky question, so we just allow the - user to set it. -@@ -551,6 +806,8 @@ - if (code < 0) - return code; - -+ ijsdev->space_params.MaxBitmap = max_bitmap; -+ - if (use_outputfd) { - /* Note: dup() may not be portable to all interesting IJS - platforms. In that case, this branch should be #ifdef'ed out. -@@ -610,6 +867,9 @@ - if (code >= 0) - code = gsijs_set_margin_params(ijsdev); - -+ if (code >= 0) -+ code = gsijs_set_krgb_mode(ijsdev); -+ - return code; - } - -@@ -690,21 +950,6 @@ - return min(width, end); - } - --private int ijs_all_white(unsigned char *data, int size) --{ -- int clean = 1; -- int i; -- for (i = 0; i < size; i++) -- { -- if (data[i] != 0xFF) -- { -- clean = 0; -- break; -- } -- } -- return clean; --} -- - /* Print a page. Don't use normal printer gdev_prn_output_page - * because it opens the output file. - */ -@@ -715,8 +960,10 @@ - gx_device_printer *pdev = (gx_device_printer *)dev; - int raster = gdev_prn_raster(pdev); - int ijs_width, ijs_height; -- int row_bytes; -+ int row_bytes, k_row_bytes=0; - int n_chan = pdev->color_info.num_components; -+ int krgb_mode = ijsdev->krgb_mode; -+ int k_bits = ijsdev->k_bits; - unsigned char *data; - char buf[256]; - double xres = pdev->HWResolution[0]; -@@ -732,13 +979,23 @@ - - /* Determine bitmap width and height */ - ijs_height = gdev_prn_print_scan_lines(dev); -- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) { -- ijs_width = pdev->width; -- } else { - ijs_width = gsijs_raster_width(dev); -- } -+ - row_bytes = (ijs_width * pdev->color_info.depth + 7) >> 3; - -+ if (krgb_mode) -+ { -+ gx_device_clist_common *cdev = (gx_device_clist_common *)dev; -+ int band_height = cdev->page_info.band_params.BandHeight; -+ k_row_bytes = (ijs_width + 7) >> 3; -+ -+ /* Create banding buffer for k plane. */ -+ ijsdev->k_width = ijs_width; -+ ijsdev->k_band_size = band_height * k_row_bytes; -+ if ((ijsdev->k_band = gs_malloc(pdev->memory, ijsdev->k_band_size, 1, "gsijs_output_page")) == (unsigned char *)NULL) -+ return gs_note_error(gs_error_VMerror); -+ } -+ - /* Required page parameters */ - sprintf(buf, "%d", n_chan); - gsijs_client_set_param(ijsdev, "NumChan", buf); -@@ -747,44 +1004,71 @@ - - /* This needs to become more sophisticated for DeviceN. */ - strcpy(buf, (n_chan == 4) ? "DeviceCMYK" : -- ((n_chan == 3) ? "DeviceRGB" : "DeviceGray")); -+ ((n_chan == 3) ? (krgb_mode ? ((k_bits == 1) ? "KRGB" : "KxRGB") : "DeviceRGB") : "DeviceGray")); - gsijs_client_set_param(ijsdev, "ColorSpace", buf); - -- /* If hpijs 1.0, don't set width and height here, because it -- expects them to be the paper size. */ -- if (ijsdev->ijs_version != HPIJS_1_0_VERSION) { -- sprintf(buf, "%d", ijs_width); -- gsijs_client_set_param(ijsdev, "Width", buf); -- sprintf(buf, "%d", ijs_height); -- gsijs_client_set_param(ijsdev, "Height", buf); -- } -+ sprintf(buf, "%d", ijs_width); -+ gsijs_client_set_param(ijsdev, "Width", buf); -+ sprintf(buf, "%d", ijs_height); -+ gsijs_client_set_param(ijsdev, "Height", buf); - - sprintf(buf, "%gx%g", xres, yres); - gsijs_client_set_param(ijsdev, "Dpi", buf); - -+#ifdef KRGB_DEBUG -+ int kfd, rgbfd; -+ char sz[128]; -+ kfd = open("/tmp/k.pbm", O_CREAT | O_TRUNC | O_RDWR, 0644); -+ rgbfd = open("/tmp/rgb.ppm", O_CREAT | O_TRUNC | O_RDWR, 0644); -+ snprintf(sz, sizeof(sz), "P4\n#gdevijs test\n%d\n%d\n", ijs_width, ijs_height); -+ write(kfd, sz, strlen(sz)); -+ snprintf(sz, sizeof(sz), "P6\n#gdevijs test\n%d\n%d\n255\n", ijs_width, ijs_height); -+ write(rgbfd, sz, strlen(sz)); -+#endif -+ - for (i=0; i<num_copies; i++) { - unsigned char *actual_data; - ijs_client_begin_cmd (ijsdev->ctx, IJS_CMD_BEGIN_PAGE); - status = ijs_client_send_cmd_wait(ijsdev->ctx); - - for (y = 0; y < ijs_height; y++) { -- code = gdev_prn_get_bits(pdev, y, data, &actual_data); -- if (code < 0) -- break; -+ if (krgb_mode) -+ code = gsijs_get_bits(pdev, y, data, &actual_data); -+ else -+ code = gdev_prn_get_bits(pdev, y, data, &actual_data); -+ if (code < 0) -+ break; -+#ifdef KRGB_DEBUG -+ write(rgbfd, actual_data, row_bytes); -+#endif -+ status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, row_bytes); -+ if (status) -+ break; - -- if (ijsdev->ijs_version == HPIJS_1_0_VERSION && -- ijs_all_white(actual_data, row_bytes)) -- status = ijs_client_send_data_wait(ijsdev->ctx, 0, NULL, 0); -- else -- status = ijs_client_send_data_wait(ijsdev->ctx, 0, -- (char *)actual_data, row_bytes); -- if (status) -- break; -+ if (krgb_mode) { -+ code = gsijs_k_get_bits(pdev, y, &actual_data); -+ if (code < 0) -+ break; -+#ifdef KRGB_DEBUG -+ write(kfd, actual_data, k_row_bytes); -+#endif -+ status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, k_row_bytes); -+ if (status) -+ break; -+ } - } - ijs_client_begin_cmd(ijsdev->ctx, IJS_CMD_END_PAGE); - status = ijs_client_send_cmd_wait(ijsdev->ctx); - } - -+#ifdef KRGB_DEBUG -+ close(kfd); -+ close(rgbfd); -+#endif -+ -+ if(krgb_mode) -+ gs_free(pdev->memory, ijsdev->k_band, ijsdev->k_band_size, 1, "gsijs_output_page"); -+ - gs_free_object(pdev->memory, data, "gsijs_output_page"); - - endcode = (pdev->buffer_space && !pdev->is_async_renderer ? -@@ -1090,7 +1374,6 @@ - dprintf2("ijs: Can't set parameter %s=%s\n", key, value); - return code; - } -- - - private int - gsijs_set_color_format(gx_device_ijs *ijsdev) diff --git a/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch b/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch deleted file mode 100644 index fee7bcf7977c..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-8.60-include.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- /trunk/gs/src/Makefile.in 2007/09/27 20:20:46 8254 -+++ trunk/gs/src/Makefile.in 2007/09/27 20:26:51 8255 -@@ -1,4 +1,4 @@ --# Copyright (C) 2001-2006 Artifex Software, Inc. -+# Copyright (C) 2001-2007 Artifex Software, Inc. - # All Rights Reserved. - # - # This software is provided AS-IS with no warranty, either express or -@@ -55,6 +55,7 @@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ - scriptdir = $(bindir) -+includedir = @includedir@ - libdir = @libdir@ - mandir = @mandir@ - man1ext = 1 -@@ -67,6 +68,7 @@ - gsdir = @datadir@/ghostscript - gsdatadir = $(gsdir)/$(GS_DOT_VERSION) - gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION) -+gsincludedir = @includedir@/ghostscript/ - - docdir=$(gsdatadir)/doc - exdir=$(gsdatadir)/examples ---- /trunk/gs/src/macosx.mak 2007/09/27 20:20:46 8254 -+++ trunk/gs/src/macosx.mak 2007/09/27 20:26:51 8255 -@@ -1,4 +1,4 @@ --# Copyright (C) 2001-2006 Artifex Software, Inc. -+# Copyright (C) 2001-2007 Artifex Software, Inc. - # All Rights Reserved. - # - # This software is provided AS-IS with no warranty, either express or -@@ -58,11 +58,14 @@ - exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin - scriptdir = $(bindir) -+includedir = $(prefix)/include - libdir = $(exec_prefix)/lib - mandir = $(prefix)/man - man1ext = 1 - datadir = $(prefix)/Resources - gsdatadir = $(prefix)/Versions/$(GS_DOT_VERSION)/Resources -+gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION) -+gsincludedir = $(includedir)/ghostscript/ - - docdir=$(gsdatadir)/doc - exdir=$(gsdatadir)/examples ---- /trunk/gs/src/unix-dll.mak 2007/09/27 20:20:46 8254 -+++ trunk/gs/src/unix-dll.mak 2007/09/27 20:26:51 8255 -@@ -1,4 +1,4 @@ --# Copyright (C) 2001-2006 Artifex Software, Inc. -+# Copyright (C) 2001-2007 Artifex Software, Inc. - # All Rights Reserved. - # - # This software is provided AS-IS with no warranty, either express or -@@ -60,7 +60,7 @@ - #LDFLAGS_SO=-dynamiclib -install-name $(GS_SONAME_MAJOR_MINOR) - - GS_SO=$(BINDIR)/$(GS_SONAME) --GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) -+GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) - GS_SO_MAJOR_MINOR=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR) - - # Shared object is built by redefining GS_XE in a recursive make. -@@ -114,6 +114,7 @@ - -mkdir -p $(DESTDIR)$(gsdatadir) - -mkdir -p $(DESTDIR)$(bindir) - -mkdir -p $(DESTDIR)$(libdir) -+ -mkdir -p $(DESTDIR)$(gsincludedir) - $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) - $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) - $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR) -@@ -121,6 +122,8 @@ - ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME) - $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) - ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) -+ $(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)/iapi.h -+ $(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)/ierrors.h - - soinstall: install-so install-scripts install-data - ---- /trunk/gs/src/unix-gcc.mak 2007/09/27 20:20:46 8254 -+++ trunk/gs/src/unix-gcc.mak 2007/09/27 20:26:51 8255 -@@ -1,4 +1,4 @@ --# Copyright (C) 2001-2006 Artifex Software, Inc. -+# Copyright (C) 2001-2007 Artifex Software, Inc. - # All Rights Reserved. - # - # This software is provided AS-IS with no warranty, either express or -@@ -56,12 +56,15 @@ - exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin - scriptdir = $(bindir) -+includedir = $(prefix)/include - libdir = $(exec_prefix)/lib - mandir = $(prefix)/man - man1ext = 1 - datadir = $(prefix)/share - gsdir = $(datadir)/ghostscript - gsdatadir = $(gsdir)/$(GS_DOT_VERSION) -+gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION) -+gsincludedir = $(includedir)/ghostscript/ - - docdir=$(gsdatadir)/doc - exdir=$(gsdatadir)/examples - diff --git a/app-text/ghostscript-gpl/files/ghostscript-8.60-multilib.patch b/app-text/ghostscript-gpl/files/ghostscript-8.60-multilib.patch deleted file mode 100644 index 8cd701c3b2e5..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-8.60-multilib.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- ghostscript-8.60-r8112/ijs/ijs-config.in.multilib 2002-01-31 19:09:46.000000000 +0000 -+++ ghostscript-8.60-r8112/ijs/ijs-config.in 2007-07-10 17:46:44.000000000 +0100 -@@ -43,8 +43,7 @@ - echo $includes - ;; - --libs) -- libdirs=-L@libdir@ -- echo $libdirs -lijs -+ echo -lijs - ;; - *) - echo "${usage}" 1>&2 ---- ghostscript-8.60-r8112/ijs/Makefile.am.multilib 2007-07-10 18:00:36.000000000 +0100 -+++ ghostscript-8.60-r8112/ijs/Makefile.am 2007-07-10 18:00:39.000000000 +0100 -@@ -34,7 +34,7 @@ - - pkgincludedir=$(includedir)/ijs - m4datadir = $(datadir)/aclocal --pkgconfigdatadir = $(prefix)/lib/pkgconfig -+pkgconfigdatadir = $(libdir)/pkgconfig - - lib_LTLIBRARIES = libijs.la - - - diff --git a/app-text/ghostscript-gpl/files/ghostscript-8.60-noopt.patch b/app-text/ghostscript-gpl/files/ghostscript-8.60-noopt.patch deleted file mode 100644 index 3a93580e0346..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-8.60-noopt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ghostscript-7.07/src/int.mak.noopt 2005-03-10 17:22:53.000000000 +0000 -+++ ghostscript-7.07/src/int.mak 2005-03-10 17:24:10.000000000 +0000 -@@ -105,7 +105,7 @@ - $(PSOBJ)igcref.$(OBJ) : $(PSSRC)igcref.c $(GH) $(memory__h)\ - $(gsexit_h) $(gsstruct_h)\ - $(iastate_h) $(idebug_h) $(igc_h) $(iname_h) $(ipacked_h) $(store_h) -- $(PSCC) $(PSO_)igcref.$(OBJ) $(C_) $(PSSRC)igcref.c -+ $(PSCC) -O0 $(PSO_)igcref.$(OBJ) $(C_) $(PSSRC)igcref.c - - $(PSOBJ)igcstr.$(OBJ) : $(PSSRC)igcstr.c $(GH) $(memory__h)\ - $(gsmdebug_h) $(gsstruct_h) $(iastate_h) $(igcstr_h) diff --git a/app-text/ghostscript-gpl/files/ghostscript-8.60-scripts.patch b/app-text/ghostscript-gpl/files/ghostscript-8.60-scripts.patch deleted file mode 100644 index 9a495f3dbf52..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-8.60-scripts.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ghostscript-8.60-r8112/lib/pv.sh.scripts 2007-07-05 11:41:52.000000000 +0100 -+++ ghostscript-8.60-r8112/lib/pv.sh 2007-07-10 16:08:47.000000000 +0100 -@@ -31,7 +31,7 @@ - GS_EXECUTABLE=gs - - TEMPDIR=. --PAGE=$1 -+PAGE="$1" - shift - FILE="$1" - shift -@@ -44,7 +44,7 @@ - tmpfile="$TEMPDIR/$FILE.$$.pv" - fi - trap "rm -rf $tmpfile" 0 1 2 15 --#dvips -D$RESOLUTION -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile --dvips -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile -+#dvips -R -D$RESOLUTION -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile -+dvips -R -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile - $GS_EXECUTABLE $tmpfile - exit 0 ---- ghostscript-8.60-r8112/lib/dvipdf.scripts 2007-07-10 16:08:57.000000000 +0100 -+++ ghostscript-8.60-r8112/lib/dvipdf 2007-07-10 16:09:17.000000000 +0100 -@@ -44,4 +44,4 @@ - - # We have to include the options twice because -I only takes effect if it - # appears before other options. --exec dvips $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - -+exec dvips -R $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - diff --git a/app-text/ghostscript-gpl/files/ghostscript-CVE-2007-2721.patch b/app-text/ghostscript-gpl/files/ghostscript-CVE-2007-2721.patch deleted file mode 100644 index 799bf51ee63f..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-CVE-2007-2721.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- /trunk/gs/jasper/src/libjasper/jp2/jp2_cod.c 2007/10/17 18:27:58 8297 -+++ trunk/gs/jasper/src/libjasper/jp2/jp2_cod.c 2007/10/17 23:04:50 8298 -@@ -247,7 +247,7 @@ - box = 0; - tmpstream = 0; - -- if (!(box = jas_malloc(sizeof(jp2_box_t)))) { -+ if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) { - goto error; - } - box->ops = &jp2_boxinfo_unk.ops; ---- /trunk/gs/jasper/src/libjasper/jpc/jpc_cs.c 2007/10/17 18:27:58 8297 -+++ trunk/gs/jasper/src/libjasper/jpc/jpc_cs.c 2007/10/17 23:04:50 8298 -@@ -991,7 +991,10 @@ - compparms->numstepsizes = (len - n) / 2; - break; - } --if (compparms->numstepsizes > 0) { -+if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) { -+ jpc_qcx_destroycompparms(compparms); -+ return -1; -+ } else if (compparms->numstepsizes > 0) { - compparms->stepsizes = jas_malloc(compparms->numstepsizes * - sizeof(uint_fast32_t)); - assert(compparms->stepsizes); ---- /trunk/gs/jasper/src/libjasper/jpc/jpc_dec.c 2007/10/17 18:27:58 8297 -+++ trunk/gs/jasper/src/libjasper/jpc/jpc_dec.c 2007/10/17 23:04:50 8298 -@@ -1219,7 +1219,7 @@ - dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth); - dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight); - dec->numtiles = dec->numhtiles * dec->numvtiles; -- if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) { -+ if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) { - return -1; - } - -@@ -1243,7 +1243,7 @@ - tile->pkthdrstreampos = 0; - tile->pptstab = 0; - tile->cp = 0; -- if (!(tile->tcomps = jas_malloc(dec->numcomps * -+ if (!(tile->tcomps = jas_calloc(dec->numcomps, - sizeof(jpc_dec_tcomp_t)))) { - return -1; - } - - diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-big-cmap-post.patch b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-big-cmap-post.patch deleted file mode 100644 index f0f72fcbd4ed..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-big-cmap-post.patch +++ /dev/null @@ -1,198 +0,0 @@ -diff -ur ghostscript-8.54.orig/lib/gs_ttf.ps ghostscript-8.54/lib/gs_ttf.ps ---- ghostscript-8.54.orig/lib/gs_ttf.ps 2006-05-23 19:31:05.000000000 +0200 -+++ ghostscript-8.54/lib/gs_ttf.ps 2006-05-23 19:33:32.000000000 +0200 -@@ -273,6 +273,54 @@ - } for pop exch pop - } bind def - -+/.biglength { % <str>|<array of str> .biglength <integer> -+ dup type /arraytype eq { 0 exch { length add } forall } { length } ifelse -+} bind def -+ -+/concats { % [str ...] concats str -+ () exch dup length 1 sub -1 0 { -+ 1 index exch get dup type /stringtype ne { dup length string cvs } if -+ 3 -1 roll exch dup length 2 index length add string -+ dup dup 4 2 roll copy length 4 -1 roll putinterval exch -+ } for pop -+} bind def -+ -+% <str>|<array of str> <index> <count> .biggetinterval <str>|<array of str> -+/.biggetinterval { -+ 3 dict begin -+ 2 index type /arraytype eq { -+ /c exch def -+ /i exch def -+ [ exch { -+ dup length /l exch def -+ i c add l gt { -+ i l lt { -+ i l i sub getinterval -+ /c i c add l sub def -+ /i 0 def -+ } { -+ pop -+ /i i l sub def -+ } ifelse -+ } { -+ i c getinterval exit -+ } ifelse -+ } forall -+ ] dup .biglength 65535 le { concats } if -+ } { getinterval } ifelse -+ end -+} bind def -+ -+% <str>|<array of str> <index> getu16 <integer> -+/.biggetu16 { -+ 2 .biggetinterval 0 getu16 -+} bind def -+ -+% <str>|<array of str> <index> getu32 <integer> -+/.biggetu32 { -+ 4 .biggetinterval 0 getu32 -+} bind def -+ - % Each procedure in this dictionary is called as follows: - % <encodingtable> proc <glypharray> - /cmapformats mark -@@ -363,14 +411,14 @@ - } bind - 4 { % Microsoft/Adobe segmented mapping. - /etab exch def -- /nseg2 etab 6 getu16 def -- 14 /endc etab 2 index nseg2 getinterval def -+ /nseg2 etab 6 .biggetu16 def -+ 14 /endc etab 2 index nseg2 .biggetinterval def - % The Apple TrueType documentation omits the 2-byte - % 'reserved pad' that follows the endCount vector! - 2 add -- nseg2 add /startc etab 2 index nseg2 getinterval def -- nseg2 add /iddelta etab 2 index nseg2 getinterval def -- nseg2 add /idroff etab 2 index nseg2 getinterval def -+ nseg2 add /startc etab 2 index nseg2 .biggetinterval def -+ nseg2 add /iddelta etab 2 index nseg2 .biggetinterval def -+ nseg2 add /idroff etab 2 index nseg2 .biggetinterval def - % The following hack allows us to properly handle - % idiosyncratic fonts that start at 0xf000: - pop -@@ -382,8 +430,8 @@ - /numcodes 0 def /glyphs 0 0 2 nseg2 3 sub { - % Stack: /glyphs numglyphs i2 - /i2 exch def -- /scode startc i2 getu16 def -- /ecode endc i2 getu16 def -+ /scode startc i2 .biggetu16 def -+ /ecode endc i2 .biggetu16 def - numcodes scode firstcode sub - % Hack for fonts that have only 0x0000 and 0xf000 ranges - %dup 16#e000 ge { 255 and } if -@@ -404,8 +452,8 @@ - /numcodes 0 def /code 0 def - 0 2 nseg2 3 sub { - /i2 exch def -- /scode startc i2 getu16 def -- /ecode endc i2 getu16 def -+ /scode startc i2 .biggetu16 def -+ /ecode endc i2 .biggetu16 def - numcodes scode firstcode sub - % Hack for fonts that have only 0x0000 and 0xf000 ranges - %dup 16#e000 ge { 255 and } if -@@ -417,15 +465,15 @@ - (scode=) print scode =only - ( ecode=) print ecode =only - ( delta=) print delta =only -- ( droff=) print idroff i2 getu16 = -+ ( droff=) print idroff i2 .biggetu16 = - } if -- idroff i2 getu16 dup 0 eq { -+ idroff i2 .biggetu16 dup 0 eq { - pop scode delta add 65535 and 1 ecode delta add 65535 and - { putglyph } for - } { % The +2 is for the 'reserved pad'. - /gloff exch 14 nseg2 3 mul add 2 add i2 add add def - 0 1 ecode scode sub { -- 2 mul gloff add etab exch getu16 -+ 2 mul gloff add etab exch .biggetu16 - dup 0 ne { delta add 65535 and } if putglyph - } for - } ifelse -@@ -448,12 +496,12 @@ - - % <cmaptab> cmaparray <glypharray> - /cmaparray { -- dup 0 getu16 cmapformats exch .knownget { -+ dup 0 .biggetu16 cmapformats exch .knownget { - TTFDEBUG { -- (cmap: format ) print 1 index 0 getu16 = flush -+ (cmap: format ) print 1 index 0 .biggetu16 = flush - } if exec - } { -- (Can't handle format ) print 0 getu16 = flush -+ (Can't handle format ) print 0 .biggetu16 = flush - 0 1 255 { } for 256 packedarray - } ifelse - TTFDEBUG { -@@ -591,7 +639,7 @@ - % Adobe requirement that each sfnts entry have even length. - /readtables mark - % Ordinary tables -- (cmap) //call.readtable -+ (cmap) //call.readbigtable - (head) 1 index - (hhea) 1 index - (maxp) 1 index -@@ -964,10 +1012,17 @@ - } ifelse - % Stack: ... /FontInfo mark key1 value1 ... - post null ne { -- /ItalicAngle first_post_string 4 gets32 65536.0 div -- /isFixedPitch first_post_string 12 getu32 0 ne -- /UnderlinePosition first_post_string 8 gets16 upem div -- /UnderlineThickness first_post_string 10 gets16 upem div -+ post type /arraytype eq { -+ % this post table is a big table. /post should be [(...) ...] -+ % data we actually need here should be first one in array. -+ /posttable post 1 get def -+ } { -+ /posttable post def -+ } ifelse -+ /ItalicAngle posttable 4 gets32 65536.0 div -+ /isFixedPitch posttable 12 getu32 0 ne -+ /UnderlinePosition posttable 8 gets16 upem div -+ /UnderlineThickness posttable 10 gets16 upem div - } if - counttomark 0 ne { .dicttomark } { pop pop } ifelse - /XUID [orgXUID 42 curxuid] -@@ -1026,22 +1081,22 @@ - } if - tabdict /cmap get % bool [] i PlatID SpecID (cmap) - dup /cmaptab exch def % temporary -- 0 1 2 index 2 getu16 1 sub { % bool [] i PlatID SpecID (cmap) j -- 8 mul 4 add 1 index exch 8 getinterval % bool [] i PlatID SpecID (cmap) (cmapsub) -+ 0 1 2 index 2 .biggetu16 1 sub { % bool [] i PlatID SpecID (cmap) j -+ 8 mul 4 add 1 index exch 8 .biggetinterval % bool [] i PlatID SpecID (cmap) (cmapsub) - TTFDEBUG { -- (cmap: platform ) print dup 0 getu16 =only -- ( encoding ) print dup 2 getu16 = flush -+ (cmap: platform ) print dup 0 .biggetu16 =only -+ ( encoding ) print dup 2 .biggetu16 = flush - } if -- dup 0 getu16 4 index eq { -- dup 2 getu16 3 index eq { % bool [] i PlatID SpecID (cmap) (cmapsub) -+ dup 0 .biggetu16 4 index eq { -+ dup 2 .biggetu16 3 index eq { % bool [] i PlatID SpecID (cmap) (cmapsub) - TTFDEBUG { - (Choosen a cmap for platform=) print 3 index =only - ( encoding=) print 2 index = - } if - /cmapsub 1 index def -- dup 4 getu32 % bool [] i PlatID SpecID (cmap) (cmapsub) p -- cmaptab length 1 index sub % bool [] i PlatID SpecID (cmap) (cmapsub) p l -- cmaptab 3 1 roll getinterval -+ dup 4 .biggetu32 % bool [] i PlatID SpecID (cmap) (cmapsub) p -+ cmaptab .biglength 1 index sub % bool [] i PlatID SpecID (cmap) (cmapsub) p l -+ cmaptab 3 1 roll .biggetinterval - /cmaptab exch def % bool [] i PlatID SpecID (cmap) (cmapsub) - 5 index 5 index 1 add get % bool [] i PlatID SpecID (cmap) (cmapsub) /Decoding - /Decoding exch def % bool [] i PlatID SpecID (cmap) (cmapsub) diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-cups-destdir.diff b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-cups-destdir.diff deleted file mode 100644 index 8f9e67c53da2..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-cups-destdir.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur ghostscript-8.54.orig/pstoraster/cups.mak ghostscript-8.54/pstoraster/cups.mak ---- ghostscript-8.54.orig/pstoraster/cups.mak 2006-05-23 19:59:45.000000000 +0200 -+++ ghostscript-8.54/pstoraster/cups.mak 2006-05-23 20:32:44.000000000 +0200 -@@ -24,9 +24,9 @@ - - cups_= $(GLOBJ)gdevcups.$(OBJ) - --CUPSSERVER= $(install_prefix)`cups-config --serverbin` --CUPSCONFIG= $(install_prefix)`cups-config --serverroot` --CUPSDATA= $(install_prefix)`cups-config --datadir` -+CUPSSERVER= $(DESTDIR)`cups-config --serverbin` -+CUPSCONFIG= $(DESTDIR)`cups-config --serverroot` -+CUPSDATA= $(DESTDIR)`cups-config --datadir` - - $(DD)cups.dev: $(cups_) $(GLD)page.dev - $(ADDMOD) $(DD)cups -lib cupsimage -lib cups diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-cups-lib.patch b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-cups-lib.patch deleted file mode 100644 index 0271fd996376..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-cups-lib.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -u lib/gs_init.ps.orig lib/gs_init.ps ---- lib/gs_init.ps.orig 2006-02-21 22:29:07.000000000 +0100 -+++ lib/gs_init.ps 2006-05-17 22:31:11.000000000 +0200 -@@ -152,6 +152,7 @@ - currentdict /NOFONTPATH known /NOFONTPATH exch def - currentdict /NOGC known /NOGC exch def - currentdict /NOINTERPOLATE .knownget { /INTERPOLATE exch not def } if -+currentdict /NOMEDIAATTRS known /NOMEDIAATTRS exch def - currentdict /NOOUTERSAVE known /NOOUTERSAVE exch def - currentdict /NOPAGEPROMPT known /NOPAGEPROMPT exch def - currentdict /NOPAUSE known /NOPAUSE exch def -diff -u lib/gs_setpd.ps.orig lib/gs_setpd.ps ---- lib/gs_setpd.ps.orig 2005-12-28 20:56:24.000000000 +0100 -+++ lib/gs_setpd.ps 2006-05-17 22:33:54.000000000 +0200 -@@ -375,21 +375,42 @@ - } bind - .dicttomark readonly def - --% Define the keys used in input attribute matching. --/.inputattrkeys [ -- /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet /ManualFeed -- % The following are documented in Adobe's supplement for v2017. -- /LeadingEdge /MediaClass --] readonly def --% Define other keys used in media selection. --/.inputselectionkeys [ -- /MediaPosition /Orientation --] readonly def -- --% Define the keys used in output attribute matching. --/.outputattrkeys [ -- /OutputType --] readonly def -+% M. Sweet, Easy Software Products: -+% -+% Define NOMEDIAATTRS to turn off the default (but unimplementable) media -+% selection policies for setpagedevice. This is used by CUPS to support -+% the standard Adobe media attributes. -+NOMEDIAATTRS { -+ % Define only PageSize for input attribute matching. -+ /.inputattrkeys [ -+ /PageSize -+ ] readonly def -+ % Define no other keys used in media selection. -+ /.inputselectionkeys [ -+ /noInputSelectionsKeys -+ ] readonly def -+ -+ % Define no keys used in output attribute matching. -+ /.outputattrkeys [ -+ /noOutputAttrKeys -+ ] readonly def -+} { -+ % Define the keys used in input attribute matching. -+ /.inputattrkeys [ -+ /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet /ManualFeed -+ % The following are documented in Adobe's supplement for v2017. -+ /LeadingEdge /MediaClass -+ ] readonly def -+ % Define other keys used in media selection. -+ /.inputselectionkeys [ -+ /MediaPosition /Orientation -+ ] readonly def -+ -+ % Define the keys used in output attribute matching. -+ /.outputattrkeys [ -+ /OutputType -+ ] readonly def -+} ifelse - - % Define all the parameters that should always be copied to the merged - % dictionary. -@@ -418,7 +439,13 @@ - /PageSize //false % obsolete alias for .MediaSize - /InputAttributes //false - .inputattrkeys -- { dup /PageSize eq -+ % M. Sweet, Easy Software Products: -+ % -+ % Treat LeadingEdge like PageSize so that a common Ghostscript driver -+ % doesn't need the NOMEDIAATTRS definition. -+ % -+ % { dup /PageSize eq -+ { dup dup /PageSize eq exch /LeadingEdge eq or - { pop } - { { 2 index /InputAttributes .knownget { //null eq } { //true } ifelse } } - ifelse -@@ -499,11 +526,23 @@ - % They are expected to consume the top 2 operands. - % NOTE: we currently treat all values other than 0, 1, or 7 (for PageSize) - % the same as 0, i.e., we signal an error. -+% -+% M. Sweet, Easy Software Products: -+% -+% Define NOMEDIAATTRS to turn off the default (but unimplementable) media -+% selection policies for setpagedevice. This is used by CUPS to support -+% the standard Adobe media attributes. -+ SETPDDEBUG { (Rolling back.) = pstack flush } if - 0 { % Set errorinfo and signal a configurationerror. -- pop dup 4 index exch get 2 array astore -- $error /errorinfo 3 -1 roll put -- cleartomark -+ NOMEDIAATTRS { -+ % NOMEDIAATTRS means that the default policy is 7... -+ pop 2 index exch 7 put -+ } { -+ pop dup 4 index exch get 2 array astore -+ $error /errorinfo 3 -1 roll put -+ cleartomark - /setpagedevice .systemvar /configurationerror signalerror -+ } ifelse - } bind - 1 { % Roll back the failed request to its previous status. - SETPDDEBUG { (Rolling back.) = pstack flush } if diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-destdir.diff b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-destdir.diff deleted file mode 100644 index 77762119d017..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-destdir.diff +++ /dev/null @@ -1,279 +0,0 @@ -diff -ur ghostscript-8.54.orig/src/all-arch.mak ghostscript-8.54/src/all-arch.mak ---- ghostscript-8.54.orig/src/all-arch.mak 2006-05-23 19:59:45.000000000 +0200 -+++ ghostscript-8.54/src/all-arch.mak 2006-05-23 20:32:44.000000000 +0200 -@@ -295,24 +295,24 @@ - # Remove the old gs binary first, so as to preserve the previous - # gs-x.yy version, if any. - install-binary: -- -$(RM) $(BINDIR)/$(GS) -+ -$(RM) $(DESTDIR)$(BINDIR)/$(GS) - @$(MAKE) $(ARGS) install GS=$(GS) XLIBDIRS=$(XLIBDIRSALL) ; \ - d=`pwd` ; \ - d=`basename $$d` ; \ - d=`echo $$d | sed -e s/gs/gs-/` ; \ -- $(RM) $(BINDIR)/$$d ; \ -- ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \ -- ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d -+ $(RM) $(DESTDIR)$(BINDIR)/$$d ; \ -+ ln $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d ; \ -+ ls -l $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d - - install-binary-gnu-readline: -- -$(RM) $(BINDIR)/$(GS) -+ -$(RM) $(DESTDIR)$(BINDIR)/$(GS) - @$(MAKE) $(ARGS) install GS=$(GS) XLIBDIRS=$(XLIBDIRSALL) $(GNU_READLINE_ARGS) ; \ - d=`pwd` ; \ - d=`basename $$d` ; \ - d=`echo $$d | sed -e s/gs/gs-/` ; \ -- $(RM) $(BINDIR)/$$d ; \ -- ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \ -- ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d -+ $(RM) $(DESTDIR)$(BINDIR)/$$d ; \ -+ ln $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d ; \ -+ ls -l $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d - - install-fontmap: - @d=`pwd` ; \ -@@ -320,14 +320,14 @@ - d=`echo $$d | sed -e s/gs//` ; \ - if test -f $(GS_SRC_DIR)/Fontmap.new ; \ - then \ -- if test -f $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \ -+ if test -f $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \ - then \ - true ; \ - else \ -- mv $(GS_SHARE_DIR)/$$d/lib/Fontmap $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \ -+ mv $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \ - fi ; \ -- $(CP) $(GS_SRC_DIR)/Fontmap.new $(GS_SHARE_DIR)/$$d/lib/Fontmap ; \ -- ls -l $(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \ -+ $(CP) $(GS_SRC_DIR)/Fontmap.new $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap ; \ -+ ls -l $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \ - fi - - install-pdfsec: -@@ -336,9 +336,9 @@ - d=`echo $$d | sed -e s/gs//` ; \ - if test -f $(GS_SRC_DIR)/lib/pdf_sec.ps ; \ - then \ -- $(MV) $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \ -- $(CP) lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \ -- $(CHMOD) 664 $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \ -+ $(MV) $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \ -+ $(CP) lib/pdf_sec.ps $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \ -+ $(CHMOD) 664 $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \ - fi - - #======================================================================= -Only in ghostscript-8.54/src: all-arch.mak.orig -diff -ur ghostscript-8.54.orig/src/macos-fw.mak ghostscript-8.54/src/macos-fw.mak ---- ghostscript-8.54.orig/src/macos-fw.mak 2006-05-23 19:59:45.000000000 +0200 -+++ ghostscript-8.54/src/macos-fw.mak 2006-05-23 20:32:44.000000000 +0200 -@@ -100,19 +100,19 @@ - $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX) - - install-so: so -- -mkdir $(prefix) -- -mkdir $(datadir) -- -mkdir $(gsdir) -- -mkdir $(gsdatadir) -- -mkdir $(bindir) -- -mkdir $(libdir) -- $(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME) -- $(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME) -- $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR) -- $(RM_) $(libdir)/$(GS_SONAME) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME) -- $(RM_) $(libdir)/$(GS_SONAME_MAJOR) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR) -+ -mkdir $(DESTDIR)$(prefix) -+ -mkdir $(DESTDIR)$(datadir) -+ -mkdir $(DESTDIR)$(gsdir) -+ -mkdir $(DESTDIR)$(gsdatadir) -+ -mkdir $(DESTDIR)$(bindir) -+ -mkdir $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) -+ $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) -+ $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR) -+ $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME) -+ ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME) -+ $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) -+ ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) - - soinstall: install-so install-scripts install-data - -@@ -141,8 +141,8 @@ - cp -r doc $(GS_FRAMEWORK)/Versions/Current - - framework_install : framework -- rm -rf $(prefix) -- cp -r $(GS_FRAMEWORK) $(prefix) -+ rm -rf $(DESTDIR)$(prefix) -+ cp -r $(GS_FRAMEWORK) $(DESTDIR)$(prefix) - - # Make the build directories - SODIRS: STDDIRS -Only in ghostscript-8.54/src: macos-fw.mak.orig -diff -ur ghostscript-8.54.orig/src/unix-dll.mak ghostscript-8.54/src/unix-dll.mak ---- ghostscript-8.54.orig/src/unix-dll.mak 2006-05-23 19:59:45.000000000 +0200 -+++ ghostscript-8.54/src/unix-dll.mak 2006-05-23 20:32:49.000000000 +0200 -@@ -93,19 +93,19 @@ - $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX) - - install-so: so -- -mkdir -p $(prefix) -- -mkdir -p $(datadir) -- -mkdir -p $(gsdir) -- -mkdir -p $(gsdatadir) -- -mkdir -p $(bindir) -- -mkdir -p $(libdir) -- $(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME) -- $(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME) -- $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR) -- $(RM_) $(libdir)/$(GS_SONAME) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME) -- $(RM_) $(libdir)/$(GS_SONAME_MAJOR) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR) -+ -mkdir -p $(DESTDIR)$(prefix) -+ -mkdir -p $(DESTDIR)$(datadir) -+ -mkdir -p $(DESTDIR)$(gsdir) -+ -mkdir -p $(DESTDIR)$(gsdatadir) -+ -mkdir -p $(DESTDIR)$(bindir) -+ -mkdir -p $(DESTDIR)$(libdir) -+ $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) -+ $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) -+ $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR) -+ $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME) -+ ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME) -+ $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) -+ ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) - - soinstall: install-so install-scripts install-data - -Only in ghostscript-8.54/src: unix-dll.mak.orig -diff -ur ghostscript-8.54.orig/src/unixinst.mak ghostscript-8.54/src/unixinst.mak ---- ghostscript-8.54.orig/src/unixinst.mak 2006-05-23 19:59:45.000000000 +0200 -+++ ghostscript-8.54/src/unixinst.mak 2006-05-23 20:39:35.000000000 +0200 -@@ -25,17 +25,17 @@ - # rules, just in case bindir or scriptdir is a subdirectory of any of these. - - install-exec: STDDIRS $(GS_XE) -- -mkdir -p $(datadir) -- -mkdir -p $(gsdir) -- -mkdir -p $(gsdatadir) -- -mkdir -p $(bindir) -- $(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS) -+ -mkdir -p $(DESTDIR)$(datadir) -+ -mkdir -p $(DESTDIR)$(gsdir) -+ -mkdir -p $(DESTDIR)$(gsdatadir) -+ -mkdir -p $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) $(GS_XE) $(DESTDIR)$(bindir)/$(GS) - - install-scripts: $(PSLIBDIR)/gsnd -- -mkdir -p $(datadir) -- -mkdir -p $(gsdir) -- -mkdir -p $(gsdatadir) -- -mkdir -p $(scriptdir) -+ -mkdir -p $(DESTDIR)$(datadir) -+ -mkdir -p $(DESTDIR)$(gsdir) -+ -mkdir -p $(DESTDIR)$(gsdatadir) -+ -mkdir -p $(DESTDIR)$(scriptdir) - $(SH) -c 'for f in \ - gsbj gsdj gsdj500 gslj gslp gsnd \ - bdftops dumphint dvipdf eps2eps font2c \ -@@ -44,7 +44,7 @@ - fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\ - do if ( test -f $(PSLIBDIR)/$$f ); then \ - (cat $(PSLIBDIR)/$$f | sed -e "s/GS_EXECUTABLE=[^ \t]*/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \ -- $(INSTALL_PROGRAM) $(PSOBJDIR)/$$f $(scriptdir)/$$f; \ -+ $(INSTALL_PROGRAM) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ - fi;\ - done' - -@@ -59,10 +59,10 @@ - # one file from each subdirectory just as a sanity check. - - install-libdata: -- -mkdir -p $(datadir) -- -mkdir -p $(gsdir) -- -mkdir -p $(gsdatadir) -- -mkdir -p $(gsdatadir)/lib -+ -mkdir -p $(DESTDIR)$(datadir) -+ -mkdir -p $(DESTDIR)$(gsdir) -+ -mkdir -p $(DESTDIR)$(gsdatadir) -+ -mkdir -p $(DESTDIR)$(gsdatadir)/lib - $(SH) -c 'for f in \ - $(EXTRA_INIT_FILES) Fontmap.GS \ - ht_ccsto.ps \ -@@ -78,24 +78,24 @@ - viewpcx.ps viewpbm.ps viewps2a.ps \ - winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \ - pdf2dsc.ps pdfopt.ps ;\ -- do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(gsdatadir)/lib; fi;\ -+ do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(DESTDIR)$(gsdatadir)/lib; fi;\ - done' - $(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps;\ -- do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\ -+ do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\ - done' - $(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd $(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\ -- do $(INSTALL_DATA) $$f $(gsdatadir)/lib ;\ -+ do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\ - done' - - # install the default resource files - # copy in every category (directory) but CVS - RES_CATEGORIES=`ls $(PSRESDIR) | grep -v CVS` - install-resdata: $(PSRESDIR)/Decoding/Unicode -- -mkdir -p $(datadir) -- -mkdir -p $(gsdir) -- -mkdir -p $(gsdatadir)/Resource -+ -mkdir -p $(DESTDIR)$(datadir) -+ -mkdir -p $(DESTDIR)$(gsdir) -+ -mkdir -p $(DESTDIR)$(gsdatadir)/Resource - $(SH) -c 'for dir in $(RES_CATEGORIES); do \ -- rdir=$(gsdatadir)/Resource/$$dir ; \ -+ rdir=$(DESTDIR)$(gsdatadir)/Resource/$$dir ; \ - test -d $$rdir || mkdir -p $$rdir ; \ - for file in $(PSRESDIR)/$$dir/*; do \ - if test -f $$file; then $(INSTALL_DATA) $$file $$rdir ; fi \ -@@ -119,9 +119,9 @@ - Source.htm Testing.htm Unix-lpr.htm \ - Use.htm Xfonts.htm - install-doc: $(PSDOCDIR)/News.htm -- -mkdir -p $(docdir) -+ -mkdir -p $(DESTDIR)$(docdir) - $(SH) -c 'for f in $(DOC_PAGES) ;\ -- do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(docdir); fi;\ -+ do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(DESTDIR)$(docdir); fi;\ - done' - - # install the man pages for each locale -@@ -130,9 +130,9 @@ - MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13 - MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj - install-man: $(PSMANDIR)/gs.1 -- $(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)' -+ $(SH) -c 'test -d $(DESTDIR)$(mandir) || mkdir -p $(DESTDIR)$(mandir)' - $(SH) -c 'for d in $(MAN_LCDIRS) ;\ -- do man1dir=$(mandir)/$$d/man$(man1ext) ;\ -+ do man1dir=$(DESTDIR)$(mandir)/$$d/man$(man1ext) ;\ - ( test -d $$man1dir || mkdir -p $$man1dir ) ;\ - for f in $(PSMANDIR)/$$d/*.1 ;\ - do $(INSTALL_DATA) $$f $$man1dir ;\ -@@ -159,10 +159,10 @@ - - # install the example files - install-examples: -- -mkdir -p $(exdir) -+ -mkdir -p $(DESTDIR)$(exdir) - for f in \ - alphabet.ps annots.pdf chess.ps colorcir.ps doretree.ps escher.ps \ - golfer.eps grayalph.ps snowflak.ps tiger.eps vasarely.ps waterfal.ps \ - ridt91.eps ;\ -- do $(INSTALL_DATA) $(PSEXDIR)/$$f $(exdir) ;\ -+ do $(INSTALL_DATA) $(PSEXDIR)/$$f $(DESTDIR)$(exdir) ;\ - done -Only in ghostscript-8.54/src: unixinst.mak.orig -Only in ghostscript-8.54/src: unixinst.mak.rej diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-gtk2.patch b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-gtk2.patch deleted file mode 100644 index 6a70be4c34d3..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-gtk2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- espgs-8.15rc3/src/unix-dll.mak.gtk2 2005-01-19 04:08:41.000000000 +0000 -+++ espgs-8.15rc3/src/unix-dll.mak 2005-06-03 12:31:56.000000000 +0100 -@@ -67,7 +67,7 @@ - # Build the small Ghostscript loaders, with Gtk+ and without - - $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c -- $(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs` -+ $(GLCC) -g `pkg-config gtk+-2.0 --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config gtk+-2.0 --libs` - - $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c - $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-ps2epsi-afpl.diff b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-ps2epsi-afpl.diff deleted file mode 100644 index 63e499dbfaba..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-ps2epsi-afpl.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ghostscript-8.53/lib/ps2epsi.orig 2006-04-03 18:22:05.000000000 +0200 -+++ ghostscript-8.53/lib/ps2epsi 2006-04-03 18:23:00.000000000 +0200 -@@ -62,8 +62,8 @@ - BEGINEPS - - cat "${infile}" | --sed -e '/^%%BeginPreview:/,/^%%EndPreview[^!-~]*$/d' -e '/^%!PS-Adobe/d'\ -- -e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d' -+sed -e '/^%%BeginPreview:/,/^%%EndPreview[^!-\~]*$/d' -e '/^%!PS-Adobe/d'\ -+ -e '/^%%[A-Za-z][A-Za-z]*[^!-\~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d' - - cat << ENDEPS - %%Trailer diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-rinkj.patch b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-rinkj.patch deleted file mode 100644 index ef309d92ce56..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-rinkj.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ghostscript-8.54.orig/src/gdevrinkj.c 2006-03-13 17:18:19.000000000 +0100 -+++ ghostscript-8.54/src/gdevrinkj.c 2006-05-18 09:38:00.000000000 +0200 -@@ -214,6 +214,7 @@ - /* DeviceN device specific parameters */ - RINKJ_DEVICE_CMYK, /* Color model */ - 8, /* Bits per color - must match ncomp, depth, etc. above */ -+ 0, - (&DeviceCMYKComponents), /* Names of color model colorants */ - 4, /* Number colorants for CMYK */ - {0}, /* SeparationNames */ -@@ -757,7 +758,7 @@ - * number if the name is found. It returns a negative value if not found. - */ - private int --rinkj_get_color_comp_index(const gx_device * dev, const char * pname, int name_size, int src_index) -+rinkj_get_color_comp_index(gx_device * dev, const char * pname, int name_size, int src_index) - { - /* TO_DO_DEVICEN This routine needs to include the effects of the SeparationOrder array */ - const fixed_colorant_names_list * list = ((const rinkj_device *)dev)->std_colorant_names; diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-segfault.patch b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-segfault.patch deleted file mode 100644 index 2c1beb591e8b..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.54-segfault.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gs/src/gxfcopy.c -=================================================================== ---- gs/src/gxfcopy.c (revision 6764) -+++ gs/src/gxfcopy.c (working copy) -@@ -2391,7 +2391,7 @@ - a[j++] = &cfdata->names[i]; - } - } -- qsort(a, cfdata->num_glyphs, sizeof(int), compare_glyph_names); -+ qsort(a, cfdata->num_glyphs, sizeof(*a), compare_glyph_names); - for (; j >= 0; j--) - cfdata->glyphs[j].order_index = a[j] - cfdata->names; - gs_free_object(memory, a, "order_font_data"); diff --git a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.57-cups-lib.patch b/app-text/ghostscript-gpl/files/ghostscript-afpl-8.57-cups-lib.patch deleted file mode 100644 index 6712311416c6..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-afpl-8.57-cups-lib.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -u lib/gs_init.ps.orig lib/gs_init.ps ---- lib/gs_init.ps.orig 2006-02-21 22:29:07.000000000 +0100 -+++ lib/gs_init.ps 2006-05-17 22:31:11.000000000 +0200 -@@ -152,6 +152,7 @@ - currentdict /NOFONTPATH known /NOFONTPATH exch def - currentdict /NOGC known /NOGC exch def - currentdict /NOINTERPOLATE .knownget { /INTERPOLATE exch not def } if -+currentdict /NOMEDIAATTRS known /NOMEDIAATTRS exch def - currentdict /NOOUTERSAVE known /NOOUTERSAVE exch def - currentdict /NOPAGEPROMPT known /NOPAGEPROMPT exch def - currentdict /NOPAUSE known /NOPAUSE exch def -diff -u lib/gs_setpd.ps.orig lib/gs_setpd.ps ---- lib/gs_setpd.ps.orig 2005-12-28 20:56:24.000000000 +0100 -+++ lib/gs_setpd.ps 2006-05-17 22:33:54.000000000 +0200 -@@ -375,21 +375,42 @@ - } bind - .dicttomark readonly def - --% Define the keys used in input attribute matching. --/.inputattrkeys [ -- /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet /ManualFeed -- % The following are documented in Adobe's supplement for v2017. -- /LeadingEdge /MediaClass --] readonly def --% Define other keys used in media selection. --/.inputselectionkeys [ -- /MediaPosition /Orientation --] readonly def -- --% Define the keys used in output attribute matching. --/.outputattrkeys [ -- /OutputType --] readonly def -+% M. Sweet, Easy Software Products: -+% -+% Define NOMEDIAATTRS to turn off the default (but unimplementable) media -+% selection policies for setpagedevice. This is used by CUPS to support -+% the standard Adobe media attributes. -+NOMEDIAATTRS { -+ % Define only PageSize for input attribute matching. -+ /.inputattrkeys [ -+ /PageSize -+ ] readonly def -+ % Define no other keys used in media selection. -+ /.inputselectionkeys [ -+ /noInputSelectionsKeys -+ ] readonly def -+ -+ % Define no keys used in output attribute matching. -+ /.outputattrkeys [ -+ /noOutputAttrKeys -+ ] readonly def -+} { -+ % Define the keys used in input attribute matching. -+ /.inputattrkeys [ -+ /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet /ManualFeed -+ % The following are documented in Adobe's supplement for v2017. -+ /LeadingEdge /MediaClass -+ ] readonly def -+ % Define other keys used in media selection. -+ /.inputselectionkeys [ -+ /MediaPosition /Orientation -+ ] readonly def -+ -+ % Define the keys used in output attribute matching. -+ /.outputattrkeys [ -+ /OutputType -+ ] readonly def -+} ifelse - - % Define all the parameters that should always be copied to the merged - % dictionary. -@@ -499,11 +526,23 @@ - % They are expected to consume the top 2 operands. - % NOTE: we currently treat all values other than 0, 1, or 7 (for PageSize) - % the same as 0, i.e., we signal an error. -+% -+% M. Sweet, Easy Software Products: -+% -+% Define NOMEDIAATTRS to turn off the default (but unimplementable) media -+% selection policies for setpagedevice. This is used by CUPS to support -+% the standard Adobe media attributes. -+ SETPDDEBUG { (Rolling back.) = pstack flush } if - 0 { % Set errorinfo and signal a configurationerror. -- pop dup 4 index exch get 2 array astore -- $error /errorinfo 3 -1 roll put -- cleartomark -+ NOMEDIAATTRS { -+ % NOMEDIAATTRS means that the default policy is 7... -+ pop 2 index exch 7 put -+ } { -+ pop dup 4 index exch get 2 array astore -+ $error /errorinfo 3 -1 roll put -+ cleartomark - /setpagedevice .systemvar /configurationerror signalerror -+ } ifelse - } bind - 1 { % Roll back the failed request to its previous status. - SETPDDEBUG { (Rolling back.) = pstack flush } if - diff --git a/app-text/ghostscript-gpl/files/ghostscript-esp-8.15.2-FAPIcidfmap.cjk b/app-text/ghostscript-gpl/files/ghostscript-esp-8.15.2-FAPIcidfmap.cjk deleted file mode 100644 index b66760b9c96c..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-esp-8.15.2-FAPIcidfmap.cjk +++ /dev/null @@ -1,29 +0,0 @@ -% FAPIcidfmap.zh_CN -/BousungEG-Light-GB << /Path (/usr/share/fonts/arphicfonts/gbsn00lp.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; -/GBZenKai-Medium << /Path (/usr/share/fonts/arphicfonts/gkai00mp.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; -/MSungGBK-Light << /Path (/usr/share/fonts/arphicfonts/gbsn00lp.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; -/Adobe-GB1 << /Path (/usr/share/fonts/arphicfonts/gbsn00lp.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(GB1) 4] >> ; - -% FAPIcidfmap.zh_TW -/ZenKai-Medium << /Path (/usr/share/fonts/arphicfonts/gkai00mp.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; -/ShanHeiSun-Light << /Path (/usr/share/fonts/arphicfonts/gbsn00lp.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; -/Adobe-CNS1 << /Path (/usr/share/fonts/arphicfonts/gbsn00lp.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(CNS1) 4] >> ; - -% FAPIcidfmap.ja -/Kochi-Mincho << /Path (/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; -/Kochi-Gothic << /Path (/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; -/Adobe-Japan1 << /Path (/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; -/Adobe-Japan2 << /Path (/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan2) 0] >> ; -/Ryumin-Light << /Path (/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; -/GothicBBB-Medium << /Path (/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Japan1) 6] >> ; - -% FAPIcidfmap.ko -/Baekmuk-Batang << /Path (/usr/share/fonts/baekmuk-fonts/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; -/Baekmuk-Dotum << /Path (/usr/share/fonts/baekmuk-fonts/dotum.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; -/Baekmuk-Gulim << /Path (/usr/share/fonts/baekmuk-fonts/gulim.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; -/Baekmuk-Headline << /Path (/usr/share/fonts/baekmuk-fonts/hline.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; -/Baekmuk-Batang-Regular << /Path (/usr/share/fonts/baekmuk-fonts/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; -/Baekmuk-Dotum-Regular << /Path (/usr/share/fonts/baekmuk-fonts/dotum.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; -/Baekmuk-Gulim-Regular << /Path (/usr/share/fonts/baekmuk-fonts/gulim.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; -/Baekmuk-Headline-Regular << /Path (/usr/share/fonts/baekmuk-fonts/hline.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; -/Adobe-Korea1 << /Path (/usr/share/fonts/baekmuk-fonts/batang.ttf) /CIDFontType 0 /FAPI /FreeType /CSI [(Korea1) 2] >> ; diff --git a/app-text/ghostscript-gpl/files/ghostscript-esp-8.15.2-cidfmap.cjk b/app-text/ghostscript-gpl/files/ghostscript-esp-8.15.2-cidfmap.cjk deleted file mode 100644 index 04e4fd51e63f..000000000000 --- a/app-text/ghostscript-gpl/files/ghostscript-esp-8.15.2-cidfmap.cjk +++ /dev/null @@ -1,35 +0,0 @@ -% cidfmap.zh_CN -/BousungEG-Light-GB << /FileType /TrueType /Path (/usr/share/fonts/arphicfonts/gbsn00lp.ttf) /CSI [(GB1) 4] >> ; -/GBZenKai-Medium << /FileType /TrueType /Path (/usr/share/fonts/arphicfonts/gkai00mp.ttf) /CSI [(GB1) 4] >> ; -/MSungGBK-Light /BousungEG-Light-GB ; -/Adobe-GB1 /BousungEG-Light-GB ; - -% cidfmap.zh_TW -/ZenKai-Medium << /FileType /TrueType /Path (/usr/share/fonts/arphicfonts/gkai00mp.ttf) /CSI [(CNS1) 4] >> ; -/ShanHeiSun-Light << /FileType /TrueType /Path (/usr/share/fonts/arphicfonts/gbsn00lp.ttf) /CSI [(CNS1) 4] >> ; -/Adobe-CNS1 /ShanHeiSun-Light ; - -% cidfmap.ja -/Kochi-Gothic << /FileType /TrueType /Path (/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf) /CSI [(Japan1) 6] >> ; -/Kochi-Gothic-Regular /Kochi-Gothic ; -/Kochi-Gothic-JaH << /FileType /TrueType /Path (/usr/share/fonts/kochi-substitute/kochi-gothic-subst.ttf) /CSI [(Japan2) 0] >> ; -/Kochi-Gothic-Regular-JaH /Kochi-Gothic-JaH ; -/Kochi-Mincho << /FileType /TrueType /Path (/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf) /CSI [(Japan1) 6] >> ; -/Kochi-Mincho-Regular /Kochi-Mincho ; -/Kochi-Mincho-JaH << /FileType /TrueType /Path (/usr/share/fonts/kochi-substitute/kochi-mincho-subst.ttf) /CSI [(Japan2) 0] >> ; -/Kochi-Mincho-Regular-JaH /Kochi-Mincho-JaH ; -/Ryumin-Light /Kochi-Mincho ; -/GothicBBB-Medium /Kochi-Gothic ; -/Adobe-Japan1 /Kochi-Gothic ; -/Adobe-Japan2 /Kochi-Gothic-JaH ; - -% cidfmap.ko -/Baekmuk-Batang << /FileType /TrueType /Path (/usr/share/fonts/baekmuk-fonts/batang.ttf) /CSI [(Korea1) 2] >> ; -/Baekmuk-Batang-Regular /Baekmuk-Batang ; -/Baekmuk-Dotum << /FileType /TrueType /Path (/usr/share/fonts/baekmuk-fonts/dotum.ttf) /CSI [(Korea1) 2] >> ; -/Baekmuk-Dotum-Regular /Baekmuk-Dotum ; -/Baekmuk-Gulim << /FileType /TrueType /Path (/usr/share/fonts/baekmuk-fonts/gulim.ttf) /CSI [(Korea1) 2] >> ; -/Baekmuk-Gulim-Regular /Baekmuk-Gulim ; -/Baekmuk-Headline << /FileType /TrueType /Path (/usr/share/fonts/baekmuk-fonts/hline.ttf) /CSI [(Korea1) 2] >> ; -/Baekmuk-Headline-Regular /Baekmuk-Headline ; -/Adobe-Korea1 /Baekmuk-Batang ; |