diff --git a/bnc438855-make-FcInitReinitialize-work-again.patch b/bnc438855-make-FcInitReinitialize-work-again.patch new file mode 100644 index 0000000..66e51b5 --- /dev/null +++ b/bnc438855-make-FcInitReinitialize-work-again.patch @@ -0,0 +1,20 @@ +diff -rup fontconfig-2.6.0.orig//src/fccache.c fontconfig-2.6.0/src/fccache.c +--- fontconfig-2.6.0.orig//src/fccache.c 2007-11-14 01:36:41.000000000 +0100 ++++ fontconfig-2.6.0/src/fccache.c 2008-11-07 17:08:46.000000000 +0100 +@@ -254,6 +254,7 @@ FcDirCacheProcess (FcConfig *config, con + break; + fd = FcDirCacheOpenFile (cache_hashed, &file_stat); + if (fd >= 0) { ++ if (dir_stat.st_mtime <= file_stat.st_mtime) { + ret = (*callback) (fd, &file_stat, &dir_stat, closure); + close (fd); + if (ret) +@@ -264,6 +265,8 @@ FcDirCacheProcess (FcConfig *config, con + FcStrFree (cache_hashed); + break; + } ++ } else ++ close (fd); + } + FcStrFree (cache_hashed); + } diff --git a/fontconfig.changes b/fontconfig.changes index 57c2ffd..3f52278 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 07 18:22:17 CET 2008 - mfabian@suse.de + +- bnc#438855: make FcInitReinitialize() work again. This function + is important to make it possible for YaST2 to load new fonts + which are copied into instsys after YaST2 is already running. + ------------------------------------------------------------------- Wed Oct 29 18:56:15 CET 2008 - mfabian@suse.de diff --git a/fontconfig.spec b/fontconfig.spec index 001cbbd..c045e79 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -31,7 +31,7 @@ Url: http://fontconfig.org/ AutoReqProv: on Requires: bash Version: 2.6.0 -Release: 5 +Release: 6 Summary: Library for Font Configuration # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login @@ -73,6 +73,7 @@ Patch29: fix-build-for-10.0.patch Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch Patch32: usr-share-doc-packages.patch +Patch33: bnc438855-make-FcInitReinitialize-work-again.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -136,6 +137,7 @@ Authors: #%patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 %build %configure --with-pic \ @@ -248,6 +250,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/fontconfig/ %changelog +* Fri Nov 07 2008 mfabian@suse.de +- bnc#438855: make FcInitReinitialize() work again. This function + is important to make it possible for YaST2 to load new fonts + which are copied into instsys after YaST2 is already running. * Wed Oct 29 2008 mfabian@suse.de - bnc#433591: make "Lohit Oriya" the default font for Oriya. See also: @@ -919,7 +925,7 @@ rm -rf $RPM_BUILD_ROOT - add all Mincho and Gothic faces of the commercial Ricoh fonts to the list of generic names in suse-generic-names.conf to get reasonable fallbacks if those fonts are not installed. -* Sat May 29 2004 mfabian@suse.de +* Fri May 28 2004 mfabian@suse.de - add the Japanese fonts "HGMinchoL" and "HGGothicB" made by Ricoh to the prefer lists and generics lists. These are the fonts which Novell Japan has licensed, they should be preferred if they are @@ -1000,7 +1006,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Mar 29 2004 mfabian@suse.de - Bugzilla #37310: fix location of fontconfig-user.html in man-pages. -* Thu Mar 25 2004 mfabian@suse.de +* Wed Mar 24 2004 mfabian@suse.de - Bugzilla #36879: don't match fonts without foundries if a specific foundry is requested (fix from upstream CVS). - remove bitmap-spacing.patch (included upstream).