rpms/libwmf/devel libwmf-0.2.8.4-fallbackfont.patch, NONE, 1.1 libwmf.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/libwmf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16436

Modified Files:
	libwmf.spec 
Added Files:
	libwmf-0.2.8.4-fallbackfont.patch 
Log Message:
add a fallback font for rh#176620#

libwmf-0.2.8.4-fallbackfont.patch:
 font.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE libwmf-0.2.8.4-fallbackfont.patch ---
diff -ru libwmf-0.2.8.4.orig/src/font.c libwmf-0.2.8.4/src/font.c
--- libwmf-0.2.8.4.orig/src/font.c	2005-07-27 21:35:06.000000000 +0100
+++ libwmf-0.2.8.4/src/font.c	2006-01-03 12:53:38.000000000 +0000
@@ -1429,11 +1429,9 @@
 	if (GS->len == 0) return (0);
 
 	name = font->lfFaceName;
-	if (name == 0)
-	{	WMF_DEBUG (API,"No font name?");
-		API->err = wmf_E_Glitch;
-		return (0);
-	}
+
+	if (name == 0 || name[0] == 0)
+		name = "Times";
 
 	/* Find first white-space character or eol
 	 */


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libwmf.spec	23 Dec 2005 01:11:41 -0000	1.13
+++ libwmf.spec	3 Jan 2006 13:02:03 -0000	1.14
@@ -1,13 +1,14 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 2.1
+Release: 3
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch0: libwmf-0.2.8.3-nodocs.patch
 Patch1: libwmf-0.2.8.3-relocatablefonts.patch
+Patch2: libwmf-0.2.8.4-fallbackfont.patch
 Requires: gtk2 >= 2.4.1-2
 Requires: libxml2 >= 2.6.8
 Requires: gd >= 2.0.21
@@ -40,6 +41,7 @@
 %setup -q
 %patch0 -p1 -b .nodocs
 %patch1 -p1 -b .relocatablefonts
+%patch2 -p1 -b .fallbackfont
 
 %build
 rm configure.ac
@@ -96,6 +98,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jan 03 2005 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-3
+- add libwmf-0.2.8.4-fallbackfont.patch for rh#176620#
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 0.2.8.4-2.1
 - rebuilt