rpms/fontconfig/devel fontconfig-2.3.91-crosscheck.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 fontconfig.spec, 1.39, 1.40 sources, 1.10, 1.11
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 31 17:27:23 UTC 2005
Author: mclasen
Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12591
Modified Files:
.cvsignore fontconfig.spec sources
Added Files:
fontconfig-2.3.91-crosscheck.patch
Log Message:
Newer cvs snapshot
fontconfig-2.3.91-crosscheck.patch:
fccache.c | 2 ++
fccharset.c | 14 ++++++++++++++
fcint.h | 3 +++
3 files changed, 19 insertions(+)
--- NEW FILE fontconfig-2.3.91-crosscheck.patch ---
--- fontconfig-2.3.91.cvs20051031/src/fccache.c.crosscheck 2005-10-31 12:25:03.000000000 -0500
+++ fontconfig-2.3.91.cvs20051031/src/fccache.c 2005-10-31 12:25:31.000000000 -0500
@@ -808,6 +808,8 @@
if (!FcFontSetSerialize (bank, set))
goto bail;
+ FcCharSetCrossCheck(bank);
+
return current_dir_block;
bail:
--- fontconfig-2.3.91.cvs20051031/src/fcint.h.crosscheck 2005-10-31 12:25:26.000000000 -0500
+++ fontconfig-2.3.91.cvs20051031/src/fcint.h 2005-10-31 12:25:31.000000000 -0500
@@ -549,6 +549,9 @@
FcChar16 *
FcCharSetGetNumbers(const FcCharSet *c);
+void
+FcCharSetCrossCheck (int bank);
+
/* fcdbg.c */
void
FcValueListPrint (const FcValueListPtr l);
--- fontconfig-2.3.91.cvs20051031/src/fccharset.c.crosscheck 2005-10-31 12:25:15.000000000 -0500
+++ fontconfig-2.3.91.cvs20051031/src/fccharset.c 2005-10-31 12:25:31.000000000 -0500
@@ -1425,6 +1425,20 @@
return block_ptr;
}
+void
+FcCharSetCrossCheck (int bank)
+{
+ int bi = FcCacheBankToIndex(bank);
+ int i;
+
+ for (i = 0; i < charset_ptr; i++)
+ if (charsets[bi][i].ref != FC_REF_CONSTANT)
+ {
+ printf ("ERROR! BAD CHARSET! PLEASE INFORM plam at mit.edu!\n");
+ abort();
+ }
+}
+
FcCharLeaf *
FcCharSetGetLeaf(const FcCharSet *c, int i)
{
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 17 Oct 2005 14:47:04 -0000 1.10
+++ .cvsignore 31 Oct 2005 17:27:19 -0000 1.11
@@ -1,2 +1,3 @@
fontconfig-2.3.2.tar.gz
fontconfig-2.3.91.cvs20051017.tar.gz
+fontconfig-2.3.91.cvs20051031.tar.gz
Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- fontconfig.spec 21 Oct 2005 20:14:48 -0000 1.39
+++ fontconfig.spec 31 Oct 2005 17:27:19 -0000 1.40
@@ -2,8 +2,8 @@
Summary: Font configuration and customization library
Name: fontconfig
-Version: 2.3.91.cvs20051017
-Release: 2
+Version: 2.3.91.cvs20051031
+Release: 1
License: MIT
Group: System Environment/Libraries
Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -13,6 +13,7 @@
Source2: 50-no-hint-fonts.conf
Patch1: fontconfig-2.3.91-defaultconfig.patch
+Patch2: fontconfig-2.3.91-crosscheck.patch
BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: expat-devel
@@ -46,6 +47,7 @@
%setup -q
%patch1 -p1 -b .defaultconfig
+%patch2 -p1 -b .crosscheck
%build
@@ -126,6 +128,10 @@
%{_mandir}/man3/*
%changelog
+* Fri Oct 31 2005 Matthias Clasen <mclasen at redhat.com> - 2.3.91.cvs20051031-1
+- Update to a newer cvs snapshot
+- Add a patch which should help to understand broken cache problems
+
* Fri Oct 21 2005 Matthias Clasen <mclasen at redhat.com> - 2.3.91.cvs20051017-2
- Add new Chinese fonts
- Fix the 40-blacklist-fonts.conf file to use the documented
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 17 Oct 2005 14:47:04 -0000 1.10
+++ sources 31 Oct 2005 17:27:19 -0000 1.11
@@ -1 +1 @@
-53f524361a72155c9f4e9dc2240d17ec fontconfig-2.3.91.cvs20051017.tar.gz
+d5b1ca2cf85efa853bba671715edf111 fontconfig-2.3.91.cvs20051031.tar.gz
More information about the fedora-cvs-commits
mailing list