From 8075bb569d908755dfa2fa9739387c34b5c51ef1 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Mon, 12 Nov 2007 19:51:08 +0000
Subject: Upgrade pango from 1.8.1 to 1.8.3

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3135 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../pango/pango-1.18.1/configure_fixes.patch       | 79 ----------------------
 meta/packages/pango/pango-1.18.1/no-tests.patch    | 10 ---
 .../pango/pango-1.18.3/configure_fixes.patch       | 79 ++++++++++++++++++++++
 meta/packages/pango/pango-1.18.3/no-tests.patch    | 10 +++
 meta/packages/pango/pango_1.18.1.bb                |  2 -
 meta/packages/pango/pango_1.18.3.bb                |  1 +
 6 files changed, 90 insertions(+), 91 deletions(-)
 delete mode 100644 meta/packages/pango/pango-1.18.1/configure_fixes.patch
 delete mode 100644 meta/packages/pango/pango-1.18.1/no-tests.patch
 create mode 100644 meta/packages/pango/pango-1.18.3/configure_fixes.patch
 create mode 100644 meta/packages/pango/pango-1.18.3/no-tests.patch
 delete mode 100644 meta/packages/pango/pango_1.18.1.bb
 create mode 100644 meta/packages/pango/pango_1.18.3.bb

(limited to 'meta/packages')

