From 1489f00aacb737e2d2ea22ccf575b13148ba98e8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sun, 27 Aug 2006 23:04:35 +0000
Subject: pango: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@665 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../pango/pango-1.13.3/opentype-makefile.patch     | 20 +++++++++
 meta/packages/pango/pango_1.10.1.bb                | 49 ----------------------
 meta/packages/pango/pango_1.10.2.bb                | 47 +++++++++++++++++++++
 meta/packages/pango/pango_1.12.0.bb                |  4 +-
 4 files changed, 70 insertions(+), 50 deletions(-)
 create mode 100644 meta/packages/pango/pango-1.13.3/opentype-makefile.patch
 delete mode 100644 meta/packages/pango/pango_1.10.1.bb
 create mode 100644 meta/packages/pango/pango_1.10.2.bb

(limited to 'meta/packages')

diff --git a/meta/packages/pango/pango-1.13.3/opentype-makefile.patch b/meta/packages/pango/pango-1.13.3/opentype-makefile.patch
new file mode 100644
index 000000000..9f68420bc
--- /dev/null
+++ b/meta/packages/pango/pango-1.13.3/opentype-makefile.patch
@@ -0,0 +1,20 @@
+--- pango/opentype/Makefile.am~	2006-07-05 14:49:28.000000000 +0200
++++ pango/opentype/Makefile.am	2006-07-05 14:49:28.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ noinst_LTLIBRARIES = libharfbuzz-1.la
+ 
+-SOURCES =  \
++MAIN_SOURCES =  \
+ 	ftglue.c \
+ 	harfbuzz-buffer.c \
+ 	harfbuzz-dump.c \
+@@ -34,7 +34,7 @@
+ 	harfbuzz-open-private.h
+ 
+ libharfbuzz_1_la_SOURCES = \
+-	$(SOURCES) \
++	$(MAIN_SOURCES) \
+ 	$(PUBLICHEADERS) \
+ 	$(PRIVATEHEADERS)
+ 
diff --git a/meta/packages/pango/pango_1.10.1.bb b/meta/packages/pango/pango_1.10.1.bb
deleted file mode 100644
index 869b146d5..000000000
--- a/meta/packages/pango/pango_1.10.1.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-LICENSE = "LGPL"
-SECTION = "x11/libs"
-# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
-DESCRIPTION = "The goal of the Pango project is to provide an \
-Open Source framework for the layout and rendering of \
-internationalized text."
-PR = "r0"
-
-# seems to go wrong with default cflags
-FULL_OPTIMIZATION_arm = "-O2"
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest \
-		--enable-explicit-deps=no \
-	        --disable-debug"
-
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
-
-LIBV = "1.4.0"
-
-do_stage () {
-	for lib in pango pangox pangoft2 pangoxft pangocairo; do
-		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
-	done
-	install -d ${STAGING_INCDIR}/pango
-	install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
-}
-
-postinst_prologue() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-}
-
-PACKAGES_DYNAMIC = "pango-module-*"
-
-python populate_packages_prepend () {
-	prologue = bb.data.getVar("postinst_prologue", d, 1)
-
-	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
-
-	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
-}
diff --git a/meta/packages/pango/pango_1.10.2.bb b/meta/packages/pango/pango_1.10.2.bb
new file mode 100644
index 000000000..74730e18d
--- /dev/null
+++ b/meta/packages/pango/pango_1.10.2.bb
@@ -0,0 +1,47 @@
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+# Xt needed to keep autoconf's check for X11 happy
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
+DESCRIPTION = "The goal of the Pango project is to provide an \
+Open Source framework for the layout and rendering of \
+internationalized text."
+PR = "r0"
+
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+
+# seems to go wrong with default cflags
+FULL_OPTIMIZATION_arm = "-O2"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/pango-${PV}.tar.bz2 \
+	   file://no-tests.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest \
+		--enable-explicit-deps=no \
+	        --disable-debug"
+
+FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
+
+LIBV = "1.4.0"
+
+do_stage () {
+autotools_stage_all
+}
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+}
+
+PACKAGES_DYNAMIC = "pango-module-*"
+
+python populate_packages_prepend () {
+	prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
+}
diff --git a/meta/packages/pango/pango_1.12.0.bb b/meta/packages/pango/pango_1.12.0.bb
index e06e659b7..a28ef055d 100644
--- a/meta/packages/pango/pango_1.12.0.bb
+++ b/meta/packages/pango/pango_1.12.0.bb
@@ -1,12 +1,14 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
 PR = "r0"
 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
 
-- 
cgit v1.2.3