Keith Packard
2006-Sep-01 13:09 UTC
[Fontconfig] fontconfig: Branch ''fc-2_4-keithp'' - 7 commits
.gitignore | 2 ++
Makefile.am | 2 +-
configure.in | 4 +++-
fc-cache/fc-cache.c | 9 +++++++++
fc-lang/as.orth | 28 ++++++++++++++++++++++++++++
fc-lang/iso639-1 | 2 +-
fc-lang/zh_mo.orth | 9 +++++++--
fontconfig.pc.in | 1 +
src/fcfreetype.c | 2 ++
9 files changed, 54 insertions(+), 5 deletions(-)
New commits:
diff-tree caf996342b53bf2ca4eedbe54bc86b68456d7470 (from
c9e6d2c8cc920937546faa63c889570fa7b4745c)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Sep 1 12:59:09 2006 -0700
Add Assamese orthography (as.orth). Bug #8050
Behdad Esfahbod says Assamese is the same as Bengali, so this just uses
bn.orth.
diff --git a/fc-lang/as.orth b/fc-lang/as.orth
new file mode 100644
index 0000000..b5d7294
--- /dev/null
+++ b/fc-lang/as.orth
@@ -0,0 +1,28 @@
+#
+# Copyright © 2006 Keith Packard
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Keith Packard not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Keith Packard makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# Assamese
+#
+# Behdad Esfahbod says:
+#
+# Seems like copying file for Bengali should be enough.
+#
+include bn.orth
diff --git a/fc-lang/iso639-1 b/fc-lang/iso639-1
index 65cdbdc..6dfb17e 100644
--- a/fc-lang/iso639-1
+++ b/fc-lang/iso639-1
@@ -3,7 +3,7 @@ AB * Abkhazian Abkhazia (Georgia) Caucas
AF * Afrikaans South Africa, Namibia Indo-European F., Germanic Br. 10
AM * Amharic Ethiopia Hamito-Semitic F., Semitic Br. 20
AR * Arabic Middle East, N Africa Hamito-Semitic F., Semitic Br. 218
-AS Assamese Assam (India) Indo-European F., Indo-Iranian Br. 23
+AS * Assamese Assam (India) Indo-European F., Indo-Iranian Br. 23
AY * Aymara Bolivia, Peru Andean-Equatorial F., Andean Br. 2
AZ * Azerbaijani Iran, Azerbaijan Uralo-Altaic F., Turkic Br. 15
BA * Bashkir Bashkir (S Urals, Russia) Uralo-Altaic F., Turkic Br. 1
diff-tree c9e6d2c8cc920937546faa63c889570fa7b4745c (from
5b8e43a48ea1a5fb4e54dd12fe965439df2bf95d)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Sep 1 12:45:43 2006 -0700
Chinese/Macau needs the Hong Kong orthography instead of Taiwan (bug 7884)
From Abel Cheung:
Currently zh_mo.orth includes zh_tw.orth, which means it is assumed Macau
only uses traditional Chinese characters used in Taiwan; however that is
wrong, as a majority of Macau people speaks Cantonese too, and also uses
additional traditional Chinese chars from Hong Kong (there are already some
place names that can''t be represented in just chars used in
Taiwan). So it
should include zh_hk.orth instead.
diff --git a/fc-lang/zh_mo.orth b/fc-lang/zh_mo.orth
index fa4d0d3..92c5ba2 100644
--- a/fc-lang/zh_mo.orth
+++ b/fc-lang/zh_mo.orth
@@ -23,5 +23,10 @@
#
# Chinese in Macau (ZH-MO)
#
-# Just use Big5 as for ZH-TW
-include zh_tw.orth
+# from Abel Cheung:
+#
+# a majority of Macau people speak Cantonese too, and also uses additional
+# traditional Chinese chars from Hong Kong (there are already some place names
+# that can''t be represented in just chars used in Taiwan).
+#
+include zh_hk.orth
diff-tree 5b8e43a48ea1a5fb4e54dd12fe965439df2bf95d (from
ab2cb932b25af20896c08f4641dfa696ed651418)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Sep 1 12:36:31 2006 -0700
Avoid #warning directives on non-GCC compilers. (bug 7683)
Detect GCC and use #warning only on GCC systems.
diff --git a/configure.in b/configure.in
index 7875831..17a3c99 100644
--- a/configure.in
+++ b/configure.in
@@ -78,14 +78,16 @@ fi
AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
WARN_CFLAGS=""
-
if test "x$GCC" = "xyes"; then
WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wnested-externs -fno-strict-aliasing"
+ AC_DEFINE_UNQUOTED(HAVE_WARNING_CPP_DIRECTIVE,1,
+ [Can use #warning in C files])
fi
AC_SUBST(WARN_CFLAGS)
+
dnl =========================================================================
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 2cab48a..f85e2f8 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -64,6 +64,7 @@
#include "ftglue.h"
+#if HAVE_WARNING_CPP_DIRECTIVE
#if !HAVE_FT_GET_BDF_PROPERTY
#warning "No FT_Get_BDF_Property: Please install freetype 2.1.4 or
later"
#endif
@@ -71,6 +72,7 @@
#if !HAVE_FT_GET_PS_FONT_INFO
#warning "No FT_Get_PS_Font_Info: Please install freetype 2.1.1 or
later"
#endif
+#endif
/*
* Keep Han languages separated by eliminating languages
diff-tree ab2cb932b25af20896c08f4641dfa696ed651418 (from
1741499e2387f0c1e692801a1ef3c6ce5d043f9f)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Sep 1 12:26:15 2006 -0700
Add @EXPAT_LIBS@ to Libs.private in fontconfig.pc (bug 7683)
Linking against fontconfig requires expat on systems without chained shared
library dependencies.
diff --git a/fontconfig.pc.in b/fontconfig.pc.in
index 8f599c1..d7c02c7 100644
--- a/fontconfig.pc.in
+++ b/fontconfig.pc.in
@@ -7,4 +7,5 @@ Name: Fontconfig
Description: Font configuration and customization library
Version: @VERSION@
Libs: -L${libdir} -lfontconfig
+Libs.private: @EXPAT_LIBS@
Cflags: -I${includedir}
diff-tree 1741499e2387f0c1e692801a1ef3c6ce5d043f9f (from
fd7223c770e74730480bdf9ecf36f3152a12473e)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Sep 1 12:07:10 2006 -0700
Fix memory leaks in fc-cache directory cleaning code.
valgrind found a few leaks in the new cache cleaning code.
diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 6957a65..0686481 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -287,10 +287,16 @@ cleanCacheDirectory (FcConfig *config, F
struct stat target_stat;
dir_base = FcStrPlus (dir, "/");
+ if (!dir_base)
+ {
+ fprintf (stderr, "%s: out of memory\n", dir);
+ return FcFalse;
+ }
if (access ((char *) dir, W_OK|X_OK) != 0)
{
if (verbose)
printf ("%s: not cleaning unwritable cache directory\n", dir);
+ FcStrFree (dir_base);
return FcTrue;
}
if (verbose)
@@ -299,6 +305,7 @@ cleanCacheDirectory (FcConfig *config, F
if (!d)
{
perror (dir);
+ FcStrFree (dir_base);
return FcFalse;
}
while ((ent = readdir (d)))
@@ -347,10 +354,12 @@ cleanCacheDirectory (FcConfig *config, F
ret = FcFalse;
}
}
+ FcDirCacheUnload (cache);
FcStrFree (file_name);
}
closedir (d);
+ FcStrFree (dir_base);
return ret;
}
diff-tree fd7223c770e74730480bdf9ecf36f3152a12473e (from
8587d77ce64147b7fb324458ba100910ebba93f4)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Sep 1 12:05:04 2006 -0700
Only rebuild caches for system fonts at make install time.
Rebuilding user-specific fonts will stick those cache files in the system
font cache directory.
diff --git a/Makefile.am b/Makefile.am
index 90825ba..2fa3b34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ install-data-local:
$(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
fi; fi
@(if $(RUN_FC_CACHE_TEST); then \
- echo " fc-cache/fc-cache -f -v"; \
+ echo " fc-cache/fc-cache -s -f -v"; \
fc-cache/fc-cache -f -v; \
else \
echo "***"; \
diff-tree 8587d77ce64147b7fb324458ba100910ebba93f4 (from
09bd9ae2be032efb05a8be7bae584fa18756d951)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Sep 1 02:27:45 2006 -0700
Add some ignores
diff --git a/.gitignore b/.gitignore
index 072b1f8..59d3c7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+tags
+*.tar.gz
.libs
.deps
*.o