--- a/ChangeLog	Tue Dec 09 06:00:02 2008 +0000
+++ b/ChangeLog	Tue Dec 09 06:53:09 2008 +0000
@@ -1,3 +1,8 @@
+2008-12-09  Chris Wang <[email protected]>
+
+	* patches/cairo-02-full-hinting.diff 
+	* patches/cairo-03-buggy-repeat.diff regenerate patches for cairo 1.8.4
+	
 2008-12-09  Laszlo (Laca) Peter  <[email protected]>
 
 	* SUNWPython26.spec: (new) spec file for Python 2.6.1

--- a/patches/cairo-02-full-hinting.diff	Tue Dec 09 06:00:02 2008 +0000
+++ b/patches/cairo-02-full-hinting.diff	Tue Dec 09 06:53:09 2008 +0000
@@ -1,13 +1,15 @@
-diff -rup ../SUNWgnome-base-libs-2.16.0-compiled/cairo-1.2.4/src/cairo-ft-font.c cairo-1.2.4/src/cairo-ft-font.c
---- ../SUNWgnome-base-libs-2.16.0-compiled/cairo-1.2.4/src/cairo-ft-font.c	2006-08-18 16:20:16.000000000 +0200
-+++ cairo-1.2.4/src/cairo-ft-font.c	2006-09-29 17:00:20.844256000 +0200
-@@ -1295,6 +1295,9 @@ _get_pattern_ft_options (FcPattern *patt
+--- cairo-1.8.4/src/cairo-ft-font.c.orig	2008-11-25 14:13:23.936565225 +0800
++++ cairo-1.8.4/src/cairo-ft-font.c	2008-11-25 14:23:02.348408718 +0800
+@@ -1372,8 +1372,12 @@
  	    break;
  	case FC_HINT_FULL:
  	    ft_options.base.hint_style = CAIRO_HINT_STYLE_FULL;
 +#ifdef FT_CONFIG_ADD_FULL_HINTING
-+           ft_options.load_flags |= FT_LOAD_USE_FULL_HINTING;
++	    ft_options.load_flags |= FT_LOAD_USE_FULL_HINTING;
 +#endif
  	    break;
  	}
++	
  #else /* !FC_HINT_STYLE */
+ 	if (!hinting) {
+ 	    ft_options.base.hint_style = CAIRO_HINT_STYLE_NONE;

--- a/patches/cairo-03-buggy-repeat.diff	Tue Dec 09 06:00:02 2008 +0000
+++ b/patches/cairo-03-buggy-repeat.diff	Tue Dec 09 06:53:09 2008 +0000
@@ -1,20 +1,19 @@
-diff -rup ../amd64/cairo-1.7.4/src/cairo-xlib-display.c cairo-1.7.4/src/cairo-xlib-display.c
---- ../amd64/cairo-1.7.4/src/cairo-xlib-display.c	2008-06-22 20:40:27.000000000 +0200
-+++ cairo-1.7.4/src/cairo-xlib-display.c	2008-10-28 15:03:17.590515767 +0100
-@@ -64,6 +64,8 @@ struct _cairo_xlib_job {
+--- cairo-1.8.4/src/cairo-xlib-display.c.orig	2008-11-13 23:56:33.000000000 +0800
++++ cairo-1.8.4/src/cairo-xlib-display.c	2008-11-25 14:39:56.342087676 +0800
+@@ -66,6 +66,8 @@
  
  static cairo_xlib_display_t *_cairo_xlib_display_list;
  
 +static int buggy_repeat_force = -1;
 +
  static void
- _cairo_xlib_call_close_display_hooks (cairo_xlib_display_t *display)
- {
-@@ -316,6 +318,17 @@ _cairo_xlib_display_get (Display *dpy)
+ _cairo_xlib_remove_close_display_hook_internal (cairo_xlib_display_t *display,
+ 						cairo_xlib_hook_t *hook);
+@@ -337,6 +339,17 @@
  	if (VendorRelease (dpy) <= 40500000)
  	    display->buggy_repeat = TRUE;
      }
-+    /* workaround; see http://defect.opensolaris.org/bz/show_bug.cgi?id=4187 */
++/* workaround; see http://defect.opensolaris.org/bz/show_bug.cgi?id=4187 */
 +    if (buggy_repeat_force == -1) {
 +        if (getenv("CAIRO_NO_BUGGY_REPEAT"))
 +            buggy_repeat_force = 0;