From 4ee102075b2d932c925f5b5ac613431611906897 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Mon, 25 Oct 2010 07:22:46 +0000
Subject: [PATCH] pango: updated to 1.26.2

---
 pango/.footprint               | 30 ++++++++--------
 pango/.md5sum                  |  3 +-
 pango/Pkgfile                  | 10 +++---
 pango/pango-1.26.2_cairo.patch | 62 ++++++++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 20 deletions(-)
 create mode 100644 pango/pango-1.26.2_cairo.patch

diff --git a/pango/.footprint b/pango/.footprint
index b22d604..6abc6a4 100644
--- a/pango/.footprint
+++ b/pango/.footprint
@@ -45,25 +45,25 @@ drwxr-xr-x	root/root	usr/include/pango-1.0/pango/
 -rw-r--r--	root/root	usr/include/pango-1.0/pango/pangoxft.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libpango-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpango-1.0.so -> libpango-1.0.so.0.2400.5
-lrwxrwxrwx	root/root	usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.2400.5
--rwxr-xr-x	root/root	usr/lib/libpango-1.0.so.0.2400.5
+lrwxrwxrwx	root/root	usr/lib/libpango-1.0.so -> libpango-1.0.so.0.2600.2
+lrwxrwxrwx	root/root	usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.2600.2
+-rwxr-xr-x	root/root	usr/lib/libpango-1.0.so.0.2600.2
 -rwxr-xr-x	root/root	usr/lib/libpangocairo-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.2400.5
-lrwxrwxrwx	root/root	usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.2400.5
--rwxr-xr-x	root/root	usr/lib/libpangocairo-1.0.so.0.2400.5
+lrwxrwxrwx	root/root	usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0.2600.2
+lrwxrwxrwx	root/root	usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.2600.2
+-rwxr-xr-x	root/root	usr/lib/libpangocairo-1.0.so.0.2600.2
 -rw-r--r--	root/root	usr/lib/libpangoft2-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.2400.5
-lrwxrwxrwx	root/root	usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.2400.5
--rwxr-xr-x	root/root	usr/lib/libpangoft2-1.0.so.0.2400.5
+lrwxrwxrwx	root/root	usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0.2600.2
+lrwxrwxrwx	root/root	usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.2600.2
+-rwxr-xr-x	root/root	usr/lib/libpangoft2-1.0.so.0.2600.2
 -rw-r--r--	root/root	usr/lib/libpangox-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.2400.5
-lrwxrwxrwx	root/root	usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.2400.5
--rwxr-xr-x	root/root	usr/lib/libpangox-1.0.so.0.2400.5
+lrwxrwxrwx	root/root	usr/lib/libpangox-1.0.so -> libpangox-1.0.so.0.2600.2
+lrwxrwxrwx	root/root	usr/lib/libpangox-1.0.so.0 -> libpangox-1.0.so.0.2600.2
+-rwxr-xr-x	root/root	usr/lib/libpangox-1.0.so.0.2600.2
 -rw-r--r--	root/root	usr/lib/libpangoxft-1.0.la
-lrwxrwxrwx	root/root	usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.2400.5
-lrwxrwxrwx	root/root	usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.2400.5
--rwxr-xr-x	root/root	usr/lib/libpangoxft-1.0.so.0.2400.5
+lrwxrwxrwx	root/root	usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0.2600.2
+lrwxrwxrwx	root/root	usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.2600.2
+-rwxr-xr-x	root/root	usr/lib/libpangoxft-1.0.so.0.2600.2
 drwxr-xr-x	root/root	usr/lib/pango/
 drwxr-xr-x	root/root	usr/lib/pango/1.6.0/
 drwxr-xr-x	root/root	usr/lib/pango/1.6.0/modules/
