rpms/paps
7
0
Fork 0
Code Issues Pull Requests Releases Activity

revert 'document-charset' change

Browse Source
This commit is contained in:
Akira TAGOH 2006-07-17 09:24:12 +00:00
parent d0e073a2d3
commit ef1c988296
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
paps-cups.patch
View File

@ -65,7 +65,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
int do_tumble = -1; /* -1 means not initialized */ int do_tumble = -1; /* -1 means not initialized */
int do_duplex = -1; int do_duplex = -1;
gchar *paps_header = NULL; gchar *paps_header = NULL;
@@ -323,12 +325,118 @@ @@ -323,12 +325,115 @@
int header_sep = 20; int header_sep = 20;
int max_width = 0, w; int max_width = 0, w;
GIConv cvh = NULL; GIConv cvh = NULL;
@ -173,9 +173,6 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
+ } + }
+ if (getenv("CHARSET") != NULL) + if (getenv("CHARSET") != NULL)
+ encoding = g_strdup(getenv("CHARSET")); + encoding = g_strdup(getenv("CHARSET"));
+ if ((val = cupsGetOption("document-charset", num_options, options)) != NULL) {
+ encoding = g_strdup(val);
+ }
+ } + }
+ } G_STMT_END; + } G_STMT_END;
+ +
@ -184,7 +181,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
/* Parse command line */ /* Parse command line */
if (!g_option_context_parse(ctxt, &argc, &argv, &error)) if (!g_option_context_parse(ctxt, &argc, &argv, &error))
{ {
@@ -355,6 +463,8 @@ @@ -355,6 +460,8 @@
IN = stdin; IN = stdin;
} }
title = filename_in; title = filename_in;
@ -193,7 +190,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
paps = paps_new(); paps = paps_new();
pango_context = paps_get_pango_context (paps); pango_context = paps_get_pango_context (paps);
@@ -373,8 +483,10 @@ @@ -373,8 +480,10 @@
pango_context_set_font_description (pango_context, font_description); pango_context_set_font_description (pango_context, font_description);
/* Page layout */ /* Page layout */
@ -206,7 +203,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
if (num_columns == 1) if (num_columns == 1)
total_gutter_width = 0; total_gutter_width = 0;
@@ -435,6 +547,7 @@ @@ -435,6 +544,7 @@
page_layout.pango_dir = pango_dir; page_layout.pango_dir = pango_dir;
page_layout.filename = filename_in; page_layout.filename = filename_in;
page_layout.header_font_desc = header_font_desc; page_layout.header_font_desc = header_font_desc;
@ -214,7 +211,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
/* calculate x-coordinate scale */ /* calculate x-coordinate scale */
if (cpi > 0.0L) if (cpi > 0.0L)
@@ -781,6 +894,7 @@ @@ -781,6 +891,7 @@
int orientation = page_layout->page_width > page_layout->page_height; int orientation = page_layout->page_width > page_layout->page_height;
int bb_page_width = page_layout->page_width; int bb_page_width = page_layout->page_width;
int bb_page_height = page_layout->page_height; int bb_page_height = page_layout->page_height;
@ -222,7 +219,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
/* Keep bounding box non-rotated to make ggv happy */ /* Keep bounding box non-rotated to make ggv happy */
if (orientation) if (orientation)
@@ -790,12 +904,20 @@ @@ -790,12 +901,20 @@
bb_page_height = tmp; bb_page_height = tmp;
} }
@ -244,7 +241,7 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
"%%%%BeginProlog\n" "%%%%BeginProlog\n"
"%%%%Orientation: %s\n" "%%%%Orientation: %s\n"
"/papsdict 1 dict def\n" "/papsdict 1 dict def\n"
@@ -845,8 +967,10 @@ @@ -845,8 +964,10 @@
title, title,
bb_page_width, bb_page_width,
bb_page_height, bb_page_height,

1
paps.spec
View File

@ -78,7 +78,6 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Jul 17 2006 Akira TAGOH <tagoh@redhat.com> - 0.6.6-11 * Mon Jul 17 2006 Akira TAGOH <tagoh@redhat.com> - 0.6.6-11
- add an owner info to PS. - add an owner info to PS.
- support "document-charset" attribute.
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.6.6-10.2 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.6.6-10.2
- rebuild - rebuild