rpms/poppler/devel poppler-0.12.3-actualize-fcconfig.patch, NONE, 1.1 poppler.spec, 1.114, 1.115

[Marek Kašík]

Author: mkasik

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17122

Modified Files:
	poppler.spec 
Added Files:
	poppler-0.12.3-actualize-fcconfig.patch 
Log Message:
* Thu Jan 28 2010 Marek Kasik <mkasik at redhat.com> - 0.12.3-8
- Get current FcConfig before using it (#533992)


poppler-0.12.3-actualize-fcconfig.patch:
 GlobalParams.cc |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE poppler-0.12.3-actualize-fcconfig.patch ---
--- poppler-0.12.3/poppler/GlobalParams.cc	2009-10-06 00:46:28.000000000 +0200
+++ poppler-0.12.3/poppler/GlobalParams.cc	2010-01-27 16:48:26.000000000 +0100
@@ -1131,6 +1131,8 @@ DisplayFontParam *GlobalParams::getDispl
 
     if (!p)
       goto fin;
+
+    FCcfg = FcConfigGetCurrent();
     FcConfigSubstitute(FCcfg, p, FcMatchPattern);
     FcDefaultSubstitute(p);
     set = FcFontSort(FCcfg, p, FcFalse, NULL, &res);


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- poppler.spec	24 Jan 2010 23:43:11 -0000	1.114
+++ poppler.spec	28 Jan 2010 13:10:53 -0000	1.115
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.12.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch100: poppler-0.12.1-objstream.patch
 # image scaling with cairo poor (http://bugs.freedesktop.org/show_bug.cgi?id=5589)
 Patch101: poppler-0.12.3-downscale.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=533992
+Patch102: poppler-0.12.3-actualize-fcconfig.patch
 
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
@@ -122,6 +124,7 @@ converting PDF files to a number of othe
 
 %patch100 -p1 -b .objstream
 %patch101 -p1 -b .downscale
+%patch102 -p1 -b .fcconfig
 
 chmod -x goo/GooTimer.h
 
@@ -225,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 28 2010 Marek Kasik <mkasik at redhat.com> - 0.12.3-8
+- Get current FcConfig before using it (#533992)
+
 * Sun Jan 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.12.3-7
 - use alternative/upstream downscale patch (#556549, fdo#5589)