Version 0.25PANGO_0_25

Sun Feb 17 18:50:30 2002  Owen Taylor  <otaylor@redhat.com>

	* configure.in: Version 0.25

	* configure.in: Add X_EXTRA_LIBS to XFT_LIBS.

	* NEWS: Updates

	* pango/mini-xft/minixftdpy.c
	* pango/mini-xft/minixftstr.c: Fix some problems
	with signed arguments to to isupper()/tolower().
	(#71705, Morten Welinder)

12 files changed, 103 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d19b6685..8dcce4a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sun Feb 17 18:50:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.25
+
+	* configure.in: Add X_EXTRA_LIBS to XFT_LIBS.
+
+	* NEWS: Updates
+
+	* pango/mini-xft/minixftdpy.c
+	* pango/mini-xft/minixftstr.c: Fix some problems
+	with signed arguments to to isupper()/tolower().
+	(#71705, Morten Welinder)
+
 2002-02-15  Hans Breuer  <hans@breuer.org>
 
 	* examples/makefile.am pango/makefile.am : added
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index d19b6685..8dcce4a4 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,16 @@
+Sun Feb 17 18:50:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.25
+
+	* configure.in: Add X_EXTRA_LIBS to XFT_LIBS.
+
+	* NEWS: Updates
+
+	* pango/mini-xft/minixftdpy.c
+	* pango/mini-xft/minixftstr.c: Fix some problems
+	with signed arguments to to isupper()/tolower().
+	(#71705, Morten Welinder)
+
 2002-02-15  Hans Breuer  <hans@breuer.org>
 
 	* examples/makefile.am pango/makefile.am : added
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index d19b6685..8dcce4a4 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,16 @@
+Sun Feb 17 18:50:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.25
+
+	* configure.in: Add X_EXTRA_LIBS to XFT_LIBS.
+
+	* NEWS: Updates
+
+	* pango/mini-xft/minixftdpy.c
+	* pango/mini-xft/minixftstr.c: Fix some problems
+	with signed arguments to to isupper()/tolower().
+	(#71705, Morten Welinder)
+
 2002-02-15  Hans Breuer  <hans@breuer.org>
 
 	* examples/makefile.am pango/makefile.am : added
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index d19b6685..8dcce4a4 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,16 @@
+Sun Feb 17 18:50:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.25
+
+	* configure.in: Add X_EXTRA_LIBS to XFT_LIBS.
+
+	* NEWS: Updates
+
+	* pango/mini-xft/minixftdpy.c
+	* pango/mini-xft/minixftstr.c: Fix some problems
+	with signed arguments to to isupper()/tolower().
+	(#71705, Morten Welinder)
+
 2002-02-15  Hans Breuer  <hans@breuer.org>
 
 	* examples/makefile.am pango/makefile.am : added
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index d19b6685..8dcce4a4 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,16 @@
+Sun Feb 17 18:50:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.25
+
+	* configure.in: Add X_EXTRA_LIBS to XFT_LIBS.
+
+	* NEWS: Updates
+
+	* pango/mini-xft/minixftdpy.c
+	* pango/mini-xft/minixftstr.c: Fix some problems
+	with signed arguments to to isupper()/tolower().
+	(#71705, Morten Welinder)
+
 2002-02-15  Hans Breuer  <hans@breuer.org>
 
 	* examples/makefile.am pango/makefile.am : added
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index d19b6685..8dcce4a4 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,16 @@
+Sun Feb 17 18:50:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.25
+
+	* configure.in: Add X_EXTRA_LIBS to XFT_LIBS.
+
+	* NEWS: Updates
+
+	* pango/mini-xft/minixftdpy.c
+	* pango/mini-xft/minixftstr.c: Fix some problems
+	with signed arguments to to isupper()/tolower().
+	(#71705, Morten Welinder)
+
 2002-02-15  Hans Breuer  <hans@breuer.org>
 
 	* examples/makefile.am pango/makefile.am : added
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index d19b6685..8dcce4a4 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,16 @@
+Sun Feb 17 18:50:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Version 0.25
+
+	* configure.in: Add X_EXTRA_LIBS to XFT_LIBS.
+
+	* NEWS: Updates
+
+	* pango/mini-xft/minixftdpy.c
+	* pango/mini-xft/minixftstr.c: Fix some problems
+	with signed arguments to to isupper()/tolower().
+	(#71705, Morten Welinder)
+
 2002-02-15  Hans Breuer  <hans@breuer.org>
 
 	* examples/makefile.am pango/makefile.am : added
diff --git a/NEWS b/NEWS
index 87d19ee9..e1fab70d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes between 0.24 and 0.25
+
+* Win32 fixes [Tor Lillqvist, Hans Breuer]
+* Cleanup of <ctype.h> [Darin Adler]
+* Bug and build fixes [Anders Carlsson, Sven Neumann, Havoc Pennington,
+  Morten Welinder]
+
 Changes between 0.23 and 0.24
 
 * Win32 backend improvements [Tor Lillqvist]
diff --git a/configure.in b/configure.in
index addab346..4543dca8 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 AC_INIT(ChangeLog)
 
 PANGO_MAJOR_VERSION=0
-PANGO_MINOR_VERSION=24
+PANGO_MINOR_VERSION=25
 
 AC_SUBST(PANGO_MAJOR_VERSION)
 AC_SUBST(PANGO_MINOR_VERSION)
@@ -158,7 +158,7 @@ if test $have_x = true ; then
     CPPFLAGS="$pango_save_cppflags"
     
     if $have_xft ; then
-      XFT_LIBS="-lXft -lXrender -lXext $X_LIBS $FREETYPE_LIBS"
+      XFT_LIBS="-lXft -lXrender -lXext $X_LIBS $FREETYPE_LIBS $X_EXTRA_LIBS"
     fi
   fi
 fi
diff --git a/pango/mini-xft/minixftdpy.c b/pango/mini-xft/minixftdpy.c
index 6dbf061f..e97077b9 100644
--- a/pango/mini-xft/minixftdpy.c
+++ b/pango/mini-xft/minixftdpy.c
@@ -91,7 +91,7 @@ MiniXftDefaultSet (Display *dpy, MiniXftPattern *defaults)
 int
 MiniXftDefaultParseBool (char *v)
 {
-    char    c0, c1;
+    unsigned char    c0, c1;
 
     c0 = *v;
     if (isupper (c0))
diff --git a/pango/mini-xft/minixftstr.c b/pango/mini-xft/minixftstr.c
index afa22338..b07ed881 100644
--- a/pango/mini-xft/minixftstr.c
+++ b/pango/mini-xft/minixftstr.c
@@ -136,7 +136,7 @@ _MiniXftMatchSymbolic (MiniXftSymbolic *s, int n, const char *name, int def)
 int
 _MiniXftStrCmpIgnoreCase (const char *s1, const char *s2)
 {
-    char    c1, c2;
+    unsigned char    c1, c2;
     
     for (;;) 
     {
diff --git a/pangox.pc.in b/pangox.pc.in
index 8c76683a..d22b0cf4 100644
--- a/pangox.pc.in
+++ b/pangox.pc.in
@@ -7,6 +7,6 @@ Name: Pango X
 Description: X Window System font support for Pango
 Version: @VERSION@
 Requires: pango
-Libs: -L${libdir} -lpangox @X_LIBS@
+Libs: -L${libdir} -lpangox @X_LIBS@ @X_EXTRA_LIBS@
 Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@