Update to 1.12.0:

Overview of changes between 1.11.99 and 1.12.0
==============================================
* Compilations fixes for MSVC. [#333115, Tor Lillqvist]
* More NULL-check against unusable fonts, helps with Win32 fonts without
  a Unicode cmap. [Tor]
* Use g_print instead of printf for debugging output in Win32 backend.
  [#332855, Tor]

Overview of changes between 1.11.6 and 1.11.99
==============================================
* Fix problem recently introduced that made Win32 backend render boxes
  only. [#332538, Hans Breuer]
* Insert '?' chars instead of invalid UTF-8 sequences in
  pango_layout_set_text [#33195]
* Bugs fixed in this release:
  332167,332538,331995

Overview of changes between 1.11.5 and 1.11.6
=============================================
* Do not export macros PANGO_GLYPH_EMPTY, PANGO_GLYPH_UNKNOWN_FLAG and
  PANGO_GET_UNKNOWN_GLYPH publicly; just in the engine/backend interface.
* Fix a few crashers, especially when a font cannot be read. [#314239]
* Change some g_critical's to g_warning, where it's not application's
  fault. [#331723]
* Bugs fixed in this release:
  330795,331038,329148,331994,331995,331996,314239,331723

Overview of changes between 1.11.4 and 1.11.5
=============================================
* Cleanup work on the win32 backend.  Families are not listed all
  in lower case anymore.
* New public function: pango_win32_font_description_from_logfont.
* pango-view accepts --wrap now, and lists backends in --help output.
* A couple minor bug fixes.

Overview of changes between 1.11.3 and 1.11.4
=============================================
* Major change in the low-level interface of Pango.  The special value
  PANGO_GLYPH_EMPTY is now defined to mean a "draw nothing" glyph.  This
  was what glyph 0 was used for previously.  As a result, bumped up the
  Pango module version, meaning that modules compiled against earlier
  versions are probably not compatible with this release. [#73147]
* New framework in examples for building a binary called pango-view,
  that can be used to render a text file using any of the available
  backends.  This is installed into bindir now.
* Enhancements to the FT2 backend, to draw boxes on missing glyphs.
* Better hexbox drawing for cairo backend:  Hinting hexbox, and
  drawing a single-row hexbox for very small font sizes.
* Improved documentation.

Overview of changes between 1.11.2 and 1.11.3
=============================================
* Do not crash if the shapers fail.
* Use g_slice for various struct allocations.
* 100% symbol coverage in docs.
* Misc bug fixes and documentation improvements.
* Janitory works, like removing unneeded files.

Overview of changes between 1.11.1 and 1.11.2
=============================================
* Draw hex box on missing glyphs for cairo-fc backend.
* New --with-dynamic-modules option added to configure.
* Use g_slice for various small memory allocations [Matthias Clasen]
* Misc bug fixes, optimizations, and documentation improvements.

Overview of changes between 1.11.0 and 1.11.1
=============================================
* ATSUI support for the cairo backend. [Anders Carlsson]
* Fixed a couple of regressions with font size and scaling.
* Draw a dashed empty box on missing glyphs for cairo-fc backend.
* Support OpenType features for basic (Latin/Greek/...) module.
* Support swash feature in Arabic module.
* Misc bug fixes.
* Misc documentation improvements.

Optimizations:

* Cache GObject private data in PangoFcFont.priv [Federico Mena Quintero]
* Add a constant-sized light-weight cache for glyph extents.
* Use g_slice_* instead of GMemChunk in mini-fribidi.


Overview of changes between 1.10.1 and 1.11.0
=============================================
* Line-breaking algorithm updated to Unicode 4.1.
* Code borrowed from GNU FriBidi resynched to version 1.0.7.
* New improved Tibetan shaper module. [Pema Geyleg]
* Bug fix in Khmer shaper module. [Jens Herden]
* Respect fontconfig reassignment of font pixelsize. [Funda Wang]
* Make OpenType GPOS handling more robust/correct. [Greg Aumann]
* Various documentation fixes and improvements.
* Various gcc warning fixes.
* Misc bug fixes.

Optimizations:

* Add a lazy fixed-size per-font cache to map characters to glyphs,
  in the cairo backend. [Federico Mena Quintero]
* Optimize character to script mapping by adding a linear table for
  characters < U+2000, and also caching the last mid point in
  bsearch. [Federico, Matthias Clasen]
* Enabled mini-fribidi's trashstack instead of direct mallocs.
* Short circuit the bidi algorithm for provably unidirectional text.
* Make mini-fribidi process UTF-8 directly.
* Several strlen and g_utf8_strlen calls removed. [Owen Taylor, Billy Biggs]
* Use call tables in the OpenType layout code.
* Use quarks for accessing GObject data. [Federico]
* Open Pango modules with lazy-bind flags. [John Rice]
* Use new negative offsets in g_utf8_pointer_to_offset to avoid
  scanning from the beginning of line on cursor movement.
* Avoid redundant PANGO_IS_FC_FONT checks.

4 files changed, 30 insertions, 28 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index d6d5ff218d9..c34c82b7908 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.70 2006/03/10 07:35:12 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2006/03/13 18:26:03 wiz Exp $
 #
 
-DISTNAME=		pango-1.10.4
+DISTNAME=		pango-1.12.0
 CATEGORIES=		devel fonts
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.8/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.8/ \
-			${MASTER_SITE_GNOME:=sources/pango/1.10/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.10/ \
+			${MASTER_SITE_GNOME:=sources/pango/1.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		wiz@NetBSD.org
@@ -50,5 +50,5 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
-
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 90b9d18058c..410daa26b03 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.23 2005/10/02 12:16:58 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.24 2006/03/13 18:26:03 wiz Exp $
 bin/pango-querymodules
+bin/pango-view
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
 include/pango-1.0/pango/pango-context.h
@@ -34,16 +35,16 @@ lib/libpangocairo-1.0.la
 lib/libpangoft2-1.0.la
 lib/libpangox-1.0.la
 lib/libpangoxft-1.0.la
-lib/pango/1.4.0/modules/pango-arabic-fc.la
-lib/pango/1.4.0/modules/pango-basic-fc.la
-lib/pango/1.4.0/modules/pango-basic-x.la
-lib/pango/1.4.0/modules/pango-hangul-fc.la
-lib/pango/1.4.0/modules/pango-hebrew-fc.la
-lib/pango/1.4.0/modules/pango-indic-fc.la
-lib/pango/1.4.0/modules/pango-khmer-fc.la
-lib/pango/1.4.0/modules/pango-syriac-fc.la
-lib/pango/1.4.0/modules/pango-thai-fc.la
-lib/pango/1.4.0/modules/pango-tibetan-fc.la
+lib/pango/1.5.0/modules/pango-arabic-fc.la
+lib/pango/1.5.0/modules/pango-basic-fc.la
+lib/pango/1.5.0/modules/pango-basic-x.la
+lib/pango/1.5.0/modules/pango-hangul-fc.la
+lib/pango/1.5.0/modules/pango-hebrew-fc.la
+lib/pango/1.5.0/modules/pango-indic-fc.la
+lib/pango/1.5.0/modules/pango-khmer-fc.la
+lib/pango/1.5.0/modules/pango-syriac-fc.la
+lib/pango/1.5.0/modules/pango-thai-fc.la
+lib/pango/1.5.0/modules/pango-tibetan-fc.la
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangocairo.pc
 lib/pkgconfig/pangoft2.pc
@@ -65,6 +66,7 @@ share/doc/pango/ix01.html
 share/doc/pango/layout.gif
 share/doc/pango/left.png
 share/doc/pango/lowlevel.html
+share/doc/pango/pango-ATSUI-Fonts.html
 share/doc/pango/pango-Cairo-Rendering.html
 share/doc/pango/pango-Coverage-Maps.html
 share/doc/pango/pango-Engines.html
@@ -92,8 +94,8 @@ share/doc/pango/tools.html
 share/doc/pango/up.png
 @dirrm share/doc/pango
 @dirrm libdata/pango
-@dirrm lib/pango/1.4.0/modules
-@dirrm lib/pango/1.4.0
+@dirrm lib/pango/1.5.0/modules
+@dirrm lib/pango/1.5.0
 @dirrm lib/pango
 @dirrm include/pango-1.0/pango
 @dirrm include/pango-1.0
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index b5f9b124899..320e57fd610 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.32 2006/02/28 17:38:01 wiz Exp $
+$NetBSD: distinfo,v 1.33 2006/03/13 18:26:03 wiz Exp $
 
-SHA1 (pango-1.10.4.tar.bz2) = 57403adea41504c5a0e9576b102cb4e8999fb4a3
-RMD160 (pango-1.10.4.tar.bz2) = 2b7e9771fb4dc71076f58566e3ad962c8d506e1b
-Size (pango-1.10.4.tar.bz2) = 1184862 bytes
-SHA1 (patch-aa) = b8f8d32dd163e6fbf80cf09d1321546499302275
+SHA1 (pango-1.12.0.tar.bz2) = f4e07c2a3702b53a96fe19ac9cc13db049f759bc
+RMD160 (pango-1.12.0.tar.bz2) = a8df3aed2ac61590875832aea67a7af42fe4b045
+Size (pango-1.12.0.tar.bz2) = 1202207 bytes
+SHA1 (patch-aa) = 775b7e995770983e73fdecd38b6e2dc069950ccc
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
index e83116f52e4..44ec76af376 100644
--- a/devel/pango/patches/patch-aa
+++ b/devel/pango/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.11 2005/07/28 11:04:13 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2006/03/13 18:26:03 wiz Exp $
 
---- pango/opentype/Makefile.in.orig	2005-07-26 20:45:53.000000000 +0200
+--- pango/opentype/Makefile.in.orig	2006-03-13 04:55:45.000000000 +0000
 +++ pango/opentype/Makefile.in
-@@ -283,7 +283,8 @@ ottest_SOURCES = \
+@@ -325,7 +325,8 @@ ottest_SOURCES = \
  
  ottest_LDADD = \
- 	libpango-ot.la	\
+ 	libmini-harfbuzz.la	\
 -	$(FREETYPE_LIBS)
 +	$(FREETYPE_LIBS) \
 +	$(GLIB_LIBS)