From: Jose V Beneyto <sepen@crux.nu>
Date: Mon, 25 Oct 2010 09:34:01 +0000 (+0200)
Subject: pango: updated to 1.24.5 and fixed issues with autofolks stuff. Also updated the... 
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=021b09a88088ef036945348a9901923bea28c446;p=attic%2Fports%2Fopt-cross.git

pango: updated to 1.24.5 and fixed issues with autofolks stuff. Also updated the pango.modules file
---

diff --git a/pango/.md5sum b/pango/.md5sum
index a9e192a..0e4459e 100644
--- a/pango/.md5sum
+++ b/pango/.md5sum
@@ -1,2 +1,3 @@
 815416a452e9cccc172fed9862401f37  pango-1.24.5.tar.bz2
-9012f52b08405b0a8a01948e3e68819d  pango.modules
+be8105a45ea143cae4d668fa11a0dd8d  pango.modules
+3e8045affcd2c466934d5fe1af42afaa  pangocairo.patch
diff --git a/pango/Pkgfile b/pango/Pkgfile
index 6f047b7..e5c82dd 100644
--- a/pango/Pkgfile
+++ b/pango/Pkgfile
@@ -5,13 +5,15 @@
 # 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)
+release=1
+source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.bz2 \
+        pango.modules pangocairo.patch)
 
 build () {
   cd $name-$version
 
+  patch -p0 -i $SRC/pangocairo.patch
+
   export DEFAULT_LIBS="-L$CLFS/usr/lib"
   export DEFAULT_CFLAGS="-I$CLFS/usr/include"
   export FONTCONFIG_LIBS="$DEFAULT_LIBS -lfontconfig"
@@ -22,14 +24,15 @@ build () {
   export XFT_CFLAGS="$DEFAULT_CFLAGS"
   export GLIB_LIBS="$DEFAULT_LIBS -lglib-2.0 -lgthread-2.0 -pthread -lrt -lgmodule-2.0 -Wl,--export-dynamic -lgio-2.0 -lgobject-2.0"
   export GLIB_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include" 
-  export CAIRO_LIBS="$DEFAULT_LIBS -lcairo"
-  export CAIRO_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/cairo"
+  export CAIRO_LIBS="$DEFAULT_LIBS -lcairo -lpng12"
+  export CAIRO_CFLAGS="$DEFAULT_CFLAGS -I$CLFS/usr/include/cairo -I$CLFS/usr/include/libpng12"
 
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr
 
   echo "#define HAVE_CAIRO 1" >> config.h
+  echo "#define HAVE_CAIRO_PNG 1" >> config.h
   echo "#define HAVE_CAIRO_FREETYPE 1" >> config.h
   echo "#define HAVE_CAIRO_XLIB 1" >> config.h
   echo "#define HAVE_X 1" >> config.h
diff --git a/pango/pango.modules b/pango/pango.modules
index bbb4754..1478e0c 100644
--- a/pango/pango.modules
+++ b/pango/pango.modules
@@ -3,24 +3,14 @@
 #
 # ModulesPath = /usr/lib/pango/1.6.0/modules
 #
+/usr/lib/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
 /usr/lib/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*
-/usr/lib/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
-/usr/lib/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*
+/usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*
+/usr/lib/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
 /usr/lib/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common:
-/usr/lib/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
-/usr/lib/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
-/usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
 /usr/lib/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common:
-/usr/lib/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
+/usr/lib/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*
+/usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
 /usr/lib/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
 /usr/lib/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
 /usr/lib/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
@@ -31,5 +21,15 @@
 /usr/lib/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
 /usr/lib/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
 /usr/lib/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
-/usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*
-/usr/lib/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
+/usr/lib/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
+/usr/lib/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
+/usr/lib/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
diff --git a/pango/pangocairo.patch b/pango/pangocairo.patch
new file mode 100644
index 0000000..4a95e04
--- /dev/null
+++ b/pango/pangocairo.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=