rpms/libgnomeprint22/FC-6 libgnomeprint22-2.12.1-fix-boxes-printed.patch, NONE, 1.1 libgnomeprint22.spec, 1.41, 1.42

[fedora-cvs-commits at redhat.com]

Author: davidz

Update of /cvs/dist/rpms/libgnomeprint22/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv21901

Modified Files:
	libgnomeprint22.spec 
Added Files:
	libgnomeprint22-2.12.1-fix-boxes-printed.patch 
Log Message:
* Thu Dec  7 2006 David Zeuthen <davidz at redhat.com> - 2.12.1-9%{?dist}
- Add patch for fixing box-print problem
- Resolves: #214493



libgnomeprint22-2.12.1-fix-boxes-printed.patch:
 gnome-print-pango.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE libgnomeprint22-2.12.1-fix-boxes-printed.patch ---
diff -Nur libgnomeprint-2.12.1/libgnomeprint/gnome-print-pango.c libgnomeprint-2.12.1.new/libgnomeprint/gnome-print-pango.c
--- libgnomeprint-2.12.1/libgnomeprint/gnome-print-pango.c	2005-08-12 22:09:20.000000000 +0200
+++ libgnomeprint-2.12.1.new/libgnomeprint/gnome-print-pango.c	2006-05-15 00:08:44.000000000 +0200
@@ -25,6 +25,7 @@
  */
 
 #define PANGO_ENABLE_BACKEND	/* Needed to access PangoFcFont.font_pattern */
+/* behdad: Humm, font_pattern can be accessed using "pattern" property. */
 
 #include <config.h>
 
@@ -35,6 +36,12 @@
 #include <pango/pangofc-font.h>
 #include <pango/pangoft2.h>
 
+#ifdef PANGO_GLYPH_EMPTY
+#define EMPTY_GLYPH PANGO_GLYPH_EMPTY
+#else
+#define EMPTY_GLYPH 0
+#endif
+
 /**
  * is_gnome_print_key :
  * 
@@ -298,7 +305,7 @@
 	for (i = 0; i < glyphs->num_glyphs; i++) {
 		PangoGlyphInfo *gi = &glyphs->glyphs[i];
 
-		if (gi->glyph) {
+		if (gi->glyph != EMPTY_GLYPH) {
 			int x = x_off + gi->geometry.x_offset;
 			int y = gi->geometry.y_offset;
 			


Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/FC-6/libgnomeprint22.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libgnomeprint22.spec	28 Jul 2006 01:33:06 -0000	1.41
+++ libgnomeprint22.spec	7 Dec 2006 17:12:48 -0000	1.42
@@ -16,7 +16,7 @@
 Summary: Printing library for GNOME.
 Name:		libgnomeprint22
 Version: 	2.12.1
-Release:	8
+Release:	9%{?dist}
 License:	LGPL
 Group:          System Environment/Base
 Source: 	libgnomeprint-%{version}.tar.bz2
@@ -25,6 +25,8 @@
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=318029
 Patch0: libgnomeprint-2.12.1-gmodule-no-export.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214493
+Patch1: libgnomeprint22-2.12.1-fix-boxes-printed.patch
 
 Requires:	urw-fonts
 Requires:	ghostscript
@@ -96,6 +98,7 @@
 %prep
 %setup -q -n libgnomeprint-%{version}
 %patch0 -p1 -b .gmodule-no-export
+%patch1 -p1 -b .boxes-printed
 
 %build
 aclocal
@@ -136,6 +139,10 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Thu Dec  7 2006 David Zeuthen <davidz at redhat.com> - 2.12.1-9%{?dist}
+- Add patch for fixing box-print problem
+- Resolves: #214493
+
 * Thu Jul 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.12.1-8
 - Disable gtk-doc to fix multilib conflicts