diff --git a/pango/.md5sum b/pango/.md5sum
index a9e192a..d316223 100644
--- a/pango/.md5sum
+++ b/pango/.md5sum
@@ -1,2 +1,3 @@
-815416a452e9cccc172fed9862401f37  pango-1.24.5.tar.bz2
+f30212b8833af3ce5c82121dc309e3d0  pango-1.26.2.tar.bz2
+3e8045affcd2c466934d5fe1af42afaa  pango-1.26.2_cairo.patch
 9012f52b08405b0a8a01948e3e68819d  pango.modules
diff --git a/pango/Pkgfile b/pango/Pkgfile
index 6f047b7..aa87ad3 100644
--- a/pango/Pkgfile
+++ b/pango/Pkgfile
@@ -4,10 +4,10 @@
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: cairo glib xorg-libsm xorg-libxext xorg-libxft
 name=pango
-version=1.24.5
-release=2
-source=(http://download.gnome.org/sources/$name/1.24/$name-$version.tar.bz2 \
-        pango.modules)
+version=1.26.2
+release=1
+source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.bz2 \
+        pango.modules pango-1.26.2_cairo.patch)
 
 build () {
   cd $name-$version
@@ -25,6 +25,8 @@ build () {
   export CAIRO_LIBS="$DEFAULT_LIBS -lcairo"
   export CAIRO_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/cairo"
 
+  patch -p0 -i $SRC/pango-1.26.2_cairo.patch
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr
diff --git a/pango/pango-1.26.2_cairo.patch b/pango/pango-1.26.2_cairo.patch
new file mode 100644
index 0000000..4a95e04
--- /dev/null
+++ b/pango/pango-1.26.2_cairo.patch
@@ -0,0 +1,62 @@
+--- configure	2009-07-20 20:59:52.000000000 +0000
++++ configure.new	2010-10-21 18:25:57.000000000 +0000
+@@ -20070,45 +20070,20 @@
+   LDFLAGS=$pango_save_ldflags
+ fi
+ 
+- if $have_cairo; then
+   HAVE_CAIRO_TRUE=
+   HAVE_CAIRO_FALSE='#'
+-else
+-  HAVE_CAIRO_TRUE='#'
+-  HAVE_CAIRO_FALSE=
+-fi
+ 
+- if $have_cairo_png; then
+   HAVE_CAIRO_PNG_TRUE=
+   HAVE_CAIRO_PNG_FALSE='#'
+-else
+-  HAVE_CAIRO_PNG_TRUE='#'
+-  HAVE_CAIRO_PNG_FALSE=
+-fi
+ 
+- if $have_cairo_ps; then
+   HAVE_CAIRO_PS_TRUE=
+   HAVE_CAIRO_PS_FALSE='#'
+-else
+-  HAVE_CAIRO_PS_TRUE='#'
+-  HAVE_CAIRO_PS_FALSE=
+-fi
+ 
+- if $have_cairo_pdf; then
+   HAVE_CAIRO_PDF_TRUE=
+   HAVE_CAIRO_PDF_FALSE='#'
+-else
+-  HAVE_CAIRO_PDF_TRUE='#'
+-  HAVE_CAIRO_PDF_FALSE=
+-fi
+ 
+- if $have_cairo_xlib; then
+   HAVE_CAIRO_XLIB_TRUE=
+   HAVE_CAIRO_XLIB_FALSE='#'
+-else
+-  HAVE_CAIRO_XLIB_TRUE='#'
+-  HAVE_CAIRO_XLIB_FALSE=
+-fi
+ 
+  if $have_cairo_win32; then
+   HAVE_CAIRO_WIN32_TRUE=
+@@ -20118,13 +20093,8 @@
+   HAVE_CAIRO_WIN32_FALSE=
+ fi
+ 
+- if $have_cairo_freetype; then
+   HAVE_CAIRO_FREETYPE_TRUE=
+   HAVE_CAIRO_FREETYPE_FALSE='#'
+-else
+-  HAVE_CAIRO_FREETYPE_TRUE='#'
+-  HAVE_CAIRO_FREETYPE_FALSE=
+-fi
+ 
+  if $have_cairo_atsui; then
+   HAVE_CAIRO_ATSUI_TRUE=
-- 
2.26.2