rpms/paps/devel paps-cups.patch,1.7,1.8 paps.spec,1.16,1.17
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 29 14:59:30 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/paps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2885
Modified Files:
paps-cups.patch paps.spec
Log Message:
* Fri Sep 29 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-15
- Avoid using iconv when not needed (bug #206259).
paps-cups.patch:
configure.in | 13 ++++
paps-0.6.6/src/paps.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++--
src/Makefile.am | 4 -
3 files changed, 157 insertions(+), 7 deletions(-)
Index: paps-cups.patch
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps-cups.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- paps-cups.patch 14 Sep 2006 08:15:57 -0000 1.7
+++ paps-cups.patch 29 Sep 2006 14:59:28 -0000 1.8
@@ -1,4 +1,3 @@
-diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in
--- paps-0.6.6.orig/configure.in 2006-09-14 15:04:03.000000000 +0900
+++ paps-0.6.6/configure.in 2006-09-14 14:58:18.000000000 +0900
@@ -7,4 +7,17 @@
@@ -19,7 +18,6 @@
+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-09-14 15:04:03.000000000 +0900
+++ paps-0.6.6/src/Makefile.am 2006-09-14 14:58:18.000000000 +0900
@@ -5,10 +5,10 @@
@@ -35,9 +33,8 @@
paps_DEPENDENCIES = $(noinst_LIBRARIES)
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.orig/src/paps.c 2006-09-14 15:04:03.000000000 +0900
-+++ paps-0.6.6/src/paps.c 2006-09-14 15:03:50.000000000 +0900
+--- paps-0.6.6/src/paps.c 2006-09-14 15:03:50.000000000 +0900
++++ paps-0.6.6/src/paps.c 2006-09-29 15:51:26.000000000 +0100
@@ -31,6 +31,7 @@
#include <time.h>
#include <locale.h>
@@ -69,7 +66,7 @@
int do_tumble = -1; /* -1 means not initialized */
int do_duplex = -1;
gchar *paps_header = NULL;
-@@ -323,12 +326,121 @@
+@@ -323,12 +326,123 @@
int header_sep = 20;
int max_width = 0, w;
GIConv cvh = NULL;
@@ -181,7 +178,9 @@
+ // http://cups.org/newsgroups.php?s9797+gcups.general+v9797+T1
+ if (!g_ascii_strcasecmp(charset, "windows-932"))
+ charset = "WINDOWS-31J";
-+ encoding = g_strdup(charset);
++ if (g_ascii_strcasecmp(charset, "utf-8") &&
++ g_ascii_strcasecmp(charset, "utf8"))
++ encoding = g_strdup(charset);
+ }
+ }
+ } G_STMT_END;
@@ -191,7 +190,7 @@
/* Parse command line */
if (!g_option_context_parse(ctxt, &argc, &argv, &error))
{
-@@ -355,6 +467,8 @@
+@@ -355,6 +469,8 @@
IN = stdin;
}
title = filename_in;
@@ -200,7 +199,7 @@
paps = paps_new();
pango_context = paps_get_pango_context (paps);
-@@ -373,8 +487,10 @@
+@@ -373,8 +489,10 @@
pango_context_set_font_description (pango_context, font_description);
/* Page layout */
@@ -213,7 +212,7 @@
if (num_columns == 1)
total_gutter_width = 0;
-@@ -435,6 +551,8 @@
+@@ -435,6 +553,8 @@
page_layout.pango_dir = pango_dir;
page_layout.filename = filename_in;
page_layout.header_font_desc = header_font_desc;
@@ -222,7 +221,7 @@
/* calculate x-coordinate scale */
if (cpi > 0.0L)
-@@ -571,6 +689,12 @@
+@@ -571,6 +691,12 @@
if (wc == (gunichar)-1)
{
fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ());
@@ -235,7 +234,7 @@
wc = 0;
}
if (!*p || !wc || wc == '\n' || wc == '\f')
-@@ -784,6 +908,7 @@
+@@ -784,6 +910,7 @@
int orientation = page_layout->page_width > page_layout->page_height;
int bb_page_width = page_layout->page_width;
int bb_page_height = page_layout->page_height;
@@ -243,7 +242,7 @@
/* Keep bounding box non-rotated to make ggv happy */
if (orientation)
-@@ -793,12 +918,20 @@
+@@ -793,12 +920,20 @@
bb_page_height = tmp;
}
@@ -265,7 +264,7 @@
"%%%%BeginProlog\n"
"%%%%Orientation: %s\n"
"/papsdict 1 dict def\n"
-@@ -848,8 +981,10 @@
+@@ -848,8 +983,10 @@
title,
bb_page_width,
bb_page_height,
Index: paps.spec
===================================================================
RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- paps.spec 14 Sep 2006 08:15:57 -0000 1.16
+++ paps.spec 29 Sep 2006 14:59:28 -0000 1.17
@@ -1,6 +1,6 @@
Name: paps
Version: 0.6.6
-Release: 14%{?dist}
+Release: 15%{?dist}
License: LGPL
URL: http://paps.sourceforge.net/
@@ -76,6 +76,9 @@
%changelog
+* Fri Sep 29 2006 Tim Waugh <twaugh at redhat.com> - 0.6.6-15
+- Avoid using iconv when not needed (bug #206259).
+
* Thu Sep 14 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.6-14
- paps-cups.patch: try to parse input even if any invalid character appears.
(#206259)
More information about the fedora-cvs-commits
mailing list