- paps-0.6.8-dsc-compliant.patch: Patch out to be DSC compliant. (#424951)

This commit is contained in:
Akira TAGOH 2008-01-10 14:19:25 +00:00
parent 2f3f134295
commit bedf7f5c65
2 changed files with 90 additions and 1 deletions

View File

@ -0,0 +1,84 @@
diff -pruN paps-0.6.8.orig/src/libpaps.c paps-0.6.8/src/libpaps.c
--- paps-0.6.8.orig/src/libpaps.c 2008-01-10 22:43:44.000000000 +0900
+++ paps-0.6.8/src/libpaps.c 2008-01-10 22:53:43.000000000 +0900
@@ -118,7 +118,6 @@ gchar *paps_get_postscript_header_strdup
gchar *ret_str;
g_string_append_printf(paps->header,
"end end\n"
- "%%%%EndPrologue\n"
);
ret_str = g_strdup(paps->header->str);
g_string_truncate(paps->header, old_len);
@@ -247,7 +246,6 @@ static void
add_postscript_prologue(paps_private_t *paps)
{
g_string_append_printf(paps->header,
- "%%%%BeginProlog\n"
"/papsdict 1 dict def\n"
"papsdict begin\n"
"\n"
@@ -272,10 +270,10 @@ add_postscript_prologue(paps_private_t *
"/start_ol { gsave } bind def\n"
"/end_ol { closepath fill grestore } bind def\n"
/* Specify both x and y. */
- "/draw_char { fontdict begin gsave %f dup scale last_x last_y translate load exec end grestore} def\n"
- "/goto_xy { fontdict begin /last_y exch def /last_x exch def end } def\n"
- "/goto_x { fontdict begin /last_x exch def end } def\n"
- "/fwd_x { fontdict begin /last_x exch last_x add def end } def\n"
+ "/draw_char { fontdict begin gsave %f dup scale last_x cvi last_y cvi translate load exec end grestore} def\n"
+ "/goto_xy { fontdict begin /last_y exch last_y cvs def /last_x exch last_x cvs def end } def\n"
+ "/goto_x { fontdict begin /last_x exch last_x cvs def end } def\n"
+ "/fwd_x { fontdict begin /last_x exch last_x cvi add last_x cvs def end } def\n"
"/c /curveto load def\n"
"/x /conicto load def\n"
"/l /lineto load def\n"
@@ -344,7 +342,7 @@ add_postscript_prologue(paps_private_t *
/* Open up dictionaries */
g_string_append(paps->header,
- "/fontdict 1 dict def\n"
+ "/fontdict 1 dict dup begin /last_x 16 string def /last_y 16 string def end def\n"
"papsdict begin fontdict begin\n");
}
diff -pruN paps-0.6.8.orig/src/paps.c paps-0.6.8/src/paps.c
--- paps-0.6.8.orig/src/paps.c 2008-01-10 22:43:44.000000000 +0900
+++ paps-0.6.8/src/paps.c 2008-01-10 22:49:05.000000000 +0900
@@ -665,7 +665,7 @@ int main(int argc, char *argv[])
fprintf(OUT, "%s", paps_header);
g_free(paps_header);
- fprintf(OUT, "%%%%EndPrologue\n");
+ fprintf(OUT, "%%%%EndSetup\n");
fprintf(OUT, "%s", ps_pages_string->str);
print_postscript_trailer(OUT, num_pages);
@@ -1094,8 +1094,9 @@ void print_postscript_header(FILE *OUT,
"%%%%Creator: paps version 0.6.7 by Dov Grobgeld\n"
"%%%%Pages: (atend)\n"
"%%%%BoundingBox: 0 0 %d %d\n%s"
- "%%%%BeginProlog\n"
"%%%%Orientation: %s\n"
+ "%%%%EndComments\n"
+ "%%%%BeginProlog\n"
"/papsdict 1 dict def\n"
"papsdict begin\n"
"\n"
@@ -1139,7 +1140,8 @@ void print_postscript_header(FILE *OUT,
"/turnpage {\n"
" 90 rotate\n"
" 0 pageheight neg translate\n"
- "} def\n",
+ "} def\n"
+ "%%%%EndProlog\n",
title,
bb_page_width,
bb_page_height,
@@ -1152,6 +1154,7 @@ void print_postscript_header(FILE *OUT,
g_free(owner);
fprintf(OUT,
+ "%%%%BeginSetup\n"
"%% User settings\n"
"/pagewidth %d def\n"
"/pageheight %d def\n"

View File

@ -1,6 +1,6 @@
Name: paps Name: paps
Version: 0.6.8 Version: 0.6.8
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: http://paps.sourceforge.net/ URL: http://paps.sourceforge.net/
@ -19,6 +19,7 @@ Patch3: paps-0.6.6-lcnumeric.patch
Patch4: paps-0.6.6-exitcode.patch Patch4: paps-0.6.6-exitcode.patch
Patch50: paps-cups.patch Patch50: paps-cups.patch
Patch51: paps-cpilpi.patch Patch51: paps-cpilpi.patch
Patch52: paps-0.6.8-dsc-compliant.patch
Patch61: paps-0.6.6-fix-wcswidth.patch Patch61: paps-0.6.6-fix-wcswidth.patch
Summary: Plain Text to PostScript converter Summary: Plain Text to PostScript converter
@ -53,6 +54,7 @@ applications using paps API.
%patch4 -p1 -b .exitcode %patch4 -p1 -b .exitcode
%patch50 -p1 -b .cups %patch50 -p1 -b .cups
%patch51 -p1 -b .cpilpi %patch51 -p1 -b .cpilpi
%patch52 -p1 -b .dsc
#%patch11 -p1 -b .wcswidth #%patch11 -p1 -b .wcswidth
autoreconf autoreconf
@ -96,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libpaps.so %{_libdir}/libpaps.so
%changelog %changelog
* Thu Jan 10 2007 Akira TAGOH <tagoh@redhat.com> - 0.6.8-2
- paps-0.6.8-dsc-compliant.patch: Patch out to be DSC compliant. (#424951)
* Fri Nov 30 2007 Akira TAGOH <tagoh@redhat.com> - 0.6.8-1 * Fri Nov 30 2007 Akira TAGOH <tagoh@redhat.com> - 0.6.8-1
- New upstream release. - New upstream release.
- Remove patches merged and unnecessary anymore: - Remove patches merged and unnecessary anymore: