- Get current FcConfig before using it (#533992)

This commit is contained in:
mkasik 2010-01-28 13:10:53 +00:00
parent 1314fce69a
commit c1e66b82f3
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- 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);

View File

@ -2,7 +2,7 @@
Summary: PDF rendering library Summary: PDF rendering library
Name: poppler Name: poppler
Version: 0.12.3 Version: 0.12.3
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2 License: GPLv2
Group: Development/Libraries Group: Development/Libraries
URL: http://poppler.freedesktop.org/ URL: http://poppler.freedesktop.org/
@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch100: poppler-0.12.1-objstream.patch Patch100: poppler-0.12.1-objstream.patch
# image scaling with cairo poor (http://bugs.freedesktop.org/show_bug.cgi?id=5589) # image scaling with cairo poor (http://bugs.freedesktop.org/show_bug.cgi?id=5589)
Patch101: poppler-0.12.3-downscale.patch 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 Requires: poppler-data >= 0.4.0
BuildRequires: automake libtool BuildRequires: automake libtool
@ -122,6 +124,7 @@ converting PDF files to a number of other formats.
%patch100 -p1 -b .objstream %patch100 -p1 -b .objstream
%patch101 -p1 -b .downscale %patch101 -p1 -b .downscale
%patch102 -p1 -b .fcconfig
chmod -x goo/GooTimer.h chmod -x goo/GooTimer.h
@ -225,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Jan 28 2010 Marek Kasik <mkasik@redhat.com> - 0.12.3-8
- Get current FcConfig before using it (#533992)
* Sun Jan 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.12.3-7 * Sun Jan 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.12.3-7
- use alternative/upstream downscale patch (#556549, fdo#5589) - use alternative/upstream downscale patch (#556549, fdo#5589)