rpms/pango/devel pango-split.patch, NONE, 1.1 private-api.patch, NONE, 1.1 pango.spec, 1.60, 1.61

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9198

Modified Files:
	pango.spec 
Added Files:
	pango-split.patch private-api.patch 
Log Message:
Some upstream fixes


pango-split.patch:
 ellipsize.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE pango-split.patch ---
Index: pango/ellipsize.c
===================================================================
RCS file: /cvs/gnome/pango/pango/ellipsize.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pango/ellipsize.c	29 Jan 2006 23:06:59 -0000	1.7
+++ pango/ellipsize.c	17 Feb 2006 08:11:02 -0000	1.8
@@ -126,7 +126,6 @@
   start_offset = g_utf8_strlen (line->layout->text,
 				line->start_index);
 
-  start_offset = 0;
   state->total_width = 0;
   for (l = line->runs, i = 0; l; l = l->next, i++)
     {

private-api.patch:
 pango-font.h  |    7 +++++++
 pango-types.h |    4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE private-api.patch ---
Index: pango/pango-types.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-types.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pango/pango-types.h	5 Feb 2006 03:11:58 -0000	1.31
+++ pango/pango-types.h	17 Feb 2006 07:26:17 -0000	1.32
@@ -45,10 +45,6 @@
  */
 typedef guint32 PangoGlyph;
 
-#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
-#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
-#define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
-
 /* A rectangle. Used to store logical and physical extents of glyphs,
  * runs, strings, etc.
  */
Index: pango/pango-font.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-font.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pango/pango-font.h	2 Feb 2006 12:07:17 -0000	1.33
+++ pango/pango-font.h	17 Feb 2006 07:26:16 -0000	1.34
@@ -365,6 +365,13 @@
 
 #endif /* PANGO_ENABLE_BACKEND */
 
+#if defined(PANGO_ENABLE_ENGINE) || defined(PANGO_ENABLE_BACKEND)
+#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
+#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
+#define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+#endif
+
+
 G_END_DECLS
 
 #endif /* __PANGO_FONT_H__ */


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- pango.spec	11 Feb 2006 20:45:37 -0000	1.60
+++ pango.spec	17 Feb 2006 15:21:53 -0000	1.61
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.11.5
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -37,6 +37,11 @@
 # Look for pango.modules in an arch-specific directory
 Patch5: pango-1.2.5-lib64.patch
 
+# already in upstream cvs
+Patch6: private-api.patch
+# already in upstream cvs
+Patch7: pango-split.patch
+
 %description
 Pango is a system for layout and rendering of internationalized text.
 
@@ -68,6 +73,9 @@
 %patch1 -p1 -b .slighthint
 %patch5 -p1 -b .lib64
 
+%patch6 -p0 -b .private-api
+%patch7 -p0 -b .pango-split
+
 %build
 
 %configure --disable-gtk-doc
@@ -188,6 +196,10 @@
 
 
 %changelog
+* Fri Feb 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.5-2
+- Fix a crash in pango_split
+- Hide some private API
+
 * Mon Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.5-1
 - Update to 1.11.5