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

- Map CUPS charset names to real ones (bug #197577).

Browse Source
This commit is contained in:
Tim Waugh 2006-08-17 11:40:04 +00:00
parent ef1c988296
commit 89669d7759
2 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
paps-cups.patch
View File

@ -1,27 +1,5 @@
diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in --- paps-0.6.6/src/Makefile.am.cups 2006-08-17 12:12:43.000000000 +0100
--- paps-0.6.6.orig/configure.in 2006-04-28 04:41:36.000000000 +0900 +++ paps-0.6.6/src/Makefile.am 2006-08-17 12:12:43.000000000 +0100
+++ paps-0.6.6/configure.in 2006-07-17 13:38:30.000000000 +0900
@@ -7,4 +7,17 @@
AC_PROG_CC
AM_PROG_LIBTOOL
+dnl ======================================================
+dnl check for CUPS
+dnl ======================================================
+AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
+if test "$CUPS_CONFIG" = "no"; then
+ AC_MSG_ERROR([Please install cups development packages])
+fi
+CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+CUPS_LIBS=`$CUPS_CONFIG --libs`
+
+AC_SUBST(CUPS_CFLAGS)
+AC_SUBST(CUPS_LIBS)
+
AC_OUTPUT(Makefile src/Makefile doc/Makefile)
diff -ruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
--- paps-0.6.6.orig/src/Makefile.am 2006-07-17 13:35:07.000000000 +0900
+++ paps-0.6.6/src/Makefile.am 2006-07-17 13:38:30.000000000 +0900
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
libpaps_a_incdir = $(includedir) libpaps_a_incdir = $(includedir)
@ -35,9 +13,8 @@ diff -ruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am
paps_DEPENDENCIES = $(noinst_LIBRARIES) paps_DEPENDENCIES = $(noinst_LIBRARIES)
EXTRA_DIST = test_libpaps.c paps.1 EXTRA_DIST = test_libpaps.c paps.1
diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c --- paps-0.6.6/src/paps.c.cups 2006-08-17 12:12:43.000000000 +0100
--- paps-0.6.6.orig/src/paps.c 2006-07-17 13:35:07.000000000 +0900 +++ paps-0.6.6/src/paps.c 2006-08-17 12:35:56.000000000 +0100
+++ paps-0.6.6/src/paps.c 2006-07-17 13:45:45.000000000 +0900
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
#include <time.h> #include <time.h>
#include <locale.h> #include <locale.h>
@ -65,7 +42,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,115 @@ @@ -323,12 +325,121 @@
int header_sep = 20; int header_sep = 20;
int max_width = 0, w; int max_width = 0, w;
GIConv cvh = NULL; GIConv cvh = NULL;
@ -171,8 +148,14 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
+ if ((val = cupsGetOption("lpi", num_options, options)) != NULL) { + if ((val = cupsGetOption("lpi", num_options, options)) != NULL) {
+ lpi = atof(val); + lpi = atof(val);
+ } + }
+ if (getenv("CHARSET") != NULL) + if (getenv("CHARSET") != NULL) {
+ encoding = g_strdup(getenv("CHARSET")); + char *charset = getenv("CHARSET");
+ // Map CUPS charset names to real ones.
+ // http://cups.org/newsgroups.php?s9797+gcups.general+v9797+T1
+ if (!g_ascii_strcasecmp(charset, "windows-932"))
+ charset = "WINDOWS-31J";
+ encoding = g_strdup(charset);
+ }
+ } + }
+ } G_STMT_END; + } G_STMT_END;
+ +
@ -181,7 +164,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 +460,8 @@ @@ -355,6 +466,8 @@
IN = stdin; IN = stdin;
} }
title = filename_in; title = filename_in;
@ -190,7 +173,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 +480,10 @@ @@ -373,8 +486,10 @@
pango_context_set_font_description (pango_context, font_description); pango_context_set_font_description (pango_context, font_description);
/* Page layout */ /* Page layout */
@ -203,7 +186,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 +544,7 @@ @@ -435,6 +550,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;
@ -211,7 +194,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 +891,7 @@ @@ -781,6 +897,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;
@ -219,7 +202,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 +901,20 @@ @@ -790,12 +907,20 @@
bb_page_height = tmp; bb_page_height = tmp;
} }
@ -241,7 +224,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 +964,10 @@ @@ -845,8 +970,10 @@
title, title,
bb_page_width, bb_page_width,
bb_page_height, bb_page_height,
@ -252,3 +235,23 @@ diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
fprintf(OUT, fprintf(OUT,
"%% User settings\n" "%% User settings\n"
--- paps-0.6.6/configure.in.cups 2006-04-27 20:41:36.000000000 +0100
+++ paps-0.6.6/configure.in 2006-08-17 12:12:43.000000000 +0100
@@ -7,4 +7,17 @@
AC_PROG_CC
AM_PROG_LIBTOOL
+dnl ======================================================
+dnl check for CUPS
+dnl ======================================================
+AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
+if test "$CUPS_CONFIG" = "no"; then
+ AC_MSG_ERROR([Please install cups development packages])
+fi
+CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+CUPS_LIBS=`$CUPS_CONFIG --libs`
+
+AC_SUBST(CUPS_CFLAGS)
+AC_SUBST(CUPS_LIBS)
+
AC_OUTPUT(Makefile src/Makefile doc/Makefile)

5
paps.spec
View File

@ -1,6 +1,6 @@
Name: paps Name: paps
Version: 0.6.6 Version: 0.6.6
Release: 11%{?dist} Release: 12%{?dist}
License: LGPL License: LGPL
URL: http://paps.sourceforge.net/ URL: http://paps.sourceforge.net/
@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Aug 17 2006 Tim Waugh <twaugh@redhat.com> - 0.6.6-12
- Map CUPS charset names to real ones (bug #197577).
* 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.