GNOME.org
 

pango fixes

I don't know if this is the right list for pango patches or not, but
nothing in the pango source seems to say.

This is mostly just removing warnings.



Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/pango/ChangeLog,v
retrieving revision 1.236
diff -u -r1.236 ChangeLog
--- ChangeLog	2001/04/03 19:07:34	1.236
+++ ChangeLog	2001/04/12 12:31:08
@@ -1,3 +1,33 @@
+Thu Apr 12 08:16:19 2001  Dan Winship  <danw ximian com>
+
+	* README (Dependencies): Mention libiconv and the fact that glibc
+	2.1.2 has a buggy iconv. Remove FriBidi URL since there's no
+	reason to go out and get it now if you don't already have it. Add
+	FreeType URL.
+
+	* modules/*/Makefile.am: remove "-rpath" stuff. automake does that
+	itself.
+
+	* modules/indic/bengali-x.c (pango_indic_make_ligs,
+	pango_indic_engine_shape):
+	* modules/indic/gujarati-x.c (pango_indic_engine_shape): 
+	* modules/indic/devanagari-x.c (pango_indic_engine_shape): 
+	Remove unused variables.
+	
+	* pango/pango-attributes.c (pango_attr_list_get_type,
+	pango_color_get_type): Add casts to g_boxed_type_register_static
+	arguments.
+
+	* pango/pango-utils.c (read_config): Fix const/non-const warnings
+
+	* pango/mini-fribidi/fribidi.c (fribidi_analyse_string): Remove
+	unused variable
+
+	* pango/opentype/ftxopen.c (Load_Coverage): Remove unused variable
+
+	* pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape):
+	Remove unused variable.
+
 Tue Apr  3 15:05:19 2001  Owen Taylor  <otaylor redhat com>
 
 	* Release 0.14
Index: README
===================================================================
RCS file: /cvs/gnome/pango/README,v
retrieving revision 1.4
diff -u -r1.4 README
--- README	2000/11/12 21:16:36	1.4
+++ README	2001/04/12 12:31:08
@@ -8,18 +8,18 @@
 Dependencies
 ============
 
-You'll need a fairly capable implementation
-of iconv() - for instance the iconv from the
-GNU C library version 2.1
+You'll need a fairly capable implementation of iconv() - for instance
+the iconv from the GNU C library version 2.1.3 or later (earlier versions
+have bugs), or the libiconv from
+http://clisp.cons.org/~haible/packages-libiconv.html
 
-Pango can optionally be compiled to use Dov Grobgeld's FriBidi
-library. This is available from:
+Pango can optionally be compiled to use the FreeType library (2.0.1 or
+later) from http://www.freetype.org to render TrueType fonts.
 
- http://imagic.weizmann.ac.il/~dov/freesw/FriBidi/
-
-If the --with-fribidi option is not given to configure, then
-Pango will use internal copies of the FriBidi routines.
-No functionality will be lost by using the internal routines.
+Pango can also optionally be compiled to use Dov Grobgeld's FriBidi
+library. If the --with-fribidi option is not given to configure, then
+Pango will use internal copies of the FriBidi routines. No
+functionality will be lost by using the internal routines.
 
 Notes
 =====
Index: modules/arabic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/arabic/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- modules/arabic/Makefile.am	2001/03/15 05:58:59	1.11
+++ modules/arabic/Makefile.am	2001/04/12 12:31:08
@@ -51,16 +51,15 @@
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX)
 moduledir = $(libdir)/pango/modules
-moduleflags=-rpath $(libdir)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
 
-pango_arabic_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
+pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_arabic_x_la_SOURCES = $(x_sources)
 
 libpango_arabic_x_la_SOURCES = $(x_sources)
 
-pango_arabic_xft_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+pango_arabic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_arabic_xft_la_LIBADD = 
 pango_arabic_xft_la_SOURCES = $(xft_sources)
 
Index: modules/basic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/basic/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- modules/basic/Makefile.am	2001/03/15 05:59:00	1.15
+++ modules/basic/Makefile.am	2001/04/12 12:31:09
@@ -54,7 +54,6 @@
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX)
 moduledir = $(libdir)/pango/modules
-moduleflags=-rpath $(libdir)
 
 INCLUDES = 			\
 	-I$(top_srcdir) 	\
@@ -63,17 +62,17 @@
 	$(FREETYPE_CFLAGS)	\
 	$(moddefine)
 
-pango_basic_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
+pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_basic_x_la_LIBADD = 
 pango_basic_x_la_SOURCES = $(basic_sources)
 libpango_basic_x_la_SOURCES = $(basic_sources)
 
-pango_basic_xft_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+pango_basic_xft_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_basic_xft_la_LIBADD = 
 pango_basic_xft_la_SOURCES = basic-xft.c
 libpango_basic_xft_la_SOURCES = basic-xft.c
 
-pango_basic_ft2_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+pango_basic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_basic_ft2_la_LIBADD =  $(FREETYPE_LIBS)
 pango_basic_ft2_la_SOURCES = basic-ft2.c
 libpango_basic_ft2_la_SOURCES = basic-ft2.c
Index: modules/hangul/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/hangul/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- modules/hangul/Makefile.am	2001/03/15 05:59:01	1.8
+++ modules/hangul/Makefile.am	2001/04/12 12:31:09
@@ -9,13 +9,12 @@
 else
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-hangul-x.la
-moduleflags= -rpath $(libdir)
 endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
-pango_hangul_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
+pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_hangul_x_la_SOURCES = $(sources)
 
 libpango_hangul_x_la_SOURCES = $(sources)
Index: modules/indic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- modules/indic/Makefile.am	2001/03/15 05:59:01	1.6
+++ modules/indic/Makefile.am	2001/04/12 12:31:09
@@ -15,7 +15,6 @@
 myanmar_x_cflags=-DMYANMAR_X_MODULE_PREFIX
 else
 myanmar_x_inst=pango-myanmar-x.la
-myanmar_x_moduleflags=-rpath $(libdir)
 endif
 
 if INCLUDE_GURMUKHI_X
@@ -23,7 +22,6 @@
 gurmukhi_x_cflags=-DGURMUKHI_X_MODULE_PREFIX
 else
 gurmukhi_x_inst=pango-gurmukhi-x.la
-gurmukhi_x_moduleflags=-rpath $(libdir)
 endif
 
 if INCLUDE_BENGALI_X
@@ -31,7 +29,6 @@
 bengali_x_cflags=-DBENGALI_X_MODULE_PREFIX
 else
 bengali_x_inst=pango-bengali-x.la
-bengali_x_moduleflags=-rpath $(libdir)
 endif
 
 if INCLUDE_DEVANAGARI_X
@@ -39,7 +36,6 @@
 devanagari_x_cflags=-DDEVANAGARI_X_MODULE_PREFIX
 else
 devanagari_x_inst=pango-devanagari-x.la
-devanagari_x_moduleflags=-rpath $(libdir)
 endif
 
 if INCLUDE_GUJARATI_X
@@ -47,7 +43,6 @@
 gujarati_x_cflags=-DGUJARATI_X_MODULE_PREFIX
 else
 gujarati_x_inst=pango-gujarati-x.la
-gujarati_x_moduleflags=-rpath $(libdir)
 endif
 
 if INCLUDE_ANY_INDIC
@@ -64,35 +59,35 @@
 EXTRA_DIST = \
 	pango-indic-script.h
 
-pango_devanagari_x_la_LDFLAGS = $(devanagari_x_moduleflags) -export-dynamic -avoid-version -module
+pango_devanagari_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 if INCLUDE_DEVANAGARI_X
 libpango_devanagari_x_la_SOURCES = devanagari-x.c
 else
 pango_devanagari_x_la_SOURCES = devanagari-x.c
 endif
 
-pango_myanmar_x_la_LDFLAGS = $(myanmar_x_moduleflags) -export-dynamic -avoid-version -module
+pango_myanmar_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 if INCLUDE_MYANMAR_X
 libpango_myanmar_x_la_SOURCES = myanmar-x.c
 else
 pango_myanmar_x_la_SOURCES = myanmar-x.c
 endif
 
-pango_gurmukhi_x_la_LDFLAGS = $(gurmukhi_x_moduleflags) -export-dynamic -avoid-version -module
+pango_gurmukhi_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 if INCLUDE_GURMUKHI_X
 libpango_gurmukhi_x_la_SOURCES = gurmukhi-x.c
 else
 pango_gurmukhi_x_la_SOURCES = gurmukhi-x.c
 endif
 
-pango_bengali_x_la_LDFLAGS = $(bengali_x_moduleflags) -export-dynamic -avoid-version -module
+pango_bengali_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 if INCLUDE_BENGALI_X
 libpango_bengali_x_la_SOURCES = bengali-x.c
 else
 pango_bengali_x_la_SOURCES = bengali-x.c
 endif
 
-pango_gujarati_x_la_LDFLAGS = $(gujarati_x_moduleflags) -export-dynamic -avoid-version -module
+pango_gujarati_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 if INCLUDE_GUJARATI_X
 libpango_gujarati_x_la_SOURCES = gujarati-x.c
 else
Index: modules/indic/bengali-x.c
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/bengali-x.c,v
retrieving revision 1.6
diff -u -r1.6 bengali-x.c
--- modules/indic/bengali-x.c	2001/01/04 09:07:24	1.6
+++ modules/indic/bengali-x.c	2001/04/12 12:31:09
@@ -159,14 +159,12 @@
 static void
 pango_indic_make_ligs (gunichar * start, gunichar * end)
 {
-  int num = end - start;
   int i;
 
   for (i = 0; i < (end - start); i++)
     {
       gunichar t0 = pango_indic_get_char (start + i, end);
       gunichar t1 = pango_indic_get_char (start + 1 + i, end);
-      gunichar t2 = pango_indic_get_char (start + 2 + i, end);
 
        if ((t0 == VIRAMA) && (t1 == 0x9af)) 
 	 {
@@ -207,8 +205,7 @@
 
   int n_chars, n_glyph;
   int lvl;
-  const char *p;
-  int i, k;
+  int i;
   gunichar *wc;
   int sb;
   int n_syls;
Index: modules/indic/devanagari-x.c
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/devanagari-x.c,v
retrieving revision 1.6
diff -u -r1.6 devanagari-x.c
--- modules/indic/devanagari-x.c	2001/01/04 09:07:24	1.6
+++ modules/indic/devanagari-x.c	2001/04/12 12:31:10
@@ -248,7 +248,6 @@
 
   int n_chars, n_glyph;
   int lvl;
-  const char *p;
   int i;
   gunichar *wc;
   int sb;
Index: modules/indic/gujarati-x.c
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/gujarati-x.c,v
retrieving revision 1.6
diff -u -r1.6 gujarati-x.c
--- modules/indic/gujarati-x.c	2001/01/04 09:07:24	1.6
+++ modules/indic/gujarati-x.c	2001/04/12 12:31:11
@@ -41,7 +41,6 @@
 
 static gboolean is_prefixing_vowel (gunichar i);
 static gboolean is_vowel_sign (gunichar i);
-static gunichar vowel_sign_to_matra (gunichar i);
 
 static PangoIndicScript script = {
   SCRIPT_STRING,
@@ -232,7 +231,6 @@
 
   int n_chars, n_glyph;
   int lvl;
-  const char *p;
   int i;
   gunichar *wc;
   int sb;
Index: modules/tamil/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/tamil/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- modules/tamil/Makefile.am	2001/03/15 05:59:02	1.8
+++ modules/tamil/Makefile.am	2001/04/12 12:31:11
@@ -9,13 +9,12 @@
 else
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-tamil-x.la
-moduleflags=-rpath $(libdir)
 endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
-pango_tamil_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
+pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_tamil_x_la_SOURCES = $(sources)
 
 libpango_tamil_x_la_SOURCES = $(sources)
Index: modules/thai/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/thai/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- modules/thai/Makefile.am	2001/03/15 05:59:03	1.6
+++ modules/thai/Makefile.am	2001/04/12 12:31:11
@@ -9,13 +9,12 @@
 else
 moduledir = $(libdir)/pango/modules
 module_LTLIBRARIES = pango-thai-x.la
-moduleflags=-rpath $(libdir)
 endif
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS)
 
-pango_thai_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module
+pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_thai_x_la_LIBADD =
 pango_thai_x_la_SOURCES = $(sources)
 
Index: pango/pango-attributes.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-attributes.c,v
retrieving revision 1.25
diff -u -r1.25 pango-attributes.c
--- pango/pango-attributes.c	2001/03/07 14:33:53	1.25
+++ pango/pango-attributes.c	2001/04/12 12:31:14
@@ -691,8 +691,8 @@
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("PangoAttrList",
 					     NULL,
-					     pango_attr_list_copy,
-					     pango_attr_list_unref,
+					     (GBoxedCopyFunc)pango_attr_list_copy,
+					     (GBoxedFreeFunc)pango_attr_list_unref,
 					     FALSE);
 
   return our_type;
@@ -1505,8 +1505,8 @@
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("PangoColor",
 					     NULL,
-					     pango_color_copy,
-					     pango_color_free,
+					     (GBoxedCopyFunc)pango_color_copy,
+					     (GBoxedFreeFunc)pango_color_free,
 					     FALSE);
 
   return our_type;
Index: pango/pango-utils.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-utils.c,v
retrieving revision 1.16
diff -u -r1.16 pango-utils.c
--- pango/pango-utils.c	2001/02/21 04:09:17	1.16
+++ pango/pango-utils.c	2001/04/12 12:31:15
@@ -570,7 +570,7 @@
   if (!config_hash)
     {
       char *filename;
-      char *home;
+      const char *home;
       
       config_hash = g_hash_table_new (g_str_hash, g_str_equal);
       filename = g_strconcat (pango_get_sysconf_subdirectory (),
@@ -589,7 +589,7 @@
 	  g_free (filename);
 	}
 
-      filename = g_getenv ("PANGO_RC_FILE");
+      filename = (char *)g_getenv ("PANGO_RC_FILE");
       if (filename)
 	read_config_file (filename, TRUE);
     }
Index: pango/mini-fribidi/fribidi.c
===================================================================
RCS file: /cvs/gnome/pango/pango/mini-fribidi/fribidi.c,v
retrieving revision 1.2
diff -u -r1.2 fribidi.c
--- pango/mini-fribidi/fribidi.c	2000/11/29 16:09:37	1.2
+++ pango/mini-fribidi/fribidi.c	2001/04/12 12:31:16
@@ -216,7 +216,7 @@
   int max_level;
   int i;
   int *char_type;
-  int prev_last_strong, last_strong;
+  int last_strong;
   TypeLink *type_rl_list, *pp;
 
   /* Determinate character types */
Index: pango/opentype/ftxopen.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/ftxopen.c,v
retrieving revision 1.1
diff -u -r1.1 ftxopen.c
--- pango/opentype/ftxopen.c	2000/12/20 04:41:36	1.1
+++ pango/opentype/ftxopen.c	2001/04/12 12:31:19
@@ -851,7 +851,6 @@
 			   FT_Stream      stream )
   {
     FT_Error   error;
-    FT_Memory  memory = stream->memory;
 
     if ( ACCESS_Frame( 2L ) )
       return error;
Index: pango/opentype/pango-ot-ruleset.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/pango-ot-ruleset.c,v
retrieving revision 1.1
diff -u -r1.1 pango-ot-ruleset.c
--- pango/opentype/pango-ot-ruleset.c	2000/12/20 04:41:36	1.1
+++ pango/opentype/pango-ot-ruleset.c	2001/04/12 12:31:19
@@ -133,7 +133,6 @@
   TTO_GSUB_String *in_string = NULL;
   TTO_GSUB_String *out_string = NULL;
   TTO_GSUB_String *result_string = NULL;
-  TTO_GPOS_Data *pos_data;
 
   gboolean need_gsub = FALSE;
   gboolean need_gpos = FALSE;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]