From 2b533ddbbb578d9f9cbb3219adbe5f54a91cafcf Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Sun, 8 Oct 2006 14:55:15 +0000
Subject: Update Pango 1.13.x to 1.13.5

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@789 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../pango/pango-1.13.3/opentype-makefile.patch     | 20 ---------
 meta/packages/pango/pango_1.13.3.bb                | 49 ----------------------
 meta/packages/pango/pango_1.13.5.bb                | 49 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 69 deletions(-)
 delete mode 100644 meta/packages/pango/pango-1.13.3/opentype-makefile.patch
 delete mode 100644 meta/packages/pango/pango_1.13.3.bb
 create mode 100644 meta/packages/pango/pango_1.13.5.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
deleted file mode 100644
index 9f68420bc5..0000000000
--- a/meta/packages/pango/pango-1.13.3/opentype-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.13.3.bb b/meta/packages/pango/pango_1.13.3.bb
deleted file mode 100644
index de6346b1cb..0000000000
--- a/meta/packages/pango/pango_1.13.3.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 = "http://download.gnome.org/sources/pango/1.13/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.5.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.13.5.bb b/meta/packages/pango/pango_1.13.5.bb
new file mode 100644
index 0000000000..de6346b1cb
--- /dev/null
+++ b/meta/packages/pango/pango_1.13.5.bb
@@ -0,0 +1,49 @@
+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 = "http://download.gnome.org/sources/pango/1.13/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.5.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')
+}
-- 
cgit v1.2.3