From 1a8a092d9fefcbd7f960c82c59802c61807867a6 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Fri, 17 Jun 2016 23:28:04 +0000 Subject: Rename all files containing a : in their filename. While there, run make makepatch on affected ports, and rename patches accordingly. Sponsored by: Absolight --- .../files/patch-Resource-Init-FAPIcidfmap | 62 ------ .../files/patch-Resource-Init-FAPIconfig | 10 - .../files/patch-Resource-Init-cidfmap | 67 ------- .../files/patch-Resource-Init-gs_statd.ps | 15 -- .../files/patch-Resource-Init-gs_ttf.ps | 28 --- .../files/patch-Resource-Init-pdf_font.ps | 15 -- .../files/patch-Resource_Init_FAPIcidfmap | 62 ++++++ .../files/patch-Resource_Init_FAPIconfig | 10 + .../files/patch-Resource_Init_cidfmap | 70 +++++++ .../files/patch-Resource_Init_gs__statd.ps | 15 ++ .../files/patch-Resource_Init_gs__ttf.ps | 28 +++ .../files/patch-Resource_Init_pdf__font.ps | 15 ++ .../ghostscript9-base/files/patch-base-Makefile.in | 141 ------------- .../files/patch-base-configure.ac | 38 ---- .../ghostscript9-base/files/patch-base-contrib.mak | 8 - print/ghostscript9-base/files/patch-base-devs.mak | 24 --- .../ghostscript9-base/files/patch-base-gdevl256.c | 15 -- .../ghostscript9-base/files/patch-base-gdevperm.c | 19 -- .../ghostscript9-base/files/patch-base-gdevplib.c | 14 -- .../ghostscript9-base/files/patch-base-gdevvglb.c | 15 -- print/ghostscript9-base/files/patch-base-gp_unix.c | 47 ----- print/ghostscript9-base/files/patch-base-gs.mak | 11 -- .../files/patch-base-gsicc__create.c | 10 + .../files/patch-base-gsicc_create.c | 10 - .../ghostscript9-base/files/patch-base-gsmalloc.c | 11 -- print/ghostscript9-base/files/patch-base-gxobj.h | 18 -- .../files/patch-base-openjpeg.mak | 11 -- .../files/patch-base-unix-dll.mak | 13 -- .../files/patch-base-unix-gcc.mak | 212 -------------------- .../files/patch-base-unixinst.mak | 20 -- .../ghostscript9-base/files/patch-base_Makefile.in | 141 +++++++++++++ .../files/patch-base_configure.ac | 38 ++++ .../ghostscript9-base/files/patch-base_contrib.mak | 8 + print/ghostscript9-base/files/patch-base_devs.mak | 24 +++ .../ghostscript9-base/files/patch-base_gdevl256.c | 15 ++ .../ghostscript9-base/files/patch-base_gdevperm.c | 19 ++ .../ghostscript9-base/files/patch-base_gdevplib.c | 14 ++ .../ghostscript9-base/files/patch-base_gdevvglb.c | 15 ++ .../ghostscript9-base/files/patch-base_gp__unix.c | 47 +++++ print/ghostscript9-base/files/patch-base_gs.mak | 11 ++ .../ghostscript9-base/files/patch-base_gsmalloc.c | 11 ++ print/ghostscript9-base/files/patch-base_gxobj.h | 18 ++ .../files/patch-base_openjpeg.mak | 11 ++ .../files/patch-base_unix-dll.mak | 13 ++ .../files/patch-base_unix-gcc.mak | 212 ++++++++++++++++++++ .../files/patch-base_unixinst.mak | 20 ++ .../files/patch-contrib-contrib.mak | 11 -- .../files/patch-contrib__japanese__dmp_site.ps | 11 -- .../files/patch-contrib__japanese__gdevdmpr.c | 53 ----- .../files/patch-contrib_contrib.mak | 11 ++ .../files/patch-contrib_japanese_dmp__site.ps | 11 ++ .../files/patch-contrib_japanese_gdevdmpr.c | 53 +++++ .../files/patch-contrib_lips4_gdevlips.c | 18 ++ .../files/patch-contrib_lips4_gdevlips.h | 17 ++ .../ghostscript9-base/files/patch-epag-3.09_ert.c | 11 ++ .../files/patch-epag-3.09_gdevepag.c | 217 +++++++++++++++++++++ print/ghostscript9-base/files/patch-epag-ert.c | 11 -- .../ghostscript9-base/files/patch-epag__gdevepag.c | 217 --------------------- .../ghostscript9-base/files/patch-lips:gdevlips.c | 18 -- .../ghostscript9-base/files/patch-lips:gdevlips.h | 17 -- .../patch-openjpeg-libopenjpeg-opj_includes.h | 11 -- .../files/patch-openjpeg-libopenjpeg-opj_malloc.h | 11 -- .../patch-openjpeg_libopenjpeg_opj__includes.h | 11 ++ .../files/patch-openjpeg_libopenjpeg_opj__malloc.h | 11 ++ print/ghostscript9-base/files/patch-psi-zicc.c | 12 -- print/ghostscript9-base/files/patch-psi_zicc.c | 12 ++ 66 files changed, 1199 insertions(+), 1196 deletions(-) delete mode 100644 print/ghostscript9-base/files/patch-Resource-Init-FAPIcidfmap delete mode 100644 print/ghostscript9-base/files/patch-Resource-Init-FAPIconfig delete mode 100644 print/ghostscript9-base/files/patch-Resource-Init-cidfmap delete mode 100644 print/ghostscript9-base/files/patch-Resource-Init-gs_statd.ps delete mode 100644 print/ghostscript9-base/files/patch-Resource-Init-gs_ttf.ps delete mode 100644 print/ghostscript9-base/files/patch-Resource-Init-pdf_font.ps create mode 100644 print/ghostscript9-base/files/patch-Resource_Init_FAPIcidfmap create mode 100644 print/ghostscript9-base/files/patch-Resource_Init_FAPIconfig create mode 100644 print/ghostscript9-base/files/patch-Resource_Init_cidfmap create mode 100644 print/ghostscript9-base/files/patch-Resource_Init_gs__statd.ps create mode 100644 print/ghostscript9-base/files/patch-Resource_Init_gs__ttf.ps create mode 100644 print/ghostscript9-base/files/patch-Resource_Init_pdf__font.ps delete mode 100644 print/ghostscript9-base/files/patch-base-Makefile.in delete mode 100644 print/ghostscript9-base/files/patch-base-configure.ac delete mode 100644 print/ghostscript9-base/files/patch-base-contrib.mak delete mode 100644 print/ghostscript9-base/files/patch-base-devs.mak delete mode 100644 print/ghostscript9-base/files/patch-base-gdevl256.c delete mode 100644 print/ghostscript9-base/files/patch-base-gdevperm.c delete mode 100644 print/ghostscript9-base/files/patch-base-gdevplib.c delete mode 100644 print/ghostscript9-base/files/patch-base-gdevvglb.c delete mode 100644 print/ghostscript9-base/files/patch-base-gp_unix.c delete mode 100644 print/ghostscript9-base/files/patch-base-gs.mak create mode 100644 print/ghostscript9-base/files/patch-base-gsicc__create.c delete mode 100644 print/ghostscript9-base/files/patch-base-gsicc_create.c delete mode 100644 print/ghostscript9-base/files/patch-base-gsmalloc.c delete mode 100644 print/ghostscript9-base/files/patch-base-gxobj.h delete mode 100644 print/ghostscript9-base/files/patch-base-openjpeg.mak delete mode 100644 print/ghostscript9-base/files/patch-base-unix-dll.mak delete mode 100644 print/ghostscript9-base/files/patch-base-unix-gcc.mak delete mode 100644 print/ghostscript9-base/files/patch-base-unixinst.mak create mode 100644 print/ghostscript9-base/files/patch-base_Makefile.in create mode 100644 print/ghostscript9-base/files/patch-base_configure.ac create mode 100644 print/ghostscript9-base/files/patch-base_contrib.mak create mode 100644 print/ghostscript9-base/files/patch-base_devs.mak create mode 100644 print/ghostscript9-base/files/patch-base_gdevl256.c create mode 100644 print/ghostscript9-base/files/patch-base_gdevperm.c create mode 100644 print/ghostscript9-base/files/patch-base_gdevplib.c create mode 100644 print/ghostscript9-base/files/patch-base_gdevvglb.c create mode 100644 print/ghostscript9-base/files/patch-base_gp__unix.c create mode 100644 print/ghostscript9-base/files/patch-base_gs.mak create mode 100644 print/ghostscript9-base/files/patch-base_gsmalloc.c create mode 100644 print/ghostscript9-base/files/patch-base_gxobj.h create mode 100644 print/ghostscript9-base/files/patch-base_openjpeg.mak create mode 100644 print/ghostscript9-base/files/patch-base_unix-dll.mak create mode 100644 print/ghostscript9-base/files/patch-base_unix-gcc.mak create mode 100644 print/ghostscript9-base/files/patch-base_unixinst.mak delete mode 100644 print/ghostscript9-base/files/patch-contrib-contrib.mak delete mode 100644 print/ghostscript9-base/files/patch-contrib__japanese__dmp_site.ps delete mode 100644 print/ghostscript9-base/files/patch-contrib__japanese__gdevdmpr.c create mode 100644 print/ghostscript9-base/files/patch-contrib_contrib.mak create mode 100644 print/ghostscript9-base/files/patch-contrib_japanese_dmp__site.ps create mode 100644 print/ghostscript9-base/files/patch-contrib_japanese_gdevdmpr.c create mode 100644 print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.c create mode 100644 print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.h create mode 100644 print/ghostscript9-base/files/patch-epag-3.09_ert.c create mode 100644 print/ghostscript9-base/files/patch-epag-3.09_gdevepag.c delete mode 100644 print/ghostscript9-base/files/patch-epag-ert.c delete mode 100644 print/ghostscript9-base/files/patch-epag__gdevepag.c delete mode 100644 print/ghostscript9-base/files/patch-lips:gdevlips.c delete mode 100644 print/ghostscript9-base/files/patch-lips:gdevlips.h delete mode 100644 print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_includes.h delete mode 100644 print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_malloc.h create mode 100644 print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__includes.h create mode 100644 print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__malloc.h delete mode 100644 print/ghostscript9-base/files/patch-psi-zicc.c create mode 100644 print/ghostscript9-base/files/patch-psi_zicc.c (limited to 'print/ghostscript9-base') diff --git a/print/ghostscript9-base/files/patch-Resource-Init-FAPIcidfmap b/print/ghostscript9-base/files/patch-Resource-Init-FAPIcidfmap deleted file mode 100644 index 2c6bf45839b2..000000000000 --- a/print/ghostscript9-base/files/patch-Resource-Init-FAPIcidfmap +++ /dev/null @@ -1,62 +0,0 @@ ---- Resource/Init/FAPIcidfmap.orig 2006-06-01 00:29:52.000000000 +0900 -+++ Resource/Init/FAPIcidfmap 2009-05-15 03:27:31.000000000 +0900 -@@ -29,4 +29,59 @@ - % - % /Ryumin-Medium << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; - % /HeiseiKakuGo-W5 << /Path (F:/WIN2000/Fonts/BATANG.TTC) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; -+%/Ryumin-Light << /Path (Ryumin-Light) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; -+%/GothicBBB-Medium << /Path (GothicBBB-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; -+ -+/Ryumin-Medium /Ryumin-Light ; -+/Ryumin-Regular /Ryumin-Light ; -+/RyuminPro-Light /Ryumin-Light ; -+ -+/GothicBBBPro-Medium /GothicBBB-Medium ; -+ -+/KozGoPro-Bold /GothicBBB-Medium ; -+/KozGoPro-Heavy /GothicBBB-Medium ; -+/KozGoPro-Medium /GothicBBB-Medium ; -+/KozGoPro-Regular /GothicBBB-Medium ; -+ -+/KozMinPro-Bold /Ryumin-Light ; -+/KozMinPro-Light /Ryumin-Light ; -+/KozMinPro-Medium /Ryumin-Light ; -+/KozMinPro-Regular /Ryumin-Light ; -+ -+/HiraKakuPro-W3 /GothicBBB-Medium ; -+/HiraKakuPro-W6 /GothicBBB-Medium ; -+/HiraKakuStd-W8 /GothicBBB-Medium ; -+ -+/HiraMaruPro-W4 /GothicBBB-Medium ; - -+/HiraMinPro-W3 /Ryumin-Light ; -+ -+/HeiseiMin-W3 /Ryumin-Light ; -+/HeiseiKakuGo-W5 /GothicBBB-Medium ; -+ -+/FutoMinA101-Bold /Ryumin-Light ; -+/FutoMinA101Pro-Bold /Ryumin-Light ; -+/FutoGoB101-Bold /GothicBBB-Medium ; -+/FutoGoB101Pro-Bold /GothicBBB-Medium ; -+ -+/Jun101-Light /Ryumin-Light ; -+/Jun101Pro-Light /Ryumin-Light ; -+ -+/MidashiGo-MB31 /GothicBBB-Medium ; -+/MidashiGoPro-MB31 /GothicBBB-Medium ; -+ -+/MidashiMinPro-MA31 /Ryumin-Light ; -+ -+%/Munhwa-Regular /Munhwa-Regular ; -+%/MunhwaGothic-Regular /MunhwaGothic-Regular ; -+%/Munhwa-Bold /Munhwa-Bold ; -+%/MunhwaGothic-Bold /MunhwaGothic-Bold ; -+ -+/HYGoThic-Medium /MunhwaGothic-Regular ; -+/HYSMyeongJo-Medium /Munhwa-Regular ; -+/HYRGoThic-Medium /MunhwaGothic-Bold ; -+ -+%/STHeiti-Regular << /Path (STHeiti-Regular) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ; -+%/STSong-Light << /Path (STSong-Light) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ; -+%/MSung-Light << /Path (MSung-Light) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ; -+%/MHei-Medium << /Path (MHei-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ; diff --git a/print/ghostscript9-base/files/patch-Resource-Init-FAPIconfig b/print/ghostscript9-base/files/patch-Resource-Init-FAPIconfig deleted file mode 100644 index e2ff81b58276..000000000000 --- a/print/ghostscript9-base/files/patch-Resource-Init-FAPIconfig +++ /dev/null @@ -1,10 +0,0 @@ ---- Resource/Init/FAPIconfig.orig 2010-04-13 21:50:40.000000000 +0900 -+++ Resource/Init/FAPIconfig 2011-05-17 18:25:59.000000000 +0900 -@@ -12,3 +12,7 @@ - % and CID font resource files. - % "Embedded fonts" are fonts and CID fonts being embedded into a document. - -+/FontPath () % A default directory for FAPI-handled font files path in FAPIfontmap. -+/CIDFontPath () % A default directory for FAPI-handled CID font files path in FAPIcidfmap. -+/HookDiskFonts [] % FontType values for disk PS fonts to be redirected to FAPI. -+/HookEmbeddedFonts [] % FontType values for embedded PS fonts to be redirected to FAPI. diff --git a/print/ghostscript9-base/files/patch-Resource-Init-cidfmap b/print/ghostscript9-base/files/patch-Resource-Init-cidfmap deleted file mode 100644 index 8ed71789f4fe..000000000000 --- a/print/ghostscript9-base/files/patch-Resource-Init-cidfmap +++ /dev/null @@ -1,67 +0,0 @@ ---- Resource/Init/cidfmap.orig 2008-08-08 13:22:38.000000000 +0900 -+++ Resource/Init/cidfmap 2009-12-20 03:03:17.000000000 +0900 -@@ -26,3 +26,64 @@ - % /ShinGo-Bold /HeiseiKakuGo-W5 ; - % /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ; - % -+/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 6] >> ; -+/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 6] >> ; -+ -+/Ryumin-Medium /Ryumin-Light ; -+/Ryumin-Regular /Ryumin-Light ; -+/RyuminPro-Light /Ryumin-Light ; -+ -+/GothicBBBPro-Medium /GothicBBB-Medium ; -+ -+/KozGoPro-Bold /GothicBBB-Medium ; -+/KozGoPro-Heavy /GothicBBB-Medium ; -+/KozGoPro-Medium /GothicBBB-Medium ; -+/KozGoPro-Regular /GothicBBB-Medium ; -+ -+/KozMinPro-Bold /Ryumin-Light ; -+/KozMinPro-Light /Ryumin-Light ; -+/KozMinPro-Medium /Ryumin-Light ; -+/KozMinPro-Regular /Ryumin-Light ; -+ -+/HiraKakuPro-W3 /GothicBBB-Medium ; -+/HiraKakuPro-W6 /GothicBBB-Medium ; -+/HiraKakuStd-W8 /GothicBBB-Medium ; -+ -+/HiraMaruPro-W4 /GothicBBB-Medium ; -+ -+/HiraMinPro-W3 /Ryumin-Light ; -+ -+/HeiseiMin-W3 /Ryumin-Light ; -+/HeiseiKakuGo-W5 /GothicBBB-Medium ; -+ -+/FutoMinA101-Bold /Ryumin-Light ; -+/FutoMinA101Pro-Bold /Ryumin-Light ; -+/FutoGoB101-Bold /GothicBBB-Medium ; -+/FutoGoB101Pro-Bold /GothicBBB-Medium ; -+ -+/Jun101-Light /Ryumin-Light ; -+/Jun101Pro-Light /Ryumin-Light ; -+ -+/MidashiGo-MB31 /GothicBBB-Medium ; -+/MidashiGoPro-MB31 /GothicBBB-Medium ; -+ -+/MidashiMinPro-MA31 /Ryumin-Light ; -+ -+/MS-Mincho /Ryumin-Light ; -+/MS-PMincho /Ryumin-Light ; -+/MS-Gothic /GothicBBB-Medium ; -+/MS-PGothic /GothicBBB-Medium ; -+ -+%/Munhwa-Regular /Munhwa-Regular ; -+%/MunhwaGothic-Regular /MunhwaGothic-Regular ; -+%/Munhwa-Bold /Munhwa-Bold ; -+%/MunhwaGothic-Bold /MunhwaGothic-Bold ; -+ -+/HYGoThic-Medium /MunhwaGothic-Regular ; -+/HYSMyeongJo-Medium /Munhwa-Regular ; -+/HYRGoThic-Medium /MunhwaGothic-Bold ; -+ -+/STHeiti-Regular << /FileType /TrueType /Path (STHeiti-Regular) /SubfontID 0 /CSI [(CNS1) 5] >> ; -+/STSong-Light << /FileType /TrueType /Path (STSong-Light) /SubfontID 0 /CSI [(GB1) 5] >> ; -+/MSung-Light << /FileType /TrueType /Path (MSung-Light) /SubfontID 0 /CSI [(CNS1) 5] >> ; -+/MHei-Medium << /FileType /TrueType /Path (MHei-Medium) /SubfontID 0 /CSI [(GB1) 5] >> ; diff --git a/print/ghostscript9-base/files/patch-Resource-Init-gs_statd.ps b/print/ghostscript9-base/files/patch-Resource-Init-gs_statd.ps deleted file mode 100644 index a9996b623de8..000000000000 --- a/print/ghostscript9-base/files/patch-Resource-Init-gs_statd.ps +++ /dev/null @@ -1,15 +0,0 @@ ---- Resource/Init/gs_statd.ps.orig 2011-05-24 04:43:02.000000000 +0900 -+++ Resource/Init/gs_statd.ps 2011-05-24 04:43:31.000000000 +0900 -@@ -125,6 +125,12 @@ - /ANSI_D {1585 2448 //.setpagesize exec} bind def - /ANSI_E {2448 3168 //.setpagesize exec} bind def - /ANSI_F {2016 2880 //.setpagesize exec} bind def -+ /postcard {284 419 //.setpagesize exec} bind def -+ /dbl_postcard {419 568 //.setpagesize exec} bind def -+ /Executive {522 756 //.setpagesize exec} bind def -+ /jenv_you4 {298 666 //.setpagesize exec} bind def -+ /jenv_you2 {324 460 //.setpagesize exec} bind def -+ /jenv_kaku2 {682 942 //.setpagesize exec} bind def - %END SIZES - currentdict end - dup /.setpagesize .undef diff --git a/print/ghostscript9-base/files/patch-Resource-Init-gs_ttf.ps b/print/ghostscript9-base/files/patch-Resource-Init-gs_ttf.ps deleted file mode 100644 index 19fc072bd4e2..000000000000 --- a/print/ghostscript9-base/files/patch-Resource-Init-gs_ttf.ps +++ /dev/null @@ -1,28 +0,0 @@ ---- Resource/Init/gs_ttf.ps.orig 2011-05-24 04:46:01.000000000 +0900 -+++ Resource/Init/gs_ttf.ps 2011-05-24 04:46:22.000000000 +0900 -@@ -1029,10 +1029,21 @@ - } 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 -+% /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] diff --git a/print/ghostscript9-base/files/patch-Resource-Init-pdf_font.ps b/print/ghostscript9-base/files/patch-Resource-Init-pdf_font.ps deleted file mode 100644 index c966e57fba11..000000000000 --- a/print/ghostscript9-base/files/patch-Resource-Init-pdf_font.ps +++ /dev/null @@ -1,15 +0,0 @@ ---- Resource/Init/pdf_font.ps.orig Tue Aug 31 13:03:30 2004 -+++ Resource/Init/pdf_font.ps Wed Sep 15 19:15:00 2004 -@@ -1114,10 +1114,12 @@ - - /buildCIDType0 { % buildCIDType0 - dup /BaseFont get findCIDFont exch pop -+ addCIDmetrics /CIDFont defineresource - } bdef - - /buildCIDType2 { % buildCIDType2 - dup /BaseFont get findCIDFont exch pop -+ addCIDmetrics /CIDFont defineresource - } bdef - - /processCIDToGIDMap { % processCIDToGIDMap diff --git a/print/ghostscript9-base/files/patch-Resource_Init_FAPIcidfmap b/print/ghostscript9-base/files/patch-Resource_Init_FAPIcidfmap new file mode 100644 index 000000000000..96c2570f30c1 --- /dev/null +++ b/print/ghostscript9-base/files/patch-Resource_Init_FAPIcidfmap @@ -0,0 +1,62 @@ +--- Resource/Init/FAPIcidfmap.orig 2012-08-08 08:01:36 UTC ++++ Resource/Init/FAPIcidfmap +@@ -29,4 +29,59 @@ + % + % /Ryumin-Medium << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; + % /HeiseiKakuGo-W5 << /Path (F:/WIN2000/Fonts/BATANG.TTC) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; ++%/Ryumin-Light << /Path (Ryumin-Light) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; ++%/GothicBBB-Medium << /Path (GothicBBB-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; ++ ++/Ryumin-Medium /Ryumin-Light ; ++/Ryumin-Regular /Ryumin-Light ; ++/RyuminPro-Light /Ryumin-Light ; ++ ++/GothicBBBPro-Medium /GothicBBB-Medium ; ++ ++/KozGoPro-Bold /GothicBBB-Medium ; ++/KozGoPro-Heavy /GothicBBB-Medium ; ++/KozGoPro-Medium /GothicBBB-Medium ; ++/KozGoPro-Regular /GothicBBB-Medium ; ++ ++/KozMinPro-Bold /Ryumin-Light ; ++/KozMinPro-Light /Ryumin-Light ; ++/KozMinPro-Medium /Ryumin-Light ; ++/KozMinPro-Regular /Ryumin-Light ; ++ ++/HiraKakuPro-W3 /GothicBBB-Medium ; ++/HiraKakuPro-W6 /GothicBBB-Medium ; ++/HiraKakuStd-W8 /GothicBBB-Medium ; ++ ++/HiraMaruPro-W4 /GothicBBB-Medium ; + ++/HiraMinPro-W3 /Ryumin-Light ; ++ ++/HeiseiMin-W3 /Ryumin-Light ; ++/HeiseiKakuGo-W5 /GothicBBB-Medium ; ++ ++/FutoMinA101-Bold /Ryumin-Light ; ++/FutoMinA101Pro-Bold /Ryumin-Light ; ++/FutoGoB101-Bold /GothicBBB-Medium ; ++/FutoGoB101Pro-Bold /GothicBBB-Medium ; ++ ++/Jun101-Light /Ryumin-Light ; ++/Jun101Pro-Light /Ryumin-Light ; ++ ++/MidashiGo-MB31 /GothicBBB-Medium ; ++/MidashiGoPro-MB31 /GothicBBB-Medium ; ++ ++/MidashiMinPro-MA31 /Ryumin-Light ; ++ ++%/Munhwa-Regular /Munhwa-Regular ; ++%/MunhwaGothic-Regular /MunhwaGothic-Regular ; ++%/Munhwa-Bold /Munhwa-Bold ; ++%/MunhwaGothic-Bold /MunhwaGothic-Bold ; ++ ++/HYGoThic-Medium /MunhwaGothic-Regular ; ++/HYSMyeongJo-Medium /Munhwa-Regular ; ++/HYRGoThic-Medium /MunhwaGothic-Bold ; ++ ++%/STHeiti-Regular << /Path (STHeiti-Regular) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ; ++%/STSong-Light << /Path (STSong-Light) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ; ++%/MSung-Light << /Path (MSung-Light) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ; ++%/MHei-Medium << /Path (MHei-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ; diff --git a/print/ghostscript9-base/files/patch-Resource_Init_FAPIconfig b/print/ghostscript9-base/files/patch-Resource_Init_FAPIconfig new file mode 100644 index 000000000000..0f5469995dad --- /dev/null +++ b/print/ghostscript9-base/files/patch-Resource_Init_FAPIconfig @@ -0,0 +1,10 @@ +--- Resource/Init/FAPIconfig.orig 2012-08-08 08:01:36 UTC ++++ Resource/Init/FAPIconfig +@@ -12,3 +12,7 @@ + % and CID font resource files. + % "Embedded fonts" are fonts and CID fonts being embedded into a document. + ++/FontPath () % A default directory for FAPI-handled font files path in FAPIfontmap. ++/CIDFontPath () % A default directory for FAPI-handled CID font files path in FAPIcidfmap. ++/HookDiskFonts [] % FontType values for disk PS fonts to be redirected to FAPI. ++/HookEmbeddedFonts [] % FontType values for embedded PS fonts to be redirected to FAPI. diff --git a/print/ghostscript9-base/files/patch-Resource_Init_cidfmap b/print/ghostscript9-base/files/patch-Resource_Init_cidfmap new file mode 100644 index 000000000000..9c7c8c88e703 --- /dev/null +++ b/print/ghostscript9-base/files/patch-Resource_Init_cidfmap @@ -0,0 +1,70 @@ +--- Resource/Init/cidfmap.orig 2012-08-08 08:01:36 UTC ++++ Resource/Init/cidfmap +@@ -29,6 +29,67 @@ + % /ShinGo-Bold /HeiseiKakuGo-W5 ; + % /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ; + % /Ryumin-Medium << /FileType /TrueType /Path (windir) getenv not {(c:/windows)}if (/Fonts/BATANG.TTC)concatstrings /SubfontID 3 /CSI [(Japan1) 2] >> ; ++/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 6] >> ; ++/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 6] >> ; ++ ++/Ryumin-Medium /Ryumin-Light ; ++/Ryumin-Regular /Ryumin-Light ; ++/RyuminPro-Light /Ryumin-Light ; ++ ++/GothicBBBPro-Medium /GothicBBB-Medium ; ++ ++/KozGoPro-Bold /GothicBBB-Medium ; ++/KozGoPro-Heavy /GothicBBB-Medium ; ++/KozGoPro-Medium /GothicBBB-Medium ; ++/KozGoPro-Regular /GothicBBB-Medium ; ++ ++/KozMinPro-Bold /Ryumin-Light ; ++/KozMinPro-Light /Ryumin-Light ; ++/KozMinPro-Medium /Ryumin-Light ; ++/KozMinPro-Regular /Ryumin-Light ; ++ ++/HiraKakuPro-W3 /GothicBBB-Medium ; ++/HiraKakuPro-W6 /GothicBBB-Medium ; ++/HiraKakuStd-W8 /GothicBBB-Medium ; ++ ++/HiraMaruPro-W4 /GothicBBB-Medium ; ++ ++/HiraMinPro-W3 /Ryumin-Light ; ++ ++/HeiseiMin-W3 /Ryumin-Light ; ++/HeiseiKakuGo-W5 /GothicBBB-Medium ; ++ ++/FutoMinA101-Bold /Ryumin-Light ; ++/FutoMinA101Pro-Bold /Ryumin-Light ; ++/FutoGoB101-Bold /GothicBBB-Medium ; ++/FutoGoB101Pro-Bold /GothicBBB-Medium ; ++ ++/Jun101-Light /Ryumin-Light ; ++/Jun101Pro-Light /Ryumin-Light ; ++ ++/MidashiGo-MB31 /GothicBBB-Medium ; ++/MidashiGoPro-MB31 /GothicBBB-Medium ; ++ ++/MidashiMinPro-MA31 /Ryumin-Light ; ++ ++/MS-Mincho /Ryumin-Light ; ++/MS-PMincho /Ryumin-Light ; ++/MS-Gothic /GothicBBB-Medium ; ++/MS-PGothic /GothicBBB-Medium ; ++ ++%/Munhwa-Regular /Munhwa-Regular ; ++%/MunhwaGothic-Regular /MunhwaGothic-Regular ; ++%/Munhwa-Bold /Munhwa-Bold ; ++%/MunhwaGothic-Bold /MunhwaGothic-Bold ; ++ ++/HYGoThic-Medium /MunhwaGothic-Regular ; ++/HYSMyeongJo-Medium /Munhwa-Regular ; ++/HYRGoThic-Medium /MunhwaGothic-Bold ; ++ ++/STHeiti-Regular << /FileType /TrueType /Path (STHeiti-Regular) /SubfontID 0 /CSI [(CNS1) 5] >> ; ++/STSong-Light << /FileType /TrueType /Path (STSong-Light) /SubfontID 0 /CSI [(GB1) 5] >> ; ++/MSung-Light << /FileType /TrueType /Path (MSung-Light) /SubfontID 0 /CSI [(CNS1) 5] >> ; ++/MHei-Medium << /FileType /TrueType /Path (MHei-Medium) /SubfontID 0 /CSI [(GB1) 5] >> ; + % + % NOTE: getenv returns a boolean to indicate success of or failure, as well as the value on success. In the example, it uses this + % to include a default value should getenv fail. diff --git a/print/ghostscript9-base/files/patch-Resource_Init_gs__statd.ps b/print/ghostscript9-base/files/patch-Resource_Init_gs__statd.ps new file mode 100644 index 000000000000..0adb60151b62 --- /dev/null +++ b/print/ghostscript9-base/files/patch-Resource_Init_gs__statd.ps @@ -0,0 +1,15 @@ +--- Resource/Init/gs_statd.ps.orig 2012-08-08 08:01:36 UTC ++++ Resource/Init/gs_statd.ps +@@ -124,6 +124,12 @@ STRICT { (%END SIZES) .skipeof } if + /ANSI_D {1585 2448 //.setpagesize exec} bind def + /ANSI_E {2448 3168 //.setpagesize exec} bind def + /ANSI_F {2016 2880 //.setpagesize exec} bind def ++ /postcard {284 419 //.setpagesize exec} bind def ++ /dbl_postcard {419 568 //.setpagesize exec} bind def ++ /Executive {522 756 //.setpagesize exec} bind def ++ /jenv_you4 {298 666 //.setpagesize exec} bind def ++ /jenv_you2 {324 460 //.setpagesize exec} bind def ++ /jenv_kaku2 {682 942 //.setpagesize exec} bind def + %END SIZES + currentdict end + dup /.setpagesize .undef diff --git a/print/ghostscript9-base/files/patch-Resource_Init_gs__ttf.ps b/print/ghostscript9-base/files/patch-Resource_Init_gs__ttf.ps new file mode 100644 index 000000000000..0777a953908b --- /dev/null +++ b/print/ghostscript9-base/files/patch-Resource_Init_gs__ttf.ps @@ -0,0 +1,28 @@ +--- Resource/Init/gs_ttf.ps.orig 2012-08-08 08:01:36 UTC ++++ Resource/Init/gs_ttf.ps +@@ -1047,10 +1047,21 @@ mark + } 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 ++% /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] diff --git a/print/ghostscript9-base/files/patch-Resource_Init_pdf__font.ps b/print/ghostscript9-base/files/patch-Resource_Init_pdf__font.ps new file mode 100644 index 000000000000..281b882ae3d6 --- /dev/null +++ b/print/ghostscript9-base/files/patch-Resource_Init_pdf__font.ps @@ -0,0 +1,15 @@ +--- Resource/Init/pdf_font.ps.orig 2012-08-08 08:01:36 UTC ++++ Resource/Init/pdf_font.ps +@@ -1751,10 +1751,12 @@ currentdict /CMap_read_dict undef + + /buildCIDType0 { % buildCIDType0 + dup /BaseFont get findCIDFont exch pop ++ addCIDmetrics /CIDFont defineresource + } bdef + + /buildCIDType2 { % buildCIDType2 + dup /BaseFont get findCIDFont exch pop ++ addCIDmetrics /CIDFont defineresource + } bdef + + /processCIDToGIDMap { % processCIDToGIDMap diff --git a/print/ghostscript9-base/files/patch-base-Makefile.in b/print/ghostscript9-base/files/patch-base-Makefile.in deleted file mode 100644 index 93eddf3d998f..000000000000 --- a/print/ghostscript9-base/files/patch-base-Makefile.in +++ /dev/null @@ -1,141 +0,0 @@ ---- base/Makefile.in.orig 2012-08-08 17:01:36.000000000 +0900 -+++ base/Makefile.in 2014-11-23 17:28:38.000000000 +0900 -@@ -49,9 +49,9 @@ - # the directories also define the default search path for the - # initialization files (gs_*.ps) and the fonts. - --INSTALL = $(GLSRCDIR)/instcopy -c --INSTALL_PROGRAM = $(INSTALL) -m 755 --INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} -+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} -+INSTALL_DATA = ${BSD_INSTALL_DATA} - INSTALL_SHARED = @INSTALL_SHARED@ - - prefix = @prefix@ -@@ -202,7 +202,7 @@ - # some older JPEG streams that violate the standard. If the JPEG - # library built from local sources, the patch will be applied. - --SHARE_JPEG=@SHARE_LIBJPEG@ -+SHARE_JPEG=1 - JPEG_NAME=jpeg - - # Define the directory where the PNG library sources are stored, -@@ -210,12 +210,12 @@ - # You may need to change this if the libpng version changes. - # See png.mak for more information. - --SHARE_LIBPNG=@SHARE_LIBPNG@ -+SHARE_LIBPNG=1 - PNGSRCDIR=@LIBPNGDIR@ - LIBPNG_NAME=png - - # libtiff --SHARE_LIBTIFF=@SHARE_LIBTIFF@ -+SHARE_LIBTIFF=1 - TIFFSRCDIR=@LIBTIFFDIR@ - TIFFPLATFORM=unix - TIFFCONFIG_SUFFIX= -@@ -224,7 +224,7 @@ - # Define the directory where the zlib sources are stored. - # See zlib.mak for more information. - --SHARE_ZLIB=@SHARE_ZLIB@ -+SHARE_ZLIB=1 - ZSRCDIR=@ZLIBDIR@ - #ZLIB_NAME=gz - ZLIB_NAME=z -@@ -251,7 +251,7 @@ - JPX_LIB=@JPX_DECODER@ - SHARE_JPX=@SHARE_JPX@ - JPXSRCDIR=@JPXDIR@ --JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@ -+JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@ -ffast-math -DOPJ_STATIC -std=c99 - - # uncomment the following three lines and one of the last two to - # compile in the Luratech lwf_jp2 codec -@@ -331,7 +331,7 @@ - # Define the added flags for standard, debugging, profiling - # and shared object builds. - --CFLAGS_STANDARD=@OPT_CFLAGS@ -+CFLAGS_STANDARD?=@OPT_CFLAGS@ - CFLAGS_DEBUG=@DBG_CFLAGS@ - CFLAGS_PROFILE=-pg @OPT_CFLAGS@ - CFLAGS_SO=@DYNAMIC_CFLAGS@ -@@ -382,7 +382,7 @@ - # Solaris may need -lnsl -lsocket -lposix4. - # (Libraries required by individual drivers are handled automatically.) - --EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ -+EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ -Wl,-export-dynamic - - # Define the standard libraries to search at the end of linking. - # Most platforms require -lpthread for the POSIX threads library; -@@ -426,7 +426,7 @@ - # the pthread library. Otherwise use SYNC=nosync - #SYNC=posync - #SYNC=nosync --SYNC=@SYNC@ -+SYNC=nosync - - # programs we use - RM=rm -f -@@ -518,27 +518,27 @@ - #DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev - #DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev - DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@ --DEVICE_DEVS1=@F_DEVS@ --DEVICE_DEVS2=@P_DEVS@ --DEVICE_DEVS3=@CUPS_DEVS@ --DEVICE_DEVS4=@IJS_DEVS@ --DEVICE_DEVS5=@OMNIDEVS@ --DEVICE_DEVS6=@PNG_DEVS@ --DEVICE_DEVS7=@JBIG2_DEVS@ --DEVICE_DEVS8=@SVG_DEVS@ --DEVICE_DEVS9= --DEVICE_DEVS10= --DEVICE_DEVS11= --DEVICE_DEVS12= --DEVICE_DEVS13= --DEVICE_DEVS14= --DEVICE_DEVS15= --DEVICE_DEVS16= --DEVICE_DEVS17= --DEVICE_DEVS18= --DEVICE_DEVS19= --DEVICE_DEVS20= --DEVICE_DEVS21= -+#DEVICE_DEVS1=@F_DEVS@ -+#DEVICE_DEVS2=@P_DEVS@ -+#DEVICE_DEVS3=@CUPS_DEVS@ -+#DEVICE_DEVS4=@IJS_DEVS@ -+#DEVICE_DEVS5=@OMNIDEVS@ -+#DEVICE_DEVS6=@PNG_DEVS@ -+#DEVICE_DEVS7=@JBIG2_DEVS@ -+#DEVICE_DEVS8=@SVG_DEVS@ -+#DEVICE_DEVS9= -+#DEVICE_DEVS10= -+#DEVICE_DEVS11= -+#DEVICE_DEVS12= -+#DEVICE_DEVS13= -+#DEVICE_DEVS14= -+#DEVICE_DEVS15= -+#DEVICE_DEVS16= -+#DEVICE_DEVS17= -+#DEVICE_DEVS18= -+#DEVICE_DEVS19= -+#DEVICE_DEVS20= -+#DEVICE_DEVS21= - - - # Shared library target to build. -@@ -583,6 +583,7 @@ - # ---------------- End of platform-specific section ---------------- # - - INSTALL_CONTRIB=@INSTALL_CONTRIB@ -+include $(GLSRCDIR)/drivers.mak - include $(GLSRCDIR)/unixhead.mak - include $(GLSRCDIR)/gs.mak - # psromfs.mak must precede lib.mak diff --git a/print/ghostscript9-base/files/patch-base-configure.ac b/print/ghostscript9-base/files/patch-base-configure.ac deleted file mode 100644 index 12bce9cb55b7..000000000000 --- a/print/ghostscript9-base/files/patch-base-configure.ac +++ /dev/null @@ -1,38 +0,0 @@ ---- base/configure.ac.orig 2012-08-08 17:01:36.000000000 +0900 -+++ base/configure.ac 2015-08-21 12:58:10.287279000 +0900 -@@ -1303,7 +1303,7 @@ - X_DEVS="" - X_LIBS="" - --if test x$no_x != xyes; then -+if test x$with_x != xno; then - if test "$x_libraries" = "/usr/lib"; then - echo "Ignoring X library directory \"$x_libraries\" requested by configure." - x_libraries="NONE" -@@ -1701,7 +1701,10 @@ - DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS" - ;; - *BSD) -- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" -+ if test "x$X_DEVS" != x; then -+ INSTALL_SHARED="install-shared" -+ fi -+ DYNAMIC_DEVS="" - DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\"" - X11_DEVS="" - OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS" -@@ -1758,11 +1761,11 @@ - fontpath="${fontpath}:$datadir/fonts/default/TrueType" - - # These font directories are used by IRIX... -- fontpath="${fontpath}:/usr/lib/DPS/outline/base" -+ # fontpath="${fontpath}:/usr/lib/DPS/outline/base" - - # These font directories are used by Solaris... -- fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1" -- fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType" -+ # fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1" -+ # fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType" - - # This font directory is used by CUPS... - if test "x$CUPSCONFIG" != x; then diff --git a/print/ghostscript9-base/files/patch-base-contrib.mak b/print/ghostscript9-base/files/patch-base-contrib.mak deleted file mode 100644 index 9f9406007bb4..000000000000 --- a/print/ghostscript9-base/files/patch-base-contrib.mak +++ /dev/null @@ -1,8 +0,0 @@ ---- base/contrib.mak.orig 2008-03-04 06:06:45.000000000 +0900 -+++ base/contrib.mak 2008-03-04 06:07:11.000000000 +0900 -@@ -858,3 +858,5 @@ - $(SETPDEV) $(DD)picty180 $(cdeskjet_) - - ######################################################################### -+ -+include $(GLSRCDIR)/epag.contrib.mak diff --git a/print/ghostscript9-base/files/patch-base-devs.mak b/print/ghostscript9-base/files/patch-base-devs.mak deleted file mode 100644 index 706e86737cbe..000000000000 --- a/print/ghostscript9-base/files/patch-base-devs.mak +++ /dev/null @@ -1,24 +0,0 @@ ---- base/devs.mak.orig 2009-02-14 09:46:58.000000000 +0900 -+++ base/devs.mak 2009-12-20 01:39:02.000000000 +0900 -@@ -418,10 +418,10 @@ - ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - - $(GLOBJ)lvga256.so : $(lvga256_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl $(XLDFLAGS) - - $(GLOBJ)vgalib.so : $(vgalib_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl $(XLDFLAGS) - - ### -------------------------- The X11 device -------------------------- ### - -@@ -524,7 +524,7 @@ - ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - - $(GLOBJ)X11.so : $(x11alt_) $(x11_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(LOCALBASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) - - ###### --------------- Memory-buffered printer devices --------------- ###### - diff --git a/print/ghostscript9-base/files/patch-base-gdevl256.c b/print/ghostscript9-base/files/patch-base-gdevl256.c deleted file mode 100644 index d2fcd1b42baa..000000000000 --- a/print/ghostscript9-base/files/patch-base-gdevl256.c +++ /dev/null @@ -1,15 +0,0 @@ ---- base/gdevl256.c.orig 2011-07-17 19:57:32.000000000 +0900 -+++ base/gdevl256.c 2011-07-17 19:57:39.000000000 +0900 -@@ -302,12 +302,3 @@ - gl_line(x0, y0, x1, y1, color); - return 0; - } -- --#ifdef GS_DEVS_SHARED --extern void gs_lib_register_device(const gx_device *dev); --void --gs_shared_init(void) --{ -- gs_lib_register_device(&gs_lvga256_device); --} --#endif diff --git a/print/ghostscript9-base/files/patch-base-gdevperm.c b/print/ghostscript9-base/files/patch-base-gdevperm.c deleted file mode 100644 index 07870f314ac4..000000000000 --- a/print/ghostscript9-base/files/patch-base-gdevperm.c +++ /dev/null @@ -1,19 +0,0 @@ ---- base/gdevperm.c.orig 2012-02-08 17:48:48.000000000 +0900 -+++ base/gdevperm.c 2012-02-13 00:44:23.000000000 +0900 -@@ -285,7 +285,7 @@ - (strncmp((const char *)name, (const char *)str, name_size) == 0)) - - static int --perm_get_color_comp_index(const gx_device *pdev, const char *pname, -+perm_get_color_comp_index(gx_device *pdev, const char *pname, - int name_size, int component_type) - { - const gx_device_perm_t * const dev = (const gx_device_perm_t *)pdev; -@@ -332,7 +332,6 @@ - perm_decode_color(gx_device *dev, gx_color_index color, gx_color_value *out) - { - int bpc = 8; -- int drop = sizeof(gx_color_value) * 8 - bpc; - int mask = (1 << bpc) - 1; - int i = 0; - int ncomp = dev->color_info.num_components; diff --git a/print/ghostscript9-base/files/patch-base-gdevplib.c b/print/ghostscript9-base/files/patch-base-gdevplib.c deleted file mode 100644 index 11fbdf23b262..000000000000 --- a/print/ghostscript9-base/files/patch-base-gdevplib.c +++ /dev/null @@ -1,14 +0,0 @@ ---- base/gdevplib.c.orig 2012-08-08 08:01:36 UTC -+++ base/gdevplib.c -@@ -153,7 +153,11 @@ void __aebi_memmove(void *dest, const vo - - #ifdef TESTING_WITH_NO_BAND_DONOR - -+#if !defined(__FreeBSD__) && !defined(__DragonFly__) - #include -+#else -+#include -+#endif - - static void *my_buffer; - diff --git a/print/ghostscript9-base/files/patch-base-gdevvglb.c b/print/ghostscript9-base/files/patch-base-gdevvglb.c deleted file mode 100644 index 8f7d239726ff..000000000000 --- a/print/ghostscript9-base/files/patch-base-gdevvglb.c +++ /dev/null @@ -1,15 +0,0 @@ ---- base/gdevvglb.c.orig 2011-07-17 19:56:33.000000000 +0900 -+++ base/gdevvglb.c 2011-07-17 19:57:10.000000000 +0900 -@@ -367,12 +367,3 @@ - } - return 0; - } -- --#ifdef GS_DEVS_SHARED --extern void gs_lib_register_device(const gx_device *dev); --void --gs_shared_init(void) --{ -- gs_lib_register_device(&gs_vgalib_device); --} --#endif diff --git a/print/ghostscript9-base/files/patch-base-gp_unix.c b/print/ghostscript9-base/files/patch-base-gp_unix.c deleted file mode 100644 index 277ef51a22ab..000000000000 --- a/print/ghostscript9-base/files/patch-base-gp_unix.c +++ /dev/null @@ -1,47 +0,0 @@ ---- base/gp_unix.c.orig 2012-08-08 17:01:36.000000000 +0900 -+++ base/gp_unix.c 2015-08-20 15:15:51.166042000 +0900 -@@ -52,6 +52,7 @@ - * and applied as a patch (preferable). - */ - #include -+#include - #include - #include - #include -@@ -61,26 +62,25 @@ - { - DIR* dir = NULL; - struct dirent* dirent; -- char buff[1024]; -+ char buff[PATH_MAX]; - char* pbuff; - void* handle; - void (*gs_shared_init)(void); - -- strncpy(buff, GS_DEVS_SHARED_DIR, sizeof(buff) - 2); -- pbuff = buff + strlen(buff); -- *pbuff++ = '/'; *pbuff = '\0'; -- - dir = opendir(GS_DEVS_SHARED_DIR); - if (dir == 0) return; - - while ((dirent = readdir(dir)) != 0) { -- strncpy(pbuff, dirent->d_name, sizeof(buff) - (pbuff - buff) - 1); -- if ((handle = dlopen(buff, RTLD_NOW)) != 0) { -- if ((gs_shared_init = dlsym(handle, "gs_shared_init")) != 0) { -+ snprintf(buff, sizeof(buff), "%s/%s", GS_DEVS_SHARED_DIR, dirent->d_name); -+ pbuff = buff + strlen(buff) - 3; -+ if (strcmp(pbuff, ".so") != 0) -+ continue; -+ handle = dlopen(buff, RTLD_NOW); -+ if (handle == NULL) -+ continue; -+ gs_shared_init = dlsym(handle, "gs_shared_init"); -+ if (gs_shared_init != NULL) - (*gs_shared_init)(); -- } else { -- } -- } - } - - closedir(dir); diff --git a/print/ghostscript9-base/files/patch-base-gs.mak b/print/ghostscript9-base/files/patch-base-gs.mak deleted file mode 100644 index 50d31a63a2d2..000000000000 --- a/print/ghostscript9-base/files/patch-base-gs.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- base/gs.mak.orig 2012-08-08 17:01:36.000000000 +0900 -+++ base/gs.mak 2012-10-14 02:29:03.000000000 +0900 -@@ -437,7 +437,7 @@ - ld_tr=$(GLGENDIR)$(D)ld.tr - $(ld_tr) : \ - $(GS_MAK) $(TOP_MAKEFILES) $(GLSRCDIR)$(D)version.mak $(GENCONF_XE) $(ECHOGS_XE) $(devs_tr) $(DEVS_ALL) $(GLGENDIR)$(D)libcore.dev -- $(EXP)$(GENCONF_XE) $(devs_tr) -h $(gconfxx_h) $(CONFILES) $(CONFLDTR) $(ld_tr) -+ $(EXP)$(GENCONF_XE) $(devs_tr) -h /dev/stdout $(CONFILES) $(CONFLDTR) $(ld_tr) | awk 'BEGIN{j=0; p=1;} /jpeg_device/ {if(j++ > 0) p=0;} // { if(p==1) { print; } else { p=1 } }' > $(gconfxx_h) - $(EXP)$(ECHOGS_XE) -a $(gconfxx_h) $(GCONFIG_EXTRAS) - - $(gconfxx_h) : $(ld_tr) diff --git a/print/ghostscript9-base/files/patch-base-gsicc__create.c b/print/ghostscript9-base/files/patch-base-gsicc__create.c new file mode 100644 index 000000000000..fdf8f5e33be3 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base-gsicc__create.c @@ -0,0 +1,10 @@ +--- base/gsicc_create.c.orig 2012-08-08 08:01:36 UTC ++++ base/gsicc_create.c +@@ -116,6 +116,7 @@ Note: All profile data must be encoded a + + */ + ++#include + #include "icc34.h" /* Note this header is needed even if lcms is not + compiled as default CMS */ + #include "string_.h" diff --git a/print/ghostscript9-base/files/patch-base-gsicc_create.c b/print/ghostscript9-base/files/patch-base-gsicc_create.c deleted file mode 100644 index 82bfee6c37ef..000000000000 --- a/print/ghostscript9-base/files/patch-base-gsicc_create.c +++ /dev/null @@ -1,10 +0,0 @@ ---- base/gsicc_create.c.orig 2011-08-05 20:12:20.000000000 +0900 -+++ base/gsicc_create.c 2011-12-06 15:23:14.000000000 +0900 -@@ -113,6 +113,7 @@ - - */ - -+#include - #include "icc34.h" /* Note this header is needed even if lcms is not - compiled as default CMS */ - #include "string_.h" diff --git a/print/ghostscript9-base/files/patch-base-gsmalloc.c b/print/ghostscript9-base/files/patch-base-gsmalloc.c deleted file mode 100644 index 93bb2a449788..000000000000 --- a/print/ghostscript9-base/files/patch-base-gsmalloc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- base/gsmalloc.c.orig 2015-07-24 09:41:05.295969000 +0900 -+++ base/gsmalloc.c 2015-07-24 09:41:15.146305000 +0900 -@@ -178,7 +178,7 @@ - } else { - uint added = size + sizeof(gs_malloc_block_t); - -- if (mmem->limit - added < mmem->used) -+ if (added <= size || mmem->limit - added < mmem->used) - set_msg("exceeded limit"); - else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0) - set_msg("failed"); diff --git a/print/ghostscript9-base/files/patch-base-gxobj.h b/print/ghostscript9-base/files/patch-base-gxobj.h deleted file mode 100644 index 529efe379df2..000000000000 --- a/print/ghostscript9-base/files/patch-base-gxobj.h +++ /dev/null @@ -1,18 +0,0 @@ ---- base/gxobj.h.orig Tue Mar 14 01:18:19 2006 -+++ base/gxobj.h Fri Mar 23 14:41:44 2007 -@@ -109,11 +109,15 @@ - * required by the hardware, regardless of the value of obj_align_mod. - * See gsmemraw.h for more information about this. - */ -+#if !defined(__ia64__) && !defined(__amd64__) - #define obj_align_mod\ - (((ARCH_ALIGN_MEMORY_MOD - 1) |\ - (align_bitmap_mod - 1) |\ - (obj_back_scale - 1)) + 1) - /* The only possible values for obj_align_mod are 4, 8, or 16.... */ -+#else -+#define obj_align_mod 16 -+#endif - #if obj_align_mod == 4 - # define log2_obj_align_mod 2 - #else diff --git a/print/ghostscript9-base/files/patch-base-openjpeg.mak b/print/ghostscript9-base/files/patch-base-openjpeg.mak deleted file mode 100644 index 3d85cb70abf1..000000000000 --- a/print/ghostscript9-base/files/patch-base-openjpeg.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- base/openjpeg.mak.orig 2012-02-08 17:48:48.000000000 +0900 -+++ base/openjpeg.mak 2012-02-14 06:40:56.000000000 +0900 -@@ -101,7 +101,7 @@ - $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS) - - # define our specific compiler --OPEN_JPEG_CC=$(CC) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_) -+OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_) - OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX) - - OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK) diff --git a/print/ghostscript9-base/files/patch-base-unix-dll.mak b/print/ghostscript9-base/files/patch-base-unix-dll.mak deleted file mode 100644 index 58a428806c59..000000000000 --- a/print/ghostscript9-base/files/patch-base-unix-dll.mak +++ /dev/null @@ -1,13 +0,0 @@ ---- base/unix-dll.mak.orig 2012-08-08 02:01:36.000000000 -0600 -+++ base/unix-dll.mak 2014-04-18 12:12:34.000000000 -0600 -@@ -162,8 +162,8 @@ - -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) -s $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) -+ $(INSTALL_PROGRAM) -s $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) - $(INSTALL_PROGRAM) $(BINDIR)/$(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) diff --git a/print/ghostscript9-base/files/patch-base-unix-gcc.mak b/print/ghostscript9-base/files/patch-base-unix-gcc.mak deleted file mode 100644 index 8aea189c6f90..000000000000 --- a/print/ghostscript9-base/files/patch-base-unix-gcc.mak +++ /dev/null @@ -1,212 +0,0 @@ ---- base/unix-gcc.mak.orig 2012-08-08 17:01:36.000000000 +0900 -+++ base/unix-gcc.mak 2012-10-14 02:32:51.000000000 +0900 -@@ -22,16 +22,17 @@ - # source, generated intermediate file, and object directories - # for the graphics library (GL) and the PostScript/PDF interpreter (PS). - --BINDIR=./$(BUILDDIRPREFIX)bin --GLSRCDIR=./base --GLGENDIR=./$(BUILDDIRPREFIX)obj --GLOBJDIR=./$(BUILDDIRPREFIX)obj -+.CURDIR?=. -+BINDIR=${.CURDIR}/$(BUILDDIRPREFIX)bin -+GLSRCDIR=${.CURDIR}/base -+GLGENDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj -+GLOBJDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj - AUXDIR=$(GLGENDIR)/aux --PSSRCDIR=./psi --PSLIBDIR=./lib --PSRESDIR=./Resource --PSGENDIR=./$(BUILDDIRPREFIX)obj --PSOBJDIR=./$(BUILDDIRPREFIX)obj -+PSSRCDIR=${.CURDIR}/psi -+PSLIBDIR=${.CURDIR}/lib -+PSRESDIR=${.CURDIR}/Resource -+PSGENDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj -+PSOBJDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj - - # Do not edit the next group of lines. - -@@ -50,11 +51,10 @@ - # the directories also define the default search path for the - # initialization files (gs_*.ps) and the fonts. - --INSTALL = $(GLSRCDIR)/instcopy -c --INSTALL_PROGRAM = $(INSTALL) -m 755 --INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT} -+INSTALL_DATA = ${BSD_INSTALL_DATA} - --prefix = /usr/local -+prefix = ${PREFIX} - exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin - scriptdir = $(bindir) -@@ -104,7 +104,7 @@ - # This uses the more secure temporary file creation call - # Enable this if it is available on your platform. - --CAPOPT= -DHAVE_MKSTEMP -+CAPOPT= -DHAVE_MKSTEMP -DHAVE_HYPOT - - # Define the name of the executable file. - -@@ -139,7 +139,7 @@ - # some older JPEG streams that violate the standard. If the JPEG - # library built from local sources, the patch will be applied. - --SHARE_JPEG=0 -+SHARE_JPEG=1 - JPEG_NAME=jpeg - - # Define the directory where the PNG library sources are stored, -@@ -153,13 +153,13 @@ - # what its name is. - # See gs.mak and Make.htm for more information. - --SHARE_LIBPNG=0 -+SHARE_LIBPNG=1 - LIBPNG_NAME=png - - # Define whether to use a shared version of libtiff and where - # it is stored and what its name is. - --SHARE_LIBTIFF=0 -+SHARE_LIBTIFF=1 - TIFFSRCDIR=tiff - TIFFPLATFORM=unix - TIFFCONFIG_SUFFIX=.unix -@@ -174,15 +174,23 @@ - # what its name is (usually libz, but sometimes libgz). - # See gs.mak and Make.htm for more information. - --SHARE_ZLIB=0 -+SHARE_ZLIB=1 - #ZLIB_NAME=gz - ZLIB_NAME=z - - # Choose shared or compiled in libjbig2dec and source location --SHARE_JBIG2=0 -+SHARE_JBIG2=1 - JBIG2_LIB=jbig2dec - JBIG2SRCDIR=jbig2dec - -+# Choose the library to use for (JPXDecode support) -+# whether to link to an external build or compile in from source -+# and source location and configuration flags for compiling in -+JPX_LIB=jasper -+SHARE_JPX=0 -+JPXSRCDIR=jasper -+JPX_CFLAGS=-DJAS_CONFIGURE -+ - # Define the directory where the icclib source are stored. - # See icclib.mak for more information - ICCSRCDIR=icclib -@@ -223,7 +231,7 @@ - - # Define the name of the C compiler. - --CC=gcc -+CC?=cc - - # Define the name of the linker for the final link step. - # Normally this is the same as the C compiler. -@@ -240,7 +248,7 @@ - # Define the added flags for standard, debugging, profiling - # and shared object builds. - --CFLAGS_STANDARD=-O2 -+CFLAGS_STANDARD?=-O2 - CFLAGS_DEBUG=-g -O0 - CFLAGS_PROFILE=-pg -O2 - CFLAGS_SO=-fPIC -@@ -256,7 +264,8 @@ - # We don't include -ansi, because this gets in the way of the platform- - # specific stuff that typically needs; nevertheless, we expect - # gcc to accept ANSI-style function prototypes and function definitions. --XCFLAGS=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\" -+#XCFLAGS+=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\" -+XCFLAGS+=-DUPD_SIGNAL=0 -I${JPXSRCDIR}/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include - - CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) - -@@ -267,7 +276,7 @@ - # -R /usr/local/xxx/lib:/usr/local/lib - # giving the full path names of the shared library directories. - # XLDFLAGS can be set from the command line. --XLDFLAGS= -+XLDFLAGS+=-L${LOCALBASE}/lib - - LDFLAGS=$(XLDFLAGS) - -@@ -278,7 +287,7 @@ - # Solaris may need -lnsl -lsocket -lposix4. - # (Libraries required by individual drivers are handled automatically.) - --EXTRALIBS=-rdynamic -ldl -+EXTRALIBS+=-Wl,-export-dynamic - - # Define the standard libraries to search at the end of linking. - # Most platforms require -lpthread for the POSIX threads library; -@@ -300,7 +309,7 @@ - # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, - # not in $(XINCLUDE). - --XINCLUDE=-I/usr/X11R6/include -+XINCLUDE=-I${LOCALBASE}/include - - # Define the directory/ies and library names for the X11 library files. - # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH -@@ -315,29 +324,29 @@ - #XLIBS=Xt SM ICE Xext X11 - - #XLIBDIRS=-L/usr/local/X/lib --XLIBDIRS=-L/usr/X11R6/lib -+XLIBDIRS=-L${LOCALBASE}/lib - XLIBDIR= --XLIBS=Xt Xext X11 -+XLIBS=Xt SM ICE Xext X11 - - # Define the .dev module that implements thread and synchronization - # primitives for this platform. - - # If POSIX sync primitives are used, also change the STDLIBS to include - # the pthread library. --#SYNC=posync -+SYNC=posync - - # define the file name extension for a shared lib - DYNANIC_LIB_EXT=so - - # Default is No sync primitives since some platforms don't have it (HP-UX) --SYNC=nosync -+#SYNC=nosync - - SOC_LOADER=dxmainc.c - # ------ Devices and features ------ # - - # Choose the language feature(s) to include. See gs.mak for details. - --FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev -+FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev $(PSD)jbig2.dev $(PSD)jpx.dev - #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev - # The following is strictly for testing. - FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev -@@ -476,6 +485,9 @@ - include $(GLSRCDIR)/png.mak - include $(GLSRCDIR)/tiff.mak - include $(GLSRCDIR)/jbig2.mak -+include $(GLSRCDIR)/jasper.mak -+include $(GLSRCDIR)/ldf_jb2.mak -+include $(GLSRCDIR)/lwf_jp2.mak - include $(GLSRCDIR)/icclib.mak - include $(GLSRCDIR)/lcms.mak - include $(GLSRCDIR)/ijs.mak -@@ -486,6 +498,7 @@ - include $(GLSRCDIR)/unix-dll.mak - include $(GLSRCDIR)/unix-end.mak - include $(GLSRCDIR)/unixinst.mak -+include $(CONTRIBDIR)/contrib.mak - - # This has to come last so it won't be taken as the default target. - $(AK): diff --git a/print/ghostscript9-base/files/patch-base-unixinst.mak b/print/ghostscript9-base/files/patch-base-unixinst.mak deleted file mode 100644 index 51d6baa31dad..000000000000 --- a/print/ghostscript9-base/files/patch-base-unixinst.mak +++ /dev/null @@ -1,20 +0,0 @@ ---- base/unixinst.mak.orig 2012-08-08 17:01:36.000000000 +0900 -+++ base/unixinst.mak 2014-11-23 17:29:15.000000000 +0900 -@@ -45,7 +45,7 @@ - wftopfa 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=gs/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \ -- $(INSTALL_PROGRAM) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ -+ $(INSTALL_SCRIPT) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ - fi;\ - done' - -@@ -142,7 +142,7 @@ - done' - - # install the man pages for each locale --MAN_LCDIRS=. de -+MAN_LCDIRS=. - MAN1_LINKS_PS2PS=eps2eps - MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13 ps2pdf14 - MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj diff --git a/print/ghostscript9-base/files/patch-base_Makefile.in b/print/ghostscript9-base/files/patch-base_Makefile.in new file mode 100644 index 000000000000..c7b4175e98b0 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_Makefile.in @@ -0,0 +1,141 @@ +--- base/Makefile.in.orig 2012-08-08 08:01:36 UTC ++++ base/Makefile.in +@@ -49,9 +49,9 @@ PSD=$(PSGENDIR)/ + # the directories also define the default search path for the + # initialization files (gs_*.ps) and the fonts. + +-INSTALL = $(GLSRCDIR)/instcopy -c +-INSTALL_PROGRAM = $(INSTALL) -m 755 +-INSTALL_DATA = $(INSTALL) -m 644 ++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} ++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} ++INSTALL_DATA = ${BSD_INSTALL_DATA} + INSTALL_SHARED = @INSTALL_SHARED@ + + prefix = @prefix@ +@@ -202,7 +202,7 @@ JSRCDIR=@LIBJPEGDIR@ + # some older JPEG streams that violate the standard. If the JPEG + # library built from local sources, the patch will be applied. + +-SHARE_JPEG=@SHARE_LIBJPEG@ ++SHARE_JPEG=1 + JPEG_NAME=jpeg + + # Define the directory where the PNG library sources are stored, +@@ -210,12 +210,12 @@ JPEG_NAME=jpeg + # You may need to change this if the libpng version changes. + # See png.mak for more information. + +-SHARE_LIBPNG=@SHARE_LIBPNG@ ++SHARE_LIBPNG=1 + PNGSRCDIR=@LIBPNGDIR@ + LIBPNG_NAME=png + + # libtiff +-SHARE_LIBTIFF=@SHARE_LIBTIFF@ ++SHARE_LIBTIFF=1 + TIFFSRCDIR=@LIBTIFFDIR@ + TIFFPLATFORM=unix + TIFFCONFIG_SUFFIX= +@@ -224,7 +224,7 @@ LIBTIFF_NAME=tiff + # Define the directory where the zlib sources are stored. + # See zlib.mak for more information. + +-SHARE_ZLIB=@SHARE_ZLIB@ ++SHARE_ZLIB=1 + ZSRCDIR=@ZLIBDIR@ + #ZLIB_NAME=gz + ZLIB_NAME=z +@@ -251,7 +251,7 @@ JBIG2_CFLAGS=@JBIG2_AUTOCONF_CFLAGS@ + JPX_LIB=@JPX_DECODER@ + SHARE_JPX=@SHARE_JPX@ + JPXSRCDIR=@JPXDIR@ +-JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@ ++JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@ -ffast-math -DOPJ_STATIC -std=c99 + + # uncomment the following three lines and one of the last two to + # compile in the Luratech lwf_jp2 codec +@@ -331,7 +331,7 @@ GCFLAGS=@CPPFLAGS@ @GCFLAGS@ @CFLAGS@ + # Define the added flags for standard, debugging, profiling + # and shared object builds. + +-CFLAGS_STANDARD=@OPT_CFLAGS@ ++CFLAGS_STANDARD?=@OPT_CFLAGS@ + CFLAGS_DEBUG=@DBG_CFLAGS@ + CFLAGS_PROFILE=-pg @OPT_CFLAGS@ + CFLAGS_SO=@DYNAMIC_CFLAGS@ +@@ -382,7 +382,7 @@ LDFLAGS=@LDFLAGS@ $(AC_LDFLAGS) $(XLDFLA + # Solaris may need -lnsl -lsocket -lposix4. + # (Libraries required by individual drivers are handled automatically.) + +-EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ ++EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ -Wl,-export-dynamic + + # Define the standard libraries to search at the end of linking. + # Most platforms require -lpthread for the POSIX threads library; +@@ -426,7 +426,7 @@ XLIBS=@X_LIBS@ + # the pthread library. Otherwise use SYNC=nosync + #SYNC=posync + #SYNC=nosync +-SYNC=@SYNC@ ++SYNC=nosync + + # programs we use + RM=rm -f +@@ -518,27 +518,27 @@ DISPLAY_DEV=$(DD)bbox.dev + #DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev + #DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev + DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@ +-DEVICE_DEVS1=@F_DEVS@ +-DEVICE_DEVS2=@P_DEVS@ +-DEVICE_DEVS3=@CUPS_DEVS@ +-DEVICE_DEVS4=@IJS_DEVS@ +-DEVICE_DEVS5=@OMNIDEVS@ +-DEVICE_DEVS6=@PNG_DEVS@ +-DEVICE_DEVS7=@JBIG2_DEVS@ +-DEVICE_DEVS8=@SVG_DEVS@ +-DEVICE_DEVS9= +-DEVICE_DEVS10= +-DEVICE_DEVS11= +-DEVICE_DEVS12= +-DEVICE_DEVS13= +-DEVICE_DEVS14= +-DEVICE_DEVS15= +-DEVICE_DEVS16= +-DEVICE_DEVS17= +-DEVICE_DEVS18= +-DEVICE_DEVS19= +-DEVICE_DEVS20= +-DEVICE_DEVS21= ++#DEVICE_DEVS1=@F_DEVS@ ++#DEVICE_DEVS2=@P_DEVS@ ++#DEVICE_DEVS3=@CUPS_DEVS@ ++#DEVICE_DEVS4=@IJS_DEVS@ ++#DEVICE_DEVS5=@OMNIDEVS@ ++#DEVICE_DEVS6=@PNG_DEVS@ ++#DEVICE_DEVS7=@JBIG2_DEVS@ ++#DEVICE_DEVS8=@SVG_DEVS@ ++#DEVICE_DEVS9= ++#DEVICE_DEVS10= ++#DEVICE_DEVS11= ++#DEVICE_DEVS12= ++#DEVICE_DEVS13= ++#DEVICE_DEVS14= ++#DEVICE_DEVS15= ++#DEVICE_DEVS16= ++#DEVICE_DEVS17= ++#DEVICE_DEVS18= ++#DEVICE_DEVS19= ++#DEVICE_DEVS20= ++#DEVICE_DEVS21= + + + # Shared library target to build. +@@ -583,6 +583,7 @@ MAKEDIRSTOP= + # ---------------- End of platform-specific section ---------------- # + + INSTALL_CONTRIB=@INSTALL_CONTRIB@ ++include $(GLSRCDIR)/drivers.mak + include $(GLSRCDIR)/unixhead.mak + include $(GLSRCDIR)/gs.mak + # psromfs.mak must precede lib.mak diff --git a/print/ghostscript9-base/files/patch-base_configure.ac b/print/ghostscript9-base/files/patch-base_configure.ac new file mode 100644 index 000000000000..e48115a8ca67 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_configure.ac @@ -0,0 +1,38 @@ +--- base/configure.ac.orig 2012-08-08 08:01:36 UTC ++++ base/configure.ac +@@ -1303,7 +1303,7 @@ X_CFLAGS="" + X_DEVS="" + X_LIBS="" + +-if test x$no_x != xyes; then ++if test x$with_x != xno; then + if test "$x_libraries" = "/usr/lib"; then + echo "Ignoring X library directory \"$x_libraries\" requested by configure." + x_libraries="NONE" +@@ -1701,7 +1701,10 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING( + DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS" + ;; + *BSD) +- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" ++ if test "x$X_DEVS" != x; then ++ INSTALL_SHARED="install-shared" ++ fi ++ DYNAMIC_DEVS="" + DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\"" + X11_DEVS="" + OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS" +@@ -1758,11 +1761,11 @@ if test "x$fontpath" = "x"; then + fontpath="${fontpath}:$datadir/fonts/default/TrueType" + + # These font directories are used by IRIX... +- fontpath="${fontpath}:/usr/lib/DPS/outline/base" ++ # fontpath="${fontpath}:/usr/lib/DPS/outline/base" + + # These font directories are used by Solaris... +- fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1" +- fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType" ++ # fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1" ++ # fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType" + + # This font directory is used by CUPS... + if test "x$CUPSCONFIG" != x; then diff --git a/print/ghostscript9-base/files/patch-base_contrib.mak b/print/ghostscript9-base/files/patch-base_contrib.mak new file mode 100644 index 000000000000..1355faba9ab1 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_contrib.mak @@ -0,0 +1,8 @@ +--- base/contrib.mak.orig 2012-08-08 08:01:36 UTC ++++ base/contrib.mak +@@ -860,3 +860,5 @@ $(DD)picty180.dev : $(cdeskjet_) + $(SETPDEV) $(DD)picty180 $(cdeskjet_) + + ######################################################################### ++ ++include $(GLSRCDIR)/epag.contrib.mak diff --git a/print/ghostscript9-base/files/patch-base_devs.mak b/print/ghostscript9-base/files/patch-base_devs.mak new file mode 100644 index 000000000000..9ecf9599fd9b --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_devs.mak @@ -0,0 +1,24 @@ +--- base/devs.mak.orig 2012-08-08 08:01:36 UTC ++++ base/devs.mak +@@ -434,10 +434,10 @@ $(GLOBJ)gdevvglb.$(OBJ) : $(GLSRC)gdevvg + ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT + + $(GLOBJ)lvga256.so : $(lvga256_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl ++ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl $(XLDFLAGS) + + $(GLOBJ)vgalib.so : $(vgalib_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl ++ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl $(XLDFLAGS) + + ### -------------------------- The X11 device -------------------------- ### + +@@ -535,7 +535,7 @@ $(GLOBJ)gdevxalt.$(OBJ) : $(GLSRC)gdevxa + ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT + + $(GLOBJ)X11.so : $(x11alt_) $(x11_) +- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) ++ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(LOCALBASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) + + ###### --------------- Memory-buffered printer devices --------------- ###### + diff --git a/print/ghostscript9-base/files/patch-base_gdevl256.c b/print/ghostscript9-base/files/patch-base_gdevl256.c new file mode 100644 index 000000000000..5e109c1a71ef --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_gdevl256.c @@ -0,0 +1,15 @@ +--- base/gdevl256.c.orig 2012-08-08 08:01:36 UTC ++++ base/gdevl256.c +@@ -303,12 +303,3 @@ lvga256_draw_line(gx_device * dev, int x + gl_line(x0, y0, x1, y1, color); + return 0; + } +- +-#ifdef GS_DEVS_SHARED +-extern void gs_lib_register_device(const gx_device *dev); +-void +-gs_shared_init(void) +-{ +- gs_lib_register_device(&gs_lvga256_device); +-} +-#endif diff --git a/print/ghostscript9-base/files/patch-base_gdevperm.c b/print/ghostscript9-base/files/patch-base_gdevperm.c new file mode 100644 index 000000000000..2d767054a0b1 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_gdevperm.c @@ -0,0 +1,19 @@ +--- base/gdevperm.c.orig 2012-08-08 08:01:36 UTC ++++ base/gdevperm.c +@@ -287,7 +287,7 @@ perm_get_color_mapping_procs(const gx_de + (strncmp((const char *)name, (const char *)str, name_size) == 0)) + + static int +-perm_get_color_comp_index(const gx_device *pdev, const char *pname, ++perm_get_color_comp_index(gx_device *pdev, const char *pname, + int name_size, int component_type) + { + const gx_device_perm_t * const dev = (const gx_device_perm_t *)pdev; +@@ -334,7 +334,6 @@ static int + perm_decode_color(gx_device *dev, gx_color_index color, gx_color_value *out) + { + int bpc = 8; +- int drop = sizeof(gx_color_value) * 8 - bpc; + int mask = (1 << bpc) - 1; + int i = 0; + int ncomp = dev->color_info.num_components; diff --git a/print/ghostscript9-base/files/patch-base_gdevplib.c b/print/ghostscript9-base/files/patch-base_gdevplib.c new file mode 100644 index 000000000000..11fbdf23b262 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_gdevplib.c @@ -0,0 +1,14 @@ +--- base/gdevplib.c.orig 2012-08-08 08:01:36 UTC ++++ base/gdevplib.c +@@ -153,7 +153,11 @@ void __aebi_memmove(void *dest, const vo + + #ifdef TESTING_WITH_NO_BAND_DONOR + ++#if !defined(__FreeBSD__) && !defined(__DragonFly__) + #include ++#else ++#include ++#endif + + static void *my_buffer; + diff --git a/print/ghostscript9-base/files/patch-base_gdevvglb.c b/print/ghostscript9-base/files/patch-base_gdevvglb.c new file mode 100644 index 000000000000..c6b38a6c68be --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_gdevvglb.c @@ -0,0 +1,15 @@ +--- base/gdevvglb.c.orig 2012-08-08 08:01:36 UTC ++++ base/gdevvglb.c +@@ -368,12 +368,3 @@ vgalib_put_params(gx_device * dev, gs_pa + } + return 0; + } +- +-#ifdef GS_DEVS_SHARED +-extern void gs_lib_register_device(const gx_device *dev); +-void +-gs_shared_init(void) +-{ +- gs_lib_register_device(&gs_vgalib_device); +-} +-#endif diff --git a/print/ghostscript9-base/files/patch-base_gp__unix.c b/print/ghostscript9-base/files/patch-base_gp__unix.c new file mode 100644 index 000000000000..84d1cdcb4f73 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_gp__unix.c @@ -0,0 +1,47 @@ +--- base/gp_unix.c.orig 2012-08-08 08:01:36 UTC ++++ base/gp_unix.c +@@ -52,6 +52,7 @@ extern char *getenv(const char *); + * and applied as a patch (preferable). + */ + #include ++#include + #include + #include + #include +@@ -61,26 +62,25 @@ gp_init(void) + { + DIR* dir = NULL; + struct dirent* dirent; +- char buff[1024]; ++ char buff[PATH_MAX]; + char* pbuff; + void* handle; + void (*gs_shared_init)(void); + +- strncpy(buff, GS_DEVS_SHARED_DIR, sizeof(buff) - 2); +- pbuff = buff + strlen(buff); +- *pbuff++ = '/'; *pbuff = '\0'; +- + dir = opendir(GS_DEVS_SHARED_DIR); + if (dir == 0) return; + + while ((dirent = readdir(dir)) != 0) { +- strncpy(pbuff, dirent->d_name, sizeof(buff) - (pbuff - buff) - 1); +- if ((handle = dlopen(buff, RTLD_NOW)) != 0) { +- if ((gs_shared_init = dlsym(handle, "gs_shared_init")) != 0) { ++ snprintf(buff, sizeof(buff), "%s/%s", GS_DEVS_SHARED_DIR, dirent->d_name); ++ pbuff = buff + strlen(buff) - 3; ++ if (strcmp(pbuff, ".so") != 0) ++ continue; ++ handle = dlopen(buff, RTLD_NOW); ++ if (handle == NULL) ++ continue; ++ gs_shared_init = dlsym(handle, "gs_shared_init"); ++ if (gs_shared_init != NULL) + (*gs_shared_init)(); +- } else { +- } +- } + } + + closedir(dir); diff --git a/print/ghostscript9-base/files/patch-base_gs.mak b/print/ghostscript9-base/files/patch-base_gs.mak new file mode 100644 index 000000000000..99f9426dc787 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_gs.mak @@ -0,0 +1,11 @@ +--- base/gs.mak.orig 2012-08-08 08:01:36 UTC ++++ base/gs.mak +@@ -437,7 +437,7 @@ GCONFIG_EXTRAS= + ld_tr=$(GLGENDIR)$(D)ld.tr + $(ld_tr) : \ + $(GS_MAK) $(TOP_MAKEFILES) $(GLSRCDIR)$(D)version.mak $(GENCONF_XE) $(ECHOGS_XE) $(devs_tr) $(DEVS_ALL) $(GLGENDIR)$(D)libcore.dev +- $(EXP)$(GENCONF_XE) $(devs_tr) -h $(gconfxx_h) $(CONFILES) $(CONFLDTR) $(ld_tr) ++ $(EXP)$(GENCONF_XE) $(devs_tr) -h /dev/stdout $(CONFILES) $(CONFLDTR) $(ld_tr) | awk 'BEGIN{j=0; p=1;} /jpeg_device/ {if(j++ > 0) p=0;} // { if(p==1) { print; } else { p=1 } }' > $(gconfxx_h) + $(EXP)$(ECHOGS_XE) -a $(gconfxx_h) $(GCONFIG_EXTRAS) + + $(gconfxx_h) : $(ld_tr) diff --git a/print/ghostscript9-base/files/patch-base_gsmalloc.c b/print/ghostscript9-base/files/patch-base_gsmalloc.c new file mode 100644 index 000000000000..734cfd079a2e --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_gsmalloc.c @@ -0,0 +1,11 @@ +--- base/gsmalloc.c.orig 2012-08-08 08:01:36 UTC ++++ base/gsmalloc.c +@@ -178,7 +178,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u + } else { + uint added = size + sizeof(gs_malloc_block_t); + +- if (mmem->limit - added < mmem->used) ++ if (added <= size || mmem->limit - added < mmem->used) + set_msg("exceeded limit"); + else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0) + set_msg("failed"); diff --git a/print/ghostscript9-base/files/patch-base_gxobj.h b/print/ghostscript9-base/files/patch-base_gxobj.h new file mode 100644 index 000000000000..762709c55265 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_gxobj.h @@ -0,0 +1,18 @@ +--- base/gxobj.h.orig 2012-08-08 08:01:36 UTC ++++ base/gxobj.h +@@ -109,11 +109,15 @@ typedef struct obj_header_data_s { + * required by the hardware, regardless of the value of obj_align_mod. + * See gsmemraw.h for more information about this. + */ ++#if !defined(__ia64__) && !defined(__amd64__) + #define obj_align_mod\ + (((ARCH_ALIGN_MEMORY_MOD - 1) |\ + (align_bitmap_mod - 1) |\ + (obj_back_scale - 1)) + 1) + /* The only possible values for obj_align_mod are 4, 8, or 16.... */ ++#else ++#define obj_align_mod 16 ++#endif + #if obj_align_mod == 4 + # define log2_obj_align_mod 2 + #else diff --git a/print/ghostscript9-base/files/patch-base_openjpeg.mak b/print/ghostscript9-base/files/patch-base_openjpeg.mak new file mode 100644 index 000000000000..4e29b5603b64 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_openjpeg.mak @@ -0,0 +1,11 @@ +--- base/openjpeg.mak.orig 2012-08-08 08:01:36 UTC ++++ base/openjpeg.mak +@@ -102,7 +102,7 @@ $(OPEN_JPEG_GEN)openjpeg_0.dev : $(TOP_M + $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS) + + # define our specific compiler +-OPEN_JPEG_CC=$(CC) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_) ++OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_) + OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX) + + OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK) diff --git a/print/ghostscript9-base/files/patch-base_unix-dll.mak b/print/ghostscript9-base/files/patch-base_unix-dll.mak new file mode 100644 index 000000000000..a835e46c90a6 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_unix-dll.mak @@ -0,0 +1,13 @@ +--- base/unix-dll.mak.orig 2012-08-08 08:01:36 UTC ++++ base/unix-dll.mak +@@ -162,8 +162,8 @@ install-so-subtarget: so-subtarget$(FOR_ + -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) -s $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) ++ $(INSTALL_PROGRAM) -s $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) + $(INSTALL_PROGRAM) $(BINDIR)/$(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) diff --git a/print/ghostscript9-base/files/patch-base_unix-gcc.mak b/print/ghostscript9-base/files/patch-base_unix-gcc.mak new file mode 100644 index 000000000000..6147656cc1dd --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_unix-gcc.mak @@ -0,0 +1,212 @@ +--- base/unix-gcc.mak.orig 2012-08-08 08:01:36 UTC ++++ base/unix-gcc.mak +@@ -22,16 +22,17 @@ + # source, generated intermediate file, and object directories + # for the graphics library (GL) and the PostScript/PDF interpreter (PS). + +-BINDIR=./$(BUILDDIRPREFIX)bin +-GLSRCDIR=./base +-GLGENDIR=./$(BUILDDIRPREFIX)obj +-GLOBJDIR=./$(BUILDDIRPREFIX)obj ++.CURDIR?=. ++BINDIR=${.CURDIR}/$(BUILDDIRPREFIX)bin ++GLSRCDIR=${.CURDIR}/base ++GLGENDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj ++GLOBJDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj + AUXDIR=$(GLGENDIR)/aux +-PSSRCDIR=./psi +-PSLIBDIR=./lib +-PSRESDIR=./Resource +-PSGENDIR=./$(BUILDDIRPREFIX)obj +-PSOBJDIR=./$(BUILDDIRPREFIX)obj ++PSSRCDIR=${.CURDIR}/psi ++PSLIBDIR=${.CURDIR}/lib ++PSRESDIR=${.CURDIR}/Resource ++PSGENDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj ++PSOBJDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj + + # Do not edit the next group of lines. + +@@ -50,11 +51,10 @@ PSD=$(PSGENDIR)/ + # the directories also define the default search path for the + # initialization files (gs_*.ps) and the fonts. + +-INSTALL = $(GLSRCDIR)/instcopy -c +-INSTALL_PROGRAM = $(INSTALL) -m 755 +-INSTALL_DATA = $(INSTALL) -m 644 ++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT} ++INSTALL_DATA = ${BSD_INSTALL_DATA} + +-prefix = /usr/local ++prefix = ${PREFIX} + exec_prefix = $(prefix) + bindir = $(exec_prefix)/bin + scriptdir = $(bindir) +@@ -104,7 +104,7 @@ GENOPT= + # This uses the more secure temporary file creation call + # Enable this if it is available on your platform. + +-CAPOPT= -DHAVE_MKSTEMP ++CAPOPT= -DHAVE_MKSTEMP -DHAVE_HYPOT + + # Define the name of the executable file. + +@@ -139,7 +139,7 @@ JSRCDIR=jpeg + # some older JPEG streams that violate the standard. If the JPEG + # library built from local sources, the patch will be applied. + +-SHARE_JPEG=0 ++SHARE_JPEG=1 + JPEG_NAME=jpeg + + # Define the directory where the PNG library sources are stored, +@@ -153,13 +153,13 @@ PNGSRCDIR=libpng + # what its name is. + # See gs.mak and Make.htm for more information. + +-SHARE_LIBPNG=0 ++SHARE_LIBPNG=1 + LIBPNG_NAME=png + + # Define whether to use a shared version of libtiff and where + # it is stored and what its name is. + +-SHARE_LIBTIFF=0 ++SHARE_LIBTIFF=1 + TIFFSRCDIR=tiff + TIFFPLATFORM=unix + TIFFCONFIG_SUFFIX=.unix +@@ -174,15 +174,23 @@ ZSRCDIR=zlib + # what its name is (usually libz, but sometimes libgz). + # See gs.mak and Make.htm for more information. + +-SHARE_ZLIB=0 ++SHARE_ZLIB=1 + #ZLIB_NAME=gz + ZLIB_NAME=z + + # Choose shared or compiled in libjbig2dec and source location +-SHARE_JBIG2=0 ++SHARE_JBIG2=1 + JBIG2_LIB=jbig2dec + JBIG2SRCDIR=jbig2dec + ++# Choose the library to use for (JPXDecode support) ++# whether to link to an external build or compile in from source ++# and source location and configuration flags for compiling in ++JPX_LIB=jasper ++SHARE_JPX=0 ++JPXSRCDIR=jasper ++JPX_CFLAGS=-DJAS_CONFIGURE ++ + # Define the directory where the icclib source are stored. + # See icclib.mak for more information + ICCSRCDIR=icclib +@@ -223,7 +231,7 @@ RANLIB=ranlib + + # Define the name of the C compiler. + +-CC=gcc ++CC?=cc + + # Define the name of the linker for the final link step. + # Normally this is the same as the C compiler. +@@ -240,7 +248,7 @@ GCFLAGS=-Wall -Wstrict-prototypes -Wmiss + # Define the added flags for standard, debugging, profiling + # and shared object builds. + +-CFLAGS_STANDARD=-O2 ++CFLAGS_STANDARD?=-O2 + CFLAGS_DEBUG=-g -O0 + CFLAGS_PROFILE=-pg -O2 + CFLAGS_SO=-fPIC +@@ -256,7 +264,8 @@ CFLAGS_SO=-fPIC + # We don't include -ansi, because this gets in the way of the platform- + # specific stuff that typically needs; nevertheless, we expect + # gcc to accept ANSI-style function prototypes and function definitions. +-XCFLAGS=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\" ++#XCFLAGS+=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\" ++XCFLAGS+=-DUPD_SIGNAL=0 -I${JPXSRCDIR}/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include + + CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) + +@@ -267,7 +276,7 @@ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(X + # -R /usr/local/xxx/lib:/usr/local/lib + # giving the full path names of the shared library directories. + # XLDFLAGS can be set from the command line. +-XLDFLAGS= ++XLDFLAGS+=-L${LOCALBASE}/lib + + LDFLAGS=$(XLDFLAGS) + +@@ -278,7 +287,7 @@ LDFLAGS=$(XLDFLAGS) + # Solaris may need -lnsl -lsocket -lposix4. + # (Libraries required by individual drivers are handled automatically.) + +-EXTRALIBS=-rdynamic -ldl ++EXTRALIBS+=-Wl,-export-dynamic + + # Define the standard libraries to search at the end of linking. + # Most platforms require -lpthread for the POSIX threads library; +@@ -300,7 +309,7 @@ STDLIBS=-lm + # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, + # not in $(XINCLUDE). + +-XINCLUDE=-I/usr/X11R6/include ++XINCLUDE=-I${LOCALBASE}/include + + # Define the directory/ies and library names for the X11 library files. + # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH +@@ -315,29 +324,29 @@ XINCLUDE=-I/usr/X11R6/include + #XLIBS=Xt SM ICE Xext X11 + + #XLIBDIRS=-L/usr/local/X/lib +-XLIBDIRS=-L/usr/X11R6/lib ++XLIBDIRS=-L${LOCALBASE}/lib + XLIBDIR= +-XLIBS=Xt Xext X11 ++XLIBS=Xt SM ICE Xext X11 + + # Define the .dev module that implements thread and synchronization + # primitives for this platform. + + # If POSIX sync primitives are used, also change the STDLIBS to include + # the pthread library. +-#SYNC=posync ++SYNC=posync + + # define the file name extension for a shared lib + DYNANIC_LIB_EXT=so + + # Default is No sync primitives since some platforms don't have it (HP-UX) +-SYNC=nosync ++#SYNC=nosync + + SOC_LOADER=dxmainc.c + # ------ Devices and features ------ # + + # Choose the language feature(s) to include. See gs.mak for details. + +-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev ++FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev $(PSD)jbig2.dev $(PSD)jpx.dev + #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev + # The following is strictly for testing. + FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev +@@ -476,6 +485,9 @@ include $(GLSRCDIR)/zlib.mak + include $(GLSRCDIR)/png.mak + include $(GLSRCDIR)/tiff.mak + include $(GLSRCDIR)/jbig2.mak ++include $(GLSRCDIR)/jasper.mak ++include $(GLSRCDIR)/ldf_jb2.mak ++include $(GLSRCDIR)/lwf_jp2.mak + include $(GLSRCDIR)/icclib.mak + include $(GLSRCDIR)/lcms.mak + include $(GLSRCDIR)/ijs.mak +@@ -486,6 +498,7 @@ include $(GLSRCDIR)/unixlink.mak + include $(GLSRCDIR)/unix-dll.mak + include $(GLSRCDIR)/unix-end.mak + include $(GLSRCDIR)/unixinst.mak ++include $(CONTRIBDIR)/contrib.mak + + # This has to come last so it won't be taken as the default target. + $(AK): diff --git a/print/ghostscript9-base/files/patch-base_unixinst.mak b/print/ghostscript9-base/files/patch-base_unixinst.mak new file mode 100644 index 000000000000..75d285cb2c60 --- /dev/null +++ b/print/ghostscript9-base/files/patch-base_unixinst.mak @@ -0,0 +1,20 @@ +--- base/unixinst.mak.orig 2012-08-08 08:01:36 UTC ++++ base/unixinst.mak +@@ -45,7 +45,7 @@ ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf1 + wftopfa 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=gs/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \ +- $(INSTALL_PROGRAM) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ ++ $(INSTALL_SCRIPT) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ + fi;\ + done' + +@@ -142,7 +142,7 @@ install-doc: $(PSDOCDIR)/News.htm + done' + + # install the man pages for each locale +-MAN_LCDIRS=. de ++MAN_LCDIRS=. + MAN1_LINKS_PS2PS=eps2eps + MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13 ps2pdf14 + MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj diff --git a/print/ghostscript9-base/files/patch-contrib-contrib.mak b/print/ghostscript9-base/files/patch-contrib-contrib.mak deleted file mode 100644 index 5c00766b680a..000000000000 --- a/print/ghostscript9-base/files/patch-contrib-contrib.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/contrib.mak.orig 2012-04-08 01:05:18.000000000 +0900 -+++ contrib/contrib.mak 2012-04-08 01:05:44.000000000 +0900 -@@ -943,7 +943,7 @@ - $(GLOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH) - $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c - --$(GLOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h -+$(GLOBJ)dviprlib.$(OBJ) : $(arch_h) $(stdio__h) $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h - $(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c - - extra-dmprt-install: diff --git a/print/ghostscript9-base/files/patch-contrib__japanese__dmp_site.ps b/print/ghostscript9-base/files/patch-contrib__japanese__dmp_site.ps deleted file mode 100644 index db09592c5704..000000000000 --- a/print/ghostscript9-base/files/patch-contrib__japanese__dmp_site.ps +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/japanese/dmp_site.ps.orig 2012-08-08 17:01:36.000000000 +0900 -+++ contrib/japanese/dmp_site.ps 2015-08-20 15:32:53.920571000 +0900 -@@ -1,7 +1,7 @@ - %! - BeginConfig - %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%% --/printer (escp_24.src) -+/printer (%%DATADIR%%/lib/escp_24.src) - % horizontal / vertical - % /resolution [ 180.0 180.0 ] - % horizontal / vertical diff --git a/print/ghostscript9-base/files/patch-contrib__japanese__gdevdmpr.c b/print/ghostscript9-base/files/patch-contrib__japanese__gdevdmpr.c deleted file mode 100644 index 2f85bc67e060..000000000000 --- a/print/ghostscript9-base/files/patch-contrib__japanese__gdevdmpr.c +++ /dev/null @@ -1,53 +0,0 @@ ---- contrib/japanese/gdevdmpr.c.orig 2011-08-05 20:12:20.000000000 +0900 -+++ contrib/japanese/gdevdmpr.c 2011-12-06 15:36:10.000000000 +0900 -@@ -32,7 +32,7 @@ - - #include "gdevprn.h" - #include "gp.h" --#include "errors.h" -+#include "psi/ierrors.h" - #include "gsparam.h" - #include "gsstate.h" - #include "math_.h" -@@ -41,8 +41,6 @@ - /* include library header. */ - #include "dviprlib.h" - --extern FILE *lib_fopen(const char *); -- - #define LOCAL_DEBUG 0 - - #define DEVICE_NAME "dmprt" -@@ -402,8 +400,6 @@ - if (pddev->dmprt.max_height>0 && pddev->dmprt.max_heightheight) - pddev->height = pddev->dmprt.max_height; - -- dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL); -- - return code; - } - -@@ -422,8 +418,6 @@ - if (code < 0) return code; - if (code == 0) pddev->dmprt.debug_f = vbool; - -- dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL); -- - code = param_read_bool(plist, "Verbose", &vbool); - if (code < 0) return code; - pddev->dmprt.verbose_f = vbool; -@@ -846,13 +840,12 @@ - char *env; - - strcpy(fname,fnamebase); -- fp = lib_fopen(fname); -+ fp = fopen(fname,"r"); - if (fp == NULL) { - env = getenv("TEXCFG"); - if (env) { - strcpy(fname,env); - strcat(fname, gp_file_name_concat_string(env,strlen(env))); -- strcat(fname,fnamebase); - fp = fopen(fname,gp_fmode_rb); - } - } diff --git a/print/ghostscript9-base/files/patch-contrib_contrib.mak b/print/ghostscript9-base/files/patch-contrib_contrib.mak new file mode 100644 index 000000000000..45a0610841ff --- /dev/null +++ b/print/ghostscript9-base/files/patch-contrib_contrib.mak @@ -0,0 +1,11 @@ +--- contrib/contrib.mak.orig 2012-08-08 08:01:36 UTC ++++ contrib/contrib.mak +@@ -943,7 +943,7 @@ $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev + $(GLOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH) + $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c + +-$(GLOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h ++$(GLOBJ)dviprlib.$(OBJ) : $(arch_h) $(stdio__h) $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h + $(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c + + extra-dmprt-install: diff --git a/print/ghostscript9-base/files/patch-contrib_japanese_dmp__site.ps b/print/ghostscript9-base/files/patch-contrib_japanese_dmp__site.ps new file mode 100644 index 000000000000..2a82c315308d --- /dev/null +++ b/print/ghostscript9-base/files/patch-contrib_japanese_dmp__site.ps @@ -0,0 +1,11 @@ +--- contrib/japanese/dmp_site.ps.orig 2012-08-08 08:01:36 UTC ++++ contrib/japanese/dmp_site.ps +@@ -1,7 +1,7 @@ + %! + BeginConfig + %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%% +-/printer (escp_24.src) ++/printer (%%DATADIR%%/lib/escp_24.src) + % horizontal / vertical + % /resolution [ 180.0 180.0 ] + % horizontal / vertical diff --git a/print/ghostscript9-base/files/patch-contrib_japanese_gdevdmpr.c b/print/ghostscript9-base/files/patch-contrib_japanese_gdevdmpr.c new file mode 100644 index 000000000000..282bb5c847eb --- /dev/null +++ b/print/ghostscript9-base/files/patch-contrib_japanese_gdevdmpr.c @@ -0,0 +1,53 @@ +--- contrib/japanese/gdevdmpr.c.orig 2012-08-08 08:01:36 UTC ++++ contrib/japanese/gdevdmpr.c +@@ -32,7 +32,7 @@ + + #include "gdevprn.h" + #include "gp.h" +-#include "errors.h" ++#include "psi/ierrors.h" + #include "gsparam.h" + #include "gsstate.h" + #include "math_.h" +@@ -41,8 +41,6 @@ + /* include library header. */ + #include "dviprlib.h" + +-extern FILE *lib_fopen(const char *); +- + #define LOCAL_DEBUG 0 + + #define DEVICE_NAME "dmprt" +@@ -402,8 +400,6 @@ gdev_dmprt_put_params(gx_device *pdev, g + if (pddev->dmprt.max_height>0 && pddev->dmprt.max_heightheight) + pddev->height = pddev->dmprt.max_height; + +- dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL); +- + return code; + } + +@@ -422,8 +418,6 @@ gdev_dmprt_put_dmprt_params(gx_device *p + if (code < 0) return code; + if (code == 0) pddev->dmprt.debug_f = vbool; + +- dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL); +- + code = param_read_bool(plist, "Verbose", &vbool); + if (code < 0) return code; + pddev->dmprt.verbose_f = vbool; +@@ -846,13 +840,12 @@ gdev_dmprt_dviprt_lib_fopen(const char * + char *env; + + strcpy(fname,fnamebase); +- fp = lib_fopen(fname); ++ fp = fopen(fname,"r"); + if (fp == NULL) { + env = getenv("TEXCFG"); + if (env) { + strcpy(fname,env); + strcat(fname, gp_file_name_concat_string(env,strlen(env))); +- strcat(fname,fnamebase); + fp = fopen(fname,gp_fmode_rb); + } + } diff --git a/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.c b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.c new file mode 100644 index 000000000000..760cdfd5cd07 --- /dev/null +++ b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.c @@ -0,0 +1,18 @@ +--- contrib/lips4/gdevlips.c.orig 2012-08-08 08:01:36 UTC ++++ contrib/lips4/gdevlips.c +@@ -62,7 +62,15 @@ lips_media_selection(int width, int heig + height = tmp; + } + for (pt = lips_paper_table; pt->num_unit < 80; pt++) ++/* add by shige 11/06 2003 */ ++#ifdef USE_LIPS_SIZE_ERROR ++ if(pt->width+LIPS_SIZE_ERROR_VALUE>=width ++ && pt->width-LIPS_SIZE_ERROR_VALUE<=width ++ && pt->height+LIPS_SIZE_ERROR_VALUE>=height ++ && pt->height-LIPS_SIZE_ERROR_VALUE<=height) ++#else + if (pt->width == width && pt->height == height) ++#endif + break; + + return pt->num_unit + landscape; diff --git a/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.h b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.h new file mode 100644 index 000000000000..68b4769ae8ff --- /dev/null +++ b/print/ghostscript9-base/files/patch-contrib_lips4_gdevlips.h @@ -0,0 +1,17 @@ +--- contrib/lips4/gdevlips.h.orig 2012-08-08 08:01:36 UTC ++++ contrib/lips4/gdevlips.h +@@ -191,6 +191,14 @@ + bool faceup;\ + char mediaType[LIPS_MEDIACHAR_MAX] + ++/* added by shige 11/06 2003 */ ++#define USE_LIPS_SIZE_ERROR ++#define LIPS_SIZE_ERROR_VALUE 2 ++ ++/* added by shige 11/09 2003 */ ++#define LIPS_HEIGHT_MAX_720 11906 ++#define LIPS_WIDTH_MAX_720 8419 ++ + int lips_media_selection(int width, int height); + int lips_packbits_encode(byte * inBuff, byte * outBuff, int Length); + int lips_mode3format_encode(byte * inBuff, byte * outBuff, int Length); diff --git a/print/ghostscript9-base/files/patch-epag-3.09_ert.c b/print/ghostscript9-base/files/patch-epag-3.09_ert.c new file mode 100644 index 000000000000..d4395ca747a5 --- /dev/null +++ b/print/ghostscript9-base/files/patch-epag-3.09_ert.c @@ -0,0 +1,11 @@ +--- epag-3.09/ert.c.orig 2000-07-08 04:33:09 UTC ++++ epag-3.09/ert.c +@@ -1,6 +1,8 @@ + /* $Id: ert.c,v 1.3 1998/11/20 10:51:12 nari Exp $ */ + + #include ++#include ++#include + + /* + * EPSON Remoteのコマンドを出力するコマンド diff --git a/print/ghostscript9-base/files/patch-epag-3.09_gdevepag.c b/print/ghostscript9-base/files/patch-epag-3.09_gdevepag.c new file mode 100644 index 000000000000..f4d3f11e7b8c --- /dev/null +++ b/print/ghostscript9-base/files/patch-epag-3.09_gdevepag.c @@ -0,0 +1,217 @@ +--- epag-3.09/gdevepag.c.orig 2000-07-08 04:33:09 UTC ++++ epag-3.09/gdevepag.c +@@ -102,30 +102,30 @@ typedef struct _epagBubble{ + } EpagBubble; + + /* The device descriptors */ +-private dev_proc_open_device(epag_open); +-private dev_proc_close_device(epag_close); +-private dev_proc_print_page(epag_print_page); +-private void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int); +-private dev_proc_print_page(epag_print_page); +-private dev_proc_get_params(epag_get_params); +-private dev_proc_put_params(epag_put_params); +-private void epag_paper_set(gx_device_printer *pdev, FILE *fp); +-private void epag_bubble_flush_all(EpagPageCont *cont); +-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont); +-private void epag_page_close(EpagPageCont *cont); +-private int epag_read_image(EpagPageCont *cont); +-private void epag_process_line(EpagPageCont *cont); +-private int epag_is_black(EpagPageCont *cont, int bx); +-private void epag_rect_add(EpagPageCont *cont,int start,int end); +-private void epag_bubble_gen(EpagPageCont *cont, ++static dev_proc_open_device(epag_open); ++static dev_proc_close_device(epag_close); ++static dev_proc_print_page(epag_print_page); ++static void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int); ++static dev_proc_print_page(epag_print_page); ++static dev_proc_get_params(epag_get_params); ++static dev_proc_put_params(epag_put_params); ++static void epag_paper_set(gx_device_printer *pdev, FILE *fp); ++static void epag_bubble_flush_all(EpagPageCont *cont); ++static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont); ++static void epag_page_close(EpagPageCont *cont); ++static int epag_read_image(EpagPageCont *cont); ++static void epag_process_line(EpagPageCont *cont); ++static int epag_is_black(EpagPageCont *cont, int bx); ++static void epag_rect_add(EpagPageCont *cont,int start,int end); ++static void epag_bubble_gen(EpagPageCont *cont, + int x0, int x1, int y0, int y1); +-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl); +-private void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl); ++static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl); ++static void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl); + + /* + * デバイスの宣言 + */ +-private gx_device_procs prn_epag_procs = ++static gx_device_procs prn_epag_procs = + prn_params_procs(epag_open, gdev_prn_output_page, epag_close, + epag_get_params, epag_put_params); + gx_device_printer far_data gs_epag_device = +@@ -140,13 +140,13 @@ prn_device(prn_epag_procs, "epag", + static char *epson_remote_start = "\033\001@EJL \r\n"; + + /* Open the printer, adjusting the margins if necessary. */ +-private int ++static int + epag_open(gx_device *pdev) + { + return gdev_prn_open(pdev); + } + +-private int ++static int + epag_close(gx_device *pdev) + { + gdev_prn_open_printer(pdev, 1); +@@ -163,7 +163,7 @@ epag_close(gx_device *pdev) + return gdev_prn_close(pdev); + } + +-private int ++static int + epag_print_page(gx_device_printer *pdev, FILE *fp) + { + EpagPageCont cont; +@@ -205,7 +205,7 @@ static char can_inits[] ={ + GS, '2', 'a', 'b', 'P', /* イメージ描画後下へ */ + }; + +-private void ++static void + epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies) + { + double xDpi,yDpi; +@@ -260,7 +260,7 @@ epag_printer_initialize(gx_device_printe + fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255); + } + +-private int ++static int + epag_get_params(gx_device *pdev, gs_param_list *plist) + { + int code; +@@ -286,7 +286,7 @@ epag_get_params(gx_device *pdev, gs_para + } + + /* Put properties. */ +-private int ++static int + epag_put_params(gx_device *pdev, gs_param_list *plist) + { + param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf); +@@ -380,7 +380,7 @@ void epag_paper_set(gx_device_printer *p + /* + * epag_bubble_flush_all: 残っている bubbleを全て出力する。 + */ +-private void epag_bubble_flush_all(EpagPageCont *cont) ++static void epag_bubble_flush_all(EpagPageCont *cont) + { + int i; + +@@ -392,7 +392,7 @@ private void epag_bubble_flush_all(EpagP + /* + * epag_page_cont_init: EpagPageContの初期化、バッファ確保等 + */ +-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp, ++static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp, + EpagPageCont *cont) + { + int bpl; +@@ -417,15 +417,15 @@ private void epag_page_cont_init(gx_devi + cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ; + if(cont->maxY < cont->bh) cont->maxY = cont->bh; + +- cont->bp = gs_malloc(bpl , cont->maxY, "epag_skip_blank_init(bp)"); +- cont->bp2 = gs_malloc(bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); ++ cont->bp = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl , cont->maxY, "epag_skip_blank_init(bp)"); ++ cont->bp2 = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); + + cont->h = cont->r = 0; + +- cont->bubbleTbl=gs_malloc(sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); ++ cont->bubbleTbl = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); + for(i=0;imaxBx;i++) + cont->bubbleTbl[i] = NULL; +- cont->bubbleBuffer=gs_malloc(sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); ++ cont->bubbleBuffer=gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); + bbtbl = (EpagBubble *)cont->bubbleBuffer; + for(i=0;imaxBx-1;i++) + bbtbl[i].next = &bbtbl[i+1]; +@@ -433,15 +433,15 @@ private void epag_page_cont_init(gx_devi + cont->freeBubbleList = &bbtbl[0]; + } + +-private void ++static void + epag_page_close(EpagPageCont *cont) + { +- gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); +- gs_free(cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); +- gs_free(cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); ++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); ++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); ++ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); + } + +-private int ++static int + epag_read_image(EpagPageCont *cont) + { + int bh = cont->bh; +@@ -473,7 +473,7 @@ epag_read_image(EpagPageCont *cont) + /* + * bh行分のラスターデータを処理する + */ +-private void ++static void + epag_process_line(EpagPageCont *cont) + { + int bh = cont->bh; +@@ -502,7 +502,7 @@ epag_process_line(EpagPageCont *cont) + else epag_rect_add(cont, 0, cont->maxBx-1); + } + +-private int ++static int + epag_is_black(EpagPageCont *cont, int bx) + { + int bh = cont->bh; +@@ -520,7 +520,7 @@ epag_is_black(EpagPageCont *cont, int bx + return 0; + } + +-private void ++static void + epag_rect_add(EpagPageCont *cont,int start,int end) + { + int x0 = start * cont->bw; +@@ -544,7 +544,7 @@ epag_rect_add(EpagPageCont *cont,int sta + } + } + +-private void ++static void + epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1) + { + EpagBubble *bbl; +@@ -569,7 +569,7 @@ epag_bubble_gen(EpagPageCont *cont, int + } + } + +-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl) ++static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl) + { + int bx,bx0,bx1; + +@@ -588,7 +588,7 @@ private void epag_bubble_flush(EpagPageC + + /* イメージを出力 */ + +-private void ++static void + epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl) + { + FILE *fp = cont->fp; diff --git a/print/ghostscript9-base/files/patch-epag-ert.c b/print/ghostscript9-base/files/patch-epag-ert.c deleted file mode 100644 index 6a6dd2540b8a..000000000000 --- a/print/ghostscript9-base/files/patch-epag-ert.c +++ /dev/null @@ -1,11 +0,0 @@ ---- epag-3.09/ert.c.orig 2000-07-08 13:33:09.000000000 +0900 -+++ epag-3.09/ert.c 2012-02-13 01:28:55.000000000 +0900 -@@ -1,6 +1,8 @@ - /* $Id: ert.c,v 1.3 1998/11/20 10:51:12 nari Exp $ */ - - #include -+#include -+#include - - /* - * EPSON Remoteのコマンドを出力するコマンド diff --git a/print/ghostscript9-base/files/patch-epag__gdevepag.c b/print/ghostscript9-base/files/patch-epag__gdevepag.c deleted file mode 100644 index 6012768b4d9c..000000000000 --- a/print/ghostscript9-base/files/patch-epag__gdevepag.c +++ /dev/null @@ -1,217 +0,0 @@ ---- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000 -+++ epag/gdevepag.c Sat Nov 24 15:25:11 2007 -@@ -102,30 +102,30 @@ - } EpagBubble; - - /* The device descriptors */ --private dev_proc_open_device(epag_open); --private dev_proc_close_device(epag_close); --private dev_proc_print_page(epag_print_page); --private void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int); --private dev_proc_print_page(epag_print_page); --private dev_proc_get_params(epag_get_params); --private dev_proc_put_params(epag_put_params); --private void epag_paper_set(gx_device_printer *pdev, FILE *fp); --private void epag_bubble_flush_all(EpagPageCont *cont); --private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont); --private void epag_page_close(EpagPageCont *cont); --private int epag_read_image(EpagPageCont *cont); --private void epag_process_line(EpagPageCont *cont); --private int epag_is_black(EpagPageCont *cont, int bx); --private void epag_rect_add(EpagPageCont *cont,int start,int end); --private void epag_bubble_gen(EpagPageCont *cont, -+static dev_proc_open_device(epag_open); -+static dev_proc_close_device(epag_close); -+static dev_proc_print_page(epag_print_page); -+static void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int); -+static dev_proc_print_page(epag_print_page); -+static dev_proc_get_params(epag_get_params); -+static dev_proc_put_params(epag_put_params); -+static void epag_paper_set(gx_device_printer *pdev, FILE *fp); -+static void epag_bubble_flush_all(EpagPageCont *cont); -+static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont); -+static void epag_page_close(EpagPageCont *cont); -+static int epag_read_image(EpagPageCont *cont); -+static void epag_process_line(EpagPageCont *cont); -+static int epag_is_black(EpagPageCont *cont, int bx); -+static void epag_rect_add(EpagPageCont *cont,int start,int end); -+static void epag_bubble_gen(EpagPageCont *cont, - int x0, int x1, int y0, int y1); --private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl); --private void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl); -+static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl); -+static void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl); - - /* - * デバイスの宣言 - */ --private gx_device_procs prn_epag_procs = -+static gx_device_procs prn_epag_procs = - prn_params_procs(epag_open, gdev_prn_output_page, epag_close, - epag_get_params, epag_put_params); - gx_device_printer far_data gs_epag_device = -@@ -140,13 +140,13 @@ - static char *epson_remote_start = "\033\001@EJL \r\n"; - - /* Open the printer, adjusting the margins if necessary. */ --private int -+static int - epag_open(gx_device *pdev) - { - return gdev_prn_open(pdev); - } - --private int -+static int - epag_close(gx_device *pdev) - { - gdev_prn_open_printer(pdev, 1); -@@ -163,7 +163,7 @@ - return gdev_prn_close(pdev); - } - --private int -+static int - epag_print_page(gx_device_printer *pdev, FILE *fp) - { - EpagPageCont cont; -@@ -205,7 +205,7 @@ - GS, '2', 'a', 'b', 'P', /* イメージ描画後下へ */ - }; - --private void -+static void - epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies) - { - double xDpi,yDpi; -@@ -260,7 +260,7 @@ - fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255); - } - --private int -+static int - epag_get_params(gx_device *pdev, gs_param_list *plist) - { - int code; -@@ -286,7 +286,7 @@ - } - - /* Put properties. */ --private int -+static int - epag_put_params(gx_device *pdev, gs_param_list *plist) - { - param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf); -@@ -380,7 +380,7 @@ - /* - * epag_bubble_flush_all: 残っている bubbleを全て出力する。 - */ --private void epag_bubble_flush_all(EpagPageCont *cont) -+static void epag_bubble_flush_all(EpagPageCont *cont) - { - int i; - -@@ -392,7 +392,7 @@ - /* - * epag_page_cont_init: EpagPageContの初期化、バッファ確保等 - */ --private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp, -+static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp, - EpagPageCont *cont) - { - int bpl; -@@ -417,15 +417,15 @@ - cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ; - if(cont->maxY < cont->bh) cont->maxY = cont->bh; - -- cont->bp = gs_malloc(bpl , cont->maxY, "epag_skip_blank_init(bp)"); -- cont->bp2 = gs_malloc(bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); -+ cont->bp = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl , cont->maxY, "epag_skip_blank_init(bp)"); -+ cont->bp2 = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); - - cont->h = cont->r = 0; - -- cont->bubbleTbl=gs_malloc(sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); -+ cont->bubbleTbl = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); - for(i=0;imaxBx;i++) - cont->bubbleTbl[i] = NULL; -- cont->bubbleBuffer=gs_malloc(sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); -+ cont->bubbleBuffer=gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); - bbtbl = (EpagBubble *)cont->bubbleBuffer; - for(i=0;imaxBx-1;i++) - bbtbl[i].next = &bbtbl[i+1]; -@@ -433,15 +433,15 @@ - cont->freeBubbleList = &bbtbl[0]; - } - --private void -+static void - epag_page_close(EpagPageCont *cont) - { -- gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); -- gs_free(cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); -- gs_free(cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); -+ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); -+ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); -+ gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); - } - --private int -+static int - epag_read_image(EpagPageCont *cont) - { - int bh = cont->bh; -@@ -473,7 +473,7 @@ - /* - * bh行分のラスターデータを処理する - */ --private void -+static void - epag_process_line(EpagPageCont *cont) - { - int bh = cont->bh; -@@ -502,7 +502,7 @@ - else epag_rect_add(cont, 0, cont->maxBx-1); - } - --private int -+static int - epag_is_black(EpagPageCont *cont, int bx) - { - int bh = cont->bh; -@@ -520,7 +520,7 @@ - return 0; - } - --private void -+static void - epag_rect_add(EpagPageCont *cont,int start,int end) - { - int x0 = start * cont->bw; -@@ -544,7 +544,7 @@ - } - } - --private void -+static void - epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1) - { - EpagBubble *bbl; -@@ -569,7 +569,7 @@ - } - } - --private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl) -+static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl) - { - int bx,bx0,bx1; - -@@ -588,7 +588,7 @@ - - /* イメージを出力 */ - --private void -+static void - epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl) - { - FILE *fp = cont->fp; diff --git a/print/ghostscript9-base/files/patch-lips:gdevlips.c b/print/ghostscript9-base/files/patch-lips:gdevlips.c deleted file mode 100644 index 0917be89e49a..000000000000 --- a/print/ghostscript9-base/files/patch-lips:gdevlips.c +++ /dev/null @@ -1,18 +0,0 @@ ---- contrib/lips4/gdevlips.c.orig 2011-08-05 20:12:20.000000000 +0900 -+++ contrib/lips4/gdevlips.c 2011-12-06 15:31:38.000000000 +0900 -@@ -62,7 +62,15 @@ - height = tmp; - } - for (pt = lips_paper_table; pt->num_unit < 80; pt++) -+/* add by shige 11/06 2003 */ -+#ifdef USE_LIPS_SIZE_ERROR -+ if(pt->width+LIPS_SIZE_ERROR_VALUE>=width -+ && pt->width-LIPS_SIZE_ERROR_VALUE<=width -+ && pt->height+LIPS_SIZE_ERROR_VALUE>=height -+ && pt->height-LIPS_SIZE_ERROR_VALUE<=height) -+#else - if (pt->width == width && pt->height == height) -+#endif - break; - - return pt->num_unit + landscape; diff --git a/print/ghostscript9-base/files/patch-lips:gdevlips.h b/print/ghostscript9-base/files/patch-lips:gdevlips.h deleted file mode 100644 index b3520ba1ac33..000000000000 --- a/print/ghostscript9-base/files/patch-lips:gdevlips.h +++ /dev/null @@ -1,17 +0,0 @@ ---- contrib/lips4/gdevlips.h.orig Thu Nov 2 12:09:18 2000 -+++ contrib/lips4/gdevlips.h Tue Jan 13 01:23:47 2004 -@@ -188,6 +188,14 @@ - bool faceup;\ - char mediaType[LIPS_MEDIACHAR_MAX]; - -+/* added by shige 11/06 2003 */ -+#define USE_LIPS_SIZE_ERROR -+#define LIPS_SIZE_ERROR_VALUE 2 -+ -+/* added by shige 11/09 2003 */ -+#define LIPS_HEIGHT_MAX_720 11906 -+#define LIPS_WIDTH_MAX_720 8419 -+ - int lips_media_selection(int width, int height); - int lips_packbits_encode(byte * inBuff, byte * outBuff, int Length); - int lips_mode3format_encode(byte * inBuff, byte * outBuff, int Length); diff --git a/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_includes.h b/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_includes.h deleted file mode 100644 index 67591744852e..000000000000 --- a/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_includes.h +++ /dev/null @@ -1,11 +0,0 @@ ---- openjpeg/libopenjpeg/opj_includes.h.orig 2012-02-13 08:48:33.000000000 +0900 -+++ openjpeg/libopenjpeg/opj_includes.h 2012-02-13 08:50:41.000000000 +0900 -@@ -77,7 +77,7 @@ - #endif /* INLINE */ - - /* Are restricted pointers available? (C99) */ --#if (__STDC_VERSION__ != 199901L) -+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ != 199901L) - /* Not a C99 compiler */ - #ifdef __GNUC__ - #define restrict __restrict__ diff --git a/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_malloc.h b/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_malloc.h deleted file mode 100644 index a2c27a03a799..000000000000 --- a/print/ghostscript9-base/files/patch-openjpeg-libopenjpeg-opj_malloc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-02-08 17:48:48.000000000 +0900 -+++ openjpeg/libopenjpeg/opj_malloc.h 2012-02-13 11:12:27.000000000 +0900 -@@ -83,6 +83,8 @@ - #else /* Not _WIN32 */ - #if defined(__sun) - #define HAVE_MEMALIGN -+ #elif defined(__FreeBSD__) -+ #undef HAVE_MEMALIGN - /* Linux x86_64 and OSX always align allocations to 16 bytes */ - #elif !defined(__amd64__) && !defined(__APPLE__) - #define HAVE_MEMALIGN diff --git a/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__includes.h b/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__includes.h new file mode 100644 index 000000000000..564ec616500c --- /dev/null +++ b/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__includes.h @@ -0,0 +1,11 @@ +--- openjpeg/libopenjpeg/opj_includes.h.orig 2012-08-08 08:01:36 UTC ++++ openjpeg/libopenjpeg/opj_includes.h +@@ -77,7 +77,7 @@ Most compilers implement their own versi + #endif /* INLINE */ + + /* Are restricted pointers available? (C99) */ +-#if (__STDC_VERSION__ != 199901L) ++#if defined(__STDC_VERSION__) && (__STDC_VERSION__ != 199901L) + /* Not a C99 compiler */ + #ifdef __GNUC__ + #define restrict __restrict__ diff --git a/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__malloc.h b/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__malloc.h new file mode 100644 index 000000000000..43bd90e9c150 --- /dev/null +++ b/print/ghostscript9-base/files/patch-openjpeg_libopenjpeg_opj__malloc.h @@ -0,0 +1,11 @@ +--- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-08-08 08:01:36 UTC ++++ openjpeg/libopenjpeg/opj_malloc.h +@@ -83,6 +83,8 @@ Allocate memory aligned to a 16 byte bou + #else /* Not _WIN32 */ + #if defined(__sun) + #define HAVE_MEMALIGN ++ #elif defined(__FreeBSD__) ++ #undef HAVE_MEMALIGN + /* Linux x86_64 and OSX always align allocations to 16 bytes */ + #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__FreeBSD__) + #define HAVE_MEMALIGN diff --git a/print/ghostscript9-base/files/patch-psi-zicc.c b/print/ghostscript9-base/files/patch-psi-zicc.c deleted file mode 100644 index 98c4eed85c37..000000000000 --- a/print/ghostscript9-base/files/patch-psi-zicc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- psi/zicc.c -+++ psi/zicc.c 2008-02-05 16:11:59.000000000 +0000 -@@ -77,6 +77,9 @@ zseticcspace(i_ctx_t * i_ctx_p) - dict_find_string(op, "N", &pnval); - ncomps = pnval->value.intval; - -+ if (2*ncomps > sizeof(range_buff)/sizeof(float)) -+ return_error(e_rangecheck); -+ - /* verify the DataSource entry */ - if (dict_find_string(op, "DataSource", &pstrmval) <= 0) - return_error(e_undefined); diff --git a/print/ghostscript9-base/files/patch-psi_zicc.c b/print/ghostscript9-base/files/patch-psi_zicc.c new file mode 100644 index 000000000000..3ed10a7611f8 --- /dev/null +++ b/print/ghostscript9-base/files/patch-psi_zicc.c @@ -0,0 +1,12 @@ +--- psi/zicc.c.orig 2012-08-08 08:01:36 UTC ++++ psi/zicc.c +@@ -61,6 +61,9 @@ int seticc(i_ctx_t * i_ctx_p, int ncomps + + palt_cs = gs_currentcolorspace(igs); + ++ if (2*ncomps > sizeof(range_buff)/sizeof(float)) ++ return_error(e_rangecheck); ++ + /* verify the DataSource entry */ + if (dict_find_string(ICCdict, "DataSource", &pstrmval) <= 0) + return_error(e_undefined); -- cgit v1.2.3