From 9b89bd65c45617fc0002e3302126b261c02319a7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 27 Dec 2008 14:36:22 +0000
Subject: [PATCH] pango: bump version

---
 .../pango/pango-1.19.3-no-cairo-atsui.patch   | 42 -------------------
 ...19.3-gtk-doc.patch => pango-gtk-doc.patch} |  0
 ...o-libthai.patch => pango-no-libthai.patch} |  0
 ....3-no-tests.patch => pango-no-tests.patch} |  0
 package/pango/pango.mk                        |  2 +-
 5 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 package/pango/pango-1.19.3-no-cairo-atsui.patch
 rename package/pango/{pango-1.19.3-gtk-doc.patch => pango-gtk-doc.patch} (100%)
 rename package/pango/{pango-1.19.3-no-libthai.patch => pango-no-libthai.patch} (100%)
 rename package/pango/{pango-1.19.3-no-tests.patch => pango-no-tests.patch} (100%)

diff --git a/package/pango/pango-1.19.3-no-cairo-atsui.patch b/package/pango/pango-1.19.3-no-cairo-atsui.patch
deleted file mode 100644
index dcecf4b581..0000000000
--- a/package/pango/pango-1.19.3-no-cairo-atsui.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/configure.in	2008-01-21 21:12:10.000000000 -0500
-+++ b/configure.in	2008-02-09 13:32:20.000000000 -0500
-@@ -318,11 +318,6 @@ if test "$pango_os_win32" = "yes"; then
- fi
- 
- #
--# Checks for ATSUI
--#
--AC_CHECK_HEADER(Carbon/Carbon.h, [have_atsui=true], [have_atsui=true])
--
--#
- # Checks for Cairo
- #
- have_cairo=false
-
---- a/configure.in	2008-02-09 13:37:25.000000000 -0500
-+++ b/configure.in	2008-02-09 13:39:42.000000000 -0500
-@@ -374,12 +374,6 @@ if $have_cairo ; then
-     have_cairo=true
-   fi
- 
--  PKG_CHECK_EXISTS(cairo-atsui >= $cairo_required, have_cairo_atsui=true, :)
--  if $have_cairo_atsui && $have_atsui ; then
--    AC_DEFINE(HAVE_CAIRO_ATSUI, 1, [Whether Cairo uses ATSUI for fonts])
--    have_cairo=true
--  fi
--
-   if $have_cairo ; then
-     AC_DEFINE(HAVE_CAIRO, 1, [Have usable Cairo library and font backend])
-   fi
-
---- a/configure	2008-02-09 13:25:54.000000000 -0500
-+++ b/configure	2008-02-09 13:27:56.000000000 -0500
-@@ -22516,7 +22516,7 @@ fi
-   if $have_cairo_atsui && $have_atsui ; then
- 
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_CAIRO_ATSUI 1
-+/* #undef HAVE_CAIRO_ATSUI */
- _ACEOF
- 
-     have_cairo=true
diff --git a/package/pango/pango-1.19.3-gtk-doc.patch b/package/pango/pango-gtk-doc.patch
similarity index 100%
rename from package/pango/pango-1.19.3-gtk-doc.patch
rename to package/pango/pango-gtk-doc.patch
diff --git a/package/pango/pango-1.19.3-no-libthai.patch b/package/pango/pango-no-libthai.patch
similarity index 100%
rename from package/pango/pango-1.19.3-no-libthai.patch
rename to package/pango/pango-no-libthai.patch
diff --git a/package/pango/pango-1.19.3-no-tests.patch b/package/pango/pango-no-tests.patch
similarity index 100%
rename from package/pango/pango-1.19.3-no-tests.patch
rename to package/pango/pango-no-tests.patch
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index b6c3c7a5db..440e578c5c 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -3,7 +3,7 @@
 # pango
 #
 #############################################################
-PANGO_VERSION = 1.19.3
+PANGO_VERSION = 1.20.5
 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2
 PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/1.19
 PANGO_AUTORECONF = YES