don't bother with module dir recalculation if LIBDIR isn't defined

2001-11-03  Hans Breuer  <hans@breuer.org>

	* pango/modules.c : don't bother with module dir
	recalculation if LIBDIR isn't defined

	* pango/pangowin32-fontmap.c : make it compile again
	after the g_ascii_* change below. Use EnumFontFamiliesExA
	to ensure to use the ascii version, though defining
	UNICODE for G_OS_WIN32 will break at other place anyway.

	* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
	and DIRENT_LIBS (see #63667)

10 files changed, 106 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ec201be..89915519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+	* pango/modules.c : don't bother with module dir
+	recalculation if LIBDIR isn't defined
+
+	* pango/pangowin32-fontmap.c : make it compile again
+	after the g_ascii_* change below. Use EnumFontFamiliesExA
+	to ensure to use the ascii version, though defining
+	UNICODE for G_OS_WIN32 will break at other place anyway.
+
+	* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
+	and DIRENT_LIBS (see #63667)
+
 Fri Nov  2 13:56:58 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c: Patch from Alex Larsson to improve
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 6ec201be..89915519 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,16 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+	* pango/modules.c : don't bother with module dir
+	recalculation if LIBDIR isn't defined
+
+	* pango/pangowin32-fontmap.c : make it compile again
+	after the g_ascii_* change below. Use EnumFontFamiliesExA
+	to ensure to use the ascii version, though defining
+	UNICODE for G_OS_WIN32 will break at other place anyway.
+
+	* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
+	and DIRENT_LIBS (see #63667)
+
 Fri Nov  2 13:56:58 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c: Patch from Alex Larsson to improve
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 6ec201be..89915519 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,16 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+	* pango/modules.c : don't bother with module dir
+	recalculation if LIBDIR isn't defined
+
+	* pango/pangowin32-fontmap.c : make it compile again
+	after the g_ascii_* change below. Use EnumFontFamiliesExA
+	to ensure to use the ascii version, though defining
+	UNICODE for G_OS_WIN32 will break at other place anyway.
+
+	* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
+	and DIRENT_LIBS (see #63667)
+
 Fri Nov  2 13:56:58 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c: Patch from Alex Larsson to improve
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 6ec201be..89915519 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,16 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+	* pango/modules.c : don't bother with module dir
+	recalculation if LIBDIR isn't defined
+
+	* pango/pangowin32-fontmap.c : make it compile again
+	after the g_ascii_* change below. Use EnumFontFamiliesExA
+	to ensure to use the ascii version, though defining
+	UNICODE for G_OS_WIN32 will break at other place anyway.
+
+	* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
+	and DIRENT_LIBS (see #63667)
+
 Fri Nov  2 13:56:58 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c: Patch from Alex Larsson to improve
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 6ec201be..89915519 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,16 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+	* pango/modules.c : don't bother with module dir
+	recalculation if LIBDIR isn't defined
+
+	* pango/pangowin32-fontmap.c : make it compile again
+	after the g_ascii_* change below. Use EnumFontFamiliesExA
+	to ensure to use the ascii version, though defining
+	UNICODE for G_OS_WIN32 will break at other place anyway.
+
+	* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
+	and DIRENT_LIBS (see #63667)
+
 Fri Nov  2 13:56:58 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c: Patch from Alex Larsson to improve
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 6ec201be..89915519 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,16 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+	* pango/modules.c : don't bother with module dir
+	recalculation if LIBDIR isn't defined
+
+	* pango/pangowin32-fontmap.c : make it compile again
+	after the g_ascii_* change below. Use EnumFontFamiliesExA
+	to ensure to use the ascii version, though defining
+	UNICODE for G_OS_WIN32 will break at other place anyway.
+
+	* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
+	and DIRENT_LIBS (see #63667)
+
 Fri Nov  2 13:56:58 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c: Patch from Alex Larsson to improve
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 6ec201be..89915519 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,16 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+	* pango/modules.c : don't bother with module dir
+	recalculation if LIBDIR isn't defined
+
+	* pango/pangowin32-fontmap.c : make it compile again
+	after the g_ascii_* change below. Use EnumFontFamiliesExA
+	to ensure to use the ascii version, though defining
+	UNICODE for G_OS_WIN32 will break at other place anyway.
+
+	* pango/makefile.msc : use (hopefully temporary) DIRENT_CFLAGS
+	and DIRENT_LIBS (see #63667)
+
 Fri Nov  2 13:56:58 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c: Patch from Alex Larsson to improve
diff --git a/pango/makefile.msc b/pango/makefile.msc
index 0a80691e..51aa9165 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -6,10 +6,10 @@ PERL = perl
 !ENDIF
 
 # Possibly override Pango version from build/win32/module.defs
-PANGO_VER = 0.19
+PANGO_VER = 0.21
 
 # INCLUDES = -I .. -I .
-# DEFINES = 
+# DEFINES = -DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\"
 # DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FREETYPE2_CFLAGS)
 
 !IFNDEF PACKAGE
@@ -43,9 +43,10 @@ PKG_VER = $(PANGO_VER)
 PKG_DEF = $(PACKAGE).def
 
 PKG_CFLAGS = -I.. -I. -I$(PRJ_TOP) \
+		-DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" \
 		-DPANGO_ENABLE_BACKEND -DPANGO_ENABLE_ENGINE \
 		$(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \
-		$(FREETYPE2_CFLAGS) \
+		$(FREETYPE2_CFLAGS) $(DIRENT_CFLAGS) \
 		$(X11_CFLAGS)  -DSYSCONFDIR=\"/etc\"
 
 !IFDEF OBJS_pango
@@ -59,7 +60,7 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
 !ENDIF
 
 !IFDEF OBJS_pangoft2
-PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) \
+PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) $(DIRENT_LIBS) \
 	pango-$(PANGO_VER).lib
 !ENDIF
 
@@ -69,7 +70,7 @@ PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
 !ENDIF
 
 !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts)
-PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
+PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(DIRENT_LIBS) \
 	pango-$(PANGO_VER).lib pangowin32-$(PANGO_VER).lib
 !ENDIF
 
diff --git a/pango/modules.c b/pango/modules.c
index b7868dbb..feabb0c3 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -244,7 +244,7 @@ process_module_file (FILE *module_file)
 	    {
 	    case 0:
 	      pair->load_info = g_strdup (tmp_buf->str);
-#ifdef G_OS_WIN32
+#if defined(G_OS_WIN32) && defined(LIBDIR)
 	      if (strncmp (pair->load_info,
 			   LIBDIR "/pango/modules/",
 			   strlen (LIBDIR "/pango/modules/")) == 0)
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 7dbefe24..a84160a8 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -223,7 +223,7 @@ pango_win32_enum_proc (LOGFONT    *lfp,
 
   lf = *lfp;
 
-  EnumFontFamiliesEx (pango_win32_hdc, &lf, (FONTENUMPROC) pango_win32_inner_enum_proc, lParam, 0);
+  EnumFontFamiliesExA (pango_win32_hdc, &lf, (FONTENUMPROC) pango_win32_inner_enum_proc, lParam, 0);
 
   return 1;
 }
@@ -256,7 +256,7 @@ pango_win32_font_map_for_display (void)
 
   memset (&logfont, 0, sizeof (logfont));
   logfont.lfCharSet = DEFAULT_CHARSET;
-  EnumFontFamiliesEx (pango_win32_hdc, &logfont, (FONTENUMPROC) pango_win32_enum_proc, 0, 0);
+  EnumFontFamiliesExA (pango_win32_hdc, &logfont, (FONTENUMPROC) pango_win32_enum_proc, 0, 0);
 
 #ifdef _WE_WANT_GLOBAL_ALIASES_
   pango_win32_font_map_read_aliases (fontmap);
@@ -718,6 +718,7 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
   PangoVariant variant;
   PangoWeight weight;
   PangoStretch stretch;
+  int i;
 
   PING(("lfp.face=%s,wt=%ld,ht=%ld",lfp->lfFaceName,lfp->lfWeight,lfp->lfHeight));
   
@@ -725,7 +726,9 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
    */
   lfp2 = g_new (LOGFONT, 1);
   *lfp2 = *lfp;
-  lfp2->lfFaceName = g_ascii_strdown (lfp2->lfFaceName, -1);
+  /* lfp2->lfFaceName is an array of CHAR, change inplace */
+  for (i = 0; i < LF_FACESIZE; i++)
+    lfp2->lfFaceName[i] = g_ascii_tolower (lfp2->lfFaceName[i]);
   size_info = g_hash_table_lookup (win32fontmap->size_infos, lfp);
   if (!size_info)
     {
@@ -803,7 +806,8 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
   win32face->coverage = NULL;
   win32face->logfont = *lfp;
   win32face->unicode_table = NULL;
-  win32face->logfont.lfFaceName = g_ascii_strdown (lfp->lfFaceName, -1);
+  for (i = 0; i < LF_FACESIZE; i++)
+    win32face->logfont.lfFaceName[i] = g_ascii_tolower (win32face->logfont.lfFaceName[i]);
   font_family->font_entries = g_slist_append (font_family->font_entries, win32face);
   win32fontmap->n_fonts++;