diff --git a/meta/packages/pango/pango-1.18.1/configure_fixes.patch b/meta/packages/pango/pango-1.18.1/configure_fixes.patch
deleted file mode 100644
index f021591a9..000000000
--- a/meta/packages/pango/pango-1.18.1/configure_fixes.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: pango-1.18.1/configure.in
-===================================================================
---- pango-1.18.1.orig/configure.in	2007-08-28 00:29:54.000000000 +0000
-+++ pango-1.18.1/configure.in	2007-11-12 19:21:22.000000000 +0000
-@@ -226,13 +226,9 @@
-   #
-   # Checks for FreeType
-   #
--  FREETYPE_LIBS=
--  FREETYPE_CFLAGS=
--  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
--  if test "x$FREETYPE_CONFIG" != "xno" ; then
--    FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
--    FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
-+  PKG_CHECK_MODULES(FREETYPE, freetype2 >= 1.0.1, have_freetype=true, AC_MSG_RESULT([no]))
- 
-+  if $have_freetype ; then
-     pango_save_ldflags=$LDFLAGS
-     LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-     AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
-Index: pango-1.18.1/pangoft2-uninstalled.pc.in
-===================================================================
---- pango-1.18.1.orig/pangoft2-uninstalled.pc.in	2007-07-05 21:30:28.000000000 +0000
-+++ pango-1.18.1/pangoft2-uninstalled.pc.in	2007-11-12 19:23:44.000000000 +0000
-@@ -1,7 +1,7 @@
- Name: Pango FT2 Uninstalled
- Description: Freetype 2.0 font support for Pango, Not Installed
- Version: @VERSION@
--Requires: pango
--Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la @FREETYPE_LIBS@
--Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@
-+Requires: pango freetype2
-+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la
-+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
- 
-Index: pango-1.18.1/pangoft2.pc.in
-===================================================================
---- pango-1.18.1.orig/pangoft2.pc.in	2007-07-05 21:30:28.000000000 +0000
-+++ pango-1.18.1/pangoft2.pc.in	2007-11-12 19:27:05.000000000 +0000
-@@ -6,7 +6,7 @@
- Name: Pango FT2
- Description: Freetype 2.0 font support for Pango
- Version: @VERSION@
--Requires: pango
--Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
--Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
-+Requires: pango freetype2 fontconfig
-+Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@
-+Cflags: -I${includedir}/pango-1.0
- 
-Index: pango-1.18.1/pangoxft-uninstalled.pc.in
-===================================================================
---- pango-1.18.1.orig/pangoxft-uninstalled.pc.in	2007-07-05 21:30:28.000000000 +0000
-+++ pango-1.18.1/pangoxft-uninstalled.pc.in	2007-11-12 19:22:24.000000000 +0000
-@@ -1,7 +1,7 @@
- Name: Pango Xft Uninstalled
- Description: Xft font support for Pango, Not Installed
- Version: @VERSION@
--Requires: pango
--Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @XFT_LIBS@
--Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@
-+Requires: pango xft
-+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la
-+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@
- 
-Index: pango-1.18.1/pangoxft.pc.in
-===================================================================
---- pango-1.18.1.orig/pangoxft.pc.in	2007-07-05 21:30:28.000000000 +0000
-+++ pango-1.18.1/pangoxft.pc.in	2007-11-12 19:21:57.000000000 +0000
-@@ -6,6 +6,6 @@
- Name: Pango Xft
- Description: Xft font support for Pango
- Version: @VERSION@
--Requires: pango pangoft2
--Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
--Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@
-+Requires: pango pangoft2 xft
-+Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@
-+Cflags: -I${includedir}/pango-1.0
diff --git a/meta/packages/pango/pango-1.18.1/no-tests.patch b/meta/packages/pango/pango-1.18.1/no-tests.patch
deleted file mode 100644
index dafcb20c3..000000000
--- a/meta/packages/pango/pango-1.18.1/no-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /tmp/Makefile.am	2007-03-01 13:29:37.000000000 +0100
-+++ pango-1.16.0/Makefile.am	2007-03-01 13:29:52.545251000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
- 
--SUBDIRS= pango modules pango-view examples docs tools tests
-+SUBDIRS= pango modules pango-view examples docs tools 
- 
- EXTRA_DIST = 			\
- 	autogen.sh		\
diff --git a/meta/packages/pango/pango-1.18.3/configure_fixes.patch b/meta/packages/pango/pango-1.18.3/configure_fixes.patch
new file mode 100644
index 000000000..f021591a9
--- /dev/null
+++ b/meta/packages/pango/pango-1.18.3/configure_fixes.patch
@@ -0,0 +1,79 @@
+Index: pango-1.18.1/configure.in
+===================================================================
+--- pango-1.18.1.orig/configure.in	2007-08-28 00:29:54.000000000 +0000
++++ pango-1.18.1/configure.in	2007-11-12 19:21:22.000000000 +0000
+@@ -226,13 +226,9 @@
+   #
+   # Checks for FreeType
+   #
+-  FREETYPE_LIBS=
+-  FREETYPE_CFLAGS=
+-  AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-  if test "x$FREETYPE_CONFIG" != "xno" ; then
+-    FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-    FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
++  PKG_CHECK_MODULES(FREETYPE, freetype2 >= 1.0.1, have_freetype=true, AC_MSG_RESULT([no]))
+ 
++  if $have_freetype ; then
+     pango_save_ldflags=$LDFLAGS
+     LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+     AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
+Index: pango-1.18.1/pangoft2-uninstalled.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoft2-uninstalled.pc.in	2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoft2-uninstalled.pc.in	2007-11-12 19:23:44.000000000 +0000
+@@ -1,7 +1,7 @@
+ Name: Pango FT2 Uninstalled
+ Description: Freetype 2.0 font support for Pango, Not Installed
+ Version: @VERSION@
+-Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la @FREETYPE_LIBS@
+-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@
++Requires: pango freetype2
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
+ 
+Index: pango-1.18.1/pangoft2.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoft2.pc.in	2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoft2.pc.in	2007-11-12 19:27:05.000000000 +0000
+@@ -6,7 +6,7 @@
+ Name: Pango FT2
+ Description: Freetype 2.0 font support for Pango
+ Version: @VERSION@
+-Requires: pango
+-Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
+-Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
++Requires: pango freetype2 fontconfig
++Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@
++Cflags: -I${includedir}/pango-1.0
+ 
+Index: pango-1.18.1/pangoxft-uninstalled.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoxft-uninstalled.pc.in	2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoxft-uninstalled.pc.in	2007-11-12 19:22:24.000000000 +0000
+@@ -1,7 +1,7 @@
+ Name: Pango Xft Uninstalled
+ Description: Xft font support for Pango, Not Installed
+ Version: @VERSION@
+-Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @XFT_LIBS@
+-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@
++Requires: pango xft
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@
+ 
+Index: pango-1.18.1/pangoxft.pc.in
+===================================================================
+--- pango-1.18.1.orig/pangoxft.pc.in	2007-07-05 21:30:28.000000000 +0000
++++ pango-1.18.1/pangoxft.pc.in	2007-11-12 19:21:57.000000000 +0000
+@@ -6,6 +6,6 @@
+ Name: Pango Xft
+ Description: Xft font support for Pango
+ Version: @VERSION@
+-Requires: pango pangoft2
+-Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
+-Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@
++Requires: pango pangoft2 xft
++Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@
++Cflags: -I${includedir}/pango-1.0
diff --git a/meta/packages/pango/pango-1.18.3/no-tests.patch b/meta/packages/pango/pango-1.18.3/no-tests.patch
new file mode 100644
index 000000000..dafcb20c3
--- /dev/null
+++ b/meta/packages/pango/pango-1.18.3/no-tests.patch
@@ -0,0 +1,10 @@
+--- /tmp/Makefile.am	2007-03-01 13:29:37.000000000 +0100
++++ pango-1.16.0/Makefile.am	2007-03-01 13:29:52.545251000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+ 
+-SUBDIRS= pango modules pango-view examples docs tools tests
++SUBDIRS= pango modules pango-view examples docs tools 
+ 
+ EXTRA_DIST = 			\
+ 	autogen.sh		\
diff --git a/meta/packages/pango/pango_1.18.1.bb b/meta/packages/pango/pango_1.18.1.bb
deleted file mode 100644
index c89174b34..000000000
--- a/meta/packages/pango/pango_1.18.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require pango.inc
-PR = "r1"
diff --git a/meta/packages/pango/pango_1.18.3.bb b/meta/packages/pango/pango_1.18.3.bb
new file mode 100644
index 000000000..8e3e8e7d3
--- /dev/null
+++ b/meta/packages/pango/pango_1.18.3.bb
@@ -0,0 +1 @@
+require pango.inc
-- 
cgit v1.2.3