diff options
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 25 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 25 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 25 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 25 | ||||
| -rw-r--r-- | configure.in | 35 | ||||
| -rw-r--r-- | examples/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/arabic/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/hangul/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/hebrew/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/indic/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/tamil/Makefile.am | 1 |
13 files changed, 164 insertions, 3 deletions
@@ -1,3 +1,28 @@ +Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in **/Makefile.am: Add an --enable-debug + configure argument defaulting to 'yes' for unstable + releases and 'minimum' for stable releases. + For minimum, -DG_DISABLE_CAST_CHECKS. + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c: Add caching of fontsets + (#104495, initial patch and review by Soeren Sandmann) + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c pango/pangoft2-private.h + pango/pangoxft-private.h: Remove cache of recently freed + fonts; not necessary now that we cache fontsets. + + * pango/pangofc-fontmap.cI (pango_fc_pattern_set_free): + Rename from pango_fc_font_set_free to reflect + what it actually does. + + * pango/pangofc-fontmap.cI pango/pangoft-fontmap.c + pango/pangoxft-fontmap.c: Combine clear-the-cache + functions; we didn't need separate clear-the-font-cache + and clear-the-pattern-cache functions. + Sun Feb 16 09:10:12 2003 Chema Celorio <chema@celorio.com> * pango/pangoft2.c (pango_ft2_render_layout): fix a typo diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 45bf2e25..b8d528d4 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,28 @@ +Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in **/Makefile.am: Add an --enable-debug + configure argument defaulting to 'yes' for unstable + releases and 'minimum' for stable releases. + For minimum, -DG_DISABLE_CAST_CHECKS. + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c: Add caching of fontsets + (#104495, initial patch and review by Soeren Sandmann) + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c pango/pangoft2-private.h + pango/pangoxft-private.h: Remove cache of recently freed + fonts; not necessary now that we cache fontsets. + + * pango/pangofc-fontmap.cI (pango_fc_pattern_set_free): + Rename from pango_fc_font_set_free to reflect + what it actually does. + + * pango/pangofc-fontmap.cI pango/pangoft-fontmap.c + pango/pangoxft-fontmap.c: Combine clear-the-cache + functions; we didn't need separate clear-the-font-cache + and clear-the-pattern-cache functions. + Sun Feb 16 09:10:12 2003 Chema Celorio <chema@celorio.com> * pango/pangoft2.c (pango_ft2_render_layout): fix a typo diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 45bf2e25..b8d528d4 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,28 @@ +Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in **/Makefile.am: Add an --enable-debug + configure argument defaulting to 'yes' for unstable + releases and 'minimum' for stable releases. + For minimum, -DG_DISABLE_CAST_CHECKS. + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c: Add caching of fontsets + (#104495, initial patch and review by Soeren Sandmann) + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c pango/pangoft2-private.h + pango/pangoxft-private.h: Remove cache of recently freed + fonts; not necessary now that we cache fontsets. + + * pango/pangofc-fontmap.cI (pango_fc_pattern_set_free): + Rename from pango_fc_font_set_free to reflect + what it actually does. + + * pango/pangofc-fontmap.cI pango/pangoft-fontmap.c + pango/pangoxft-fontmap.c: Combine clear-the-cache + functions; we didn't need separate clear-the-font-cache + and clear-the-pattern-cache functions. + Sun Feb 16 09:10:12 2003 Chema Celorio <chema@celorio.com> * pango/pangoft2.c (pango_ft2_render_layout): fix a typo diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 45bf2e25..b8d528d4 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,28 @@ +Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in **/Makefile.am: Add an --enable-debug + configure argument defaulting to 'yes' for unstable + releases and 'minimum' for stable releases. + For minimum, -DG_DISABLE_CAST_CHECKS. + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c: Add caching of fontsets + (#104495, initial patch and review by Soeren Sandmann) + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c pango/pangoft2-private.h + pango/pangoxft-private.h: Remove cache of recently freed + fonts; not necessary now that we cache fontsets. + + * pango/pangofc-fontmap.cI (pango_fc_pattern_set_free): + Rename from pango_fc_font_set_free to reflect + what it actually does. + + * pango/pangofc-fontmap.cI pango/pangoft-fontmap.c + pango/pangoxft-fontmap.c: Combine clear-the-cache + functions; we didn't need separate clear-the-font-cache + and clear-the-pattern-cache functions. + Sun Feb 16 09:10:12 2003 Chema Celorio <chema@celorio.com> * pango/pangoft2.c (pango_ft2_render_layout): fix a typo diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 45bf2e25..b8d528d4 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,28 @@ +Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in **/Makefile.am: Add an --enable-debug + configure argument defaulting to 'yes' for unstable + releases and 'minimum' for stable releases. + For minimum, -DG_DISABLE_CAST_CHECKS. + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c: Add caching of fontsets + (#104495, initial patch and review by Soeren Sandmann) + + * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c + pango/pangoxft-fontmap.c pango/pangoft2-private.h + pango/pangoxft-private.h: Remove cache of recently freed + fonts; not necessary now that we cache fontsets. + + * pango/pangofc-fontmap.cI (pango_fc_pattern_set_free): + Rename from pango_fc_font_set_free to reflect + what it actually does. + + * pango/pangofc-fontmap.cI pango/pangoft-fontmap.c + pango/pangoxft-fontmap.c: Combine clear-the-cache + functions; we didn't need separate clear-the-font-cache + and clear-the-pattern-cache functions. + Sun Feb 16 09:10:12 2003 Chema Celorio <chema@celorio.com> * pango/pangoft2.c (pango_ft2_render_layout): fix a typo diff --git a/configure.in b/configure.in index 86ef0ae4..40daf720 100644 --- a/configure.in +++ b/configure.in @@ -14,10 +14,20 @@ dnl if any functions have been added, set PANGO_INTERFACE_AGE to 0. dnl if backwards compatibility has been broken, dnl set PANGO_BINARY_AGE _and_ PANGO_INTERFACE_AGE to 0. +dnl +dnl We do the version number components as m4 macros +dnl so that we can base configure --help output off +dnl of them. +dnl + dnl The triplet -PANGO_MAJOR_VERSION=1 -PANGO_MINOR_VERSION=2 -PANGO_MICRO_VERSION=0 +m4_define([pango_major_version],1) +m4_define([pango_minor_version],2) +m4_define([pango_micro_version],1) + +PANGO_MAJOR_VERSION=pango_major_version() +PANGO_MINOR_VERSION=pango_minor_version() +PANGO_MICRO_VERSION=pango_micro_version() PANGO_VERSION=$PANGO_MAJOR_VERSION.$PANGO_MINOR_VERSION.$PANGO_MICRO_VERSION dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2. @@ -116,6 +126,25 @@ if test "x$GCC" = "xyes"; then fi changequote([,])dnl +dnl declare --enable-* args and collect ac_help strings + +m4_define([debug_default],dnl +m4_if(m4_bregexp(pango_minor_version(),[[13579]]),-1,minimum,yes)) + +AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging @<:@default=]debug_default()[@:>@],,enable_debug=debug_default()) + +if test "x$enable_debug" = "xyes"; then + PANGO_DEBUG_FLAGS="-DPANGO_ENABLE_DEBUG" +else + PANGO_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" + + if test "x$enable_debug" = "xno"; then + PANGO_DEBUG_FLAGS="$GLIB_DEBUG_FLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + fi +fi + +AC_SUBST(PANGO_DEBUG_FLAGS) + AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes) AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) diff --git a/examples/Makefile.am b/examples/Makefile.am index 2256923e..f83e320c 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -4,6 +4,7 @@ aliasdir = $(sysconfdir)/pango INCLUDES = \ -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ $(QT_INCLUDES) \ $(GLIB_CFLAGS) \ diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index f080ef38..0345b283 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -89,6 +89,7 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango/ \ $(moddefine) \ diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 82928498..155b6716 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -88,6 +88,7 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango/ \ $(GLIB_CFLAGS) \ diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index 37d8e04a..05b13a3a 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -50,6 +50,7 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango/ \ $(moddefine) \ diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index b50c3afd..bbf346f2 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -73,6 +73,7 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango/ \ $(GLIB_CFLAGS) \ diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index 5f3ea069..f58ad78d 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -88,6 +88,7 @@ endif INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango/ \ $(GLIB_CFLAGS) \ diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index 87879858..4b18fbb4 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -33,6 +33,7 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DG_DISABLE_DEPRECATED \ + $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango/ \ $(moddefine) \ |