pango: use pango.inc from oe-core

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

4 files changed, 7 insertions, 149 deletions

diff --git a/meta-oe/recipes-graphics/pango/pango.inc b/meta-oe/recipes-graphics/pango/pango.inc
deleted file mode 100644
index 341d0e3e2..000000000
--- a/meta-oe/recipes-graphics/pango/pango.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "The goal of the Pango project is to provide an \
-Open Source framework for the layout and rendering of \
-internationalized text."
-LICENSE = "LGPL"
-
-inherit gnome
-EXTRA_AUTORECONF = ""
-
-SECTION = "x11/libs"
-
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc cairo"
-
-DEPENDS_virtclass-native = "glib-2.0-native cairo-native"
-BBCLASSEXTEND = "native"
-
-PACKAGES_DYNAMIC = "pango-module-*"
-PACKAGES_DYNAMIC_virtclass-native = ""
-
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
-
-INC_PR = "r2"
-
-# seems to go wrong with default cflags
-FULL_OPTIMIZATION_arm = "-O2"
-
-SRC_URI += "file://no-tests.patch \
-           "
-
-EXTRA_OECONF += "--disable-glibtest \
-                 --enable-explicit-deps=no \
-                 --disable-debug"
-
-LEAD_SONAME = "libpango-1.0*"
-LIBV = "1.6.0"
-
-FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
-FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
-FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
-
-postinst_prologue() {
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-}
-
-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-oe/recipes-graphics/pango/pango/no-tests.patch b/meta-oe/recipes-graphics/pango/pango/no-tests.patch
deleted file mode 100644
index b38212612..000000000
--- a/meta-oe/recipes-graphics/pango/pango/no-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- pango-1.2.5/Makefile.am~no-tests    2003-01-30 22:43:47.000000000 +0100
-+++ pango-1.2.5/Makefile.am     2004-03-11 11:31:25.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
- 
--SUBDIRS= pango modules examples docs tools tests
-+SUBDIRS= pango modules examples docs tools 
- 
- EXTRA_DIST =           \
-        pango.pc.in     \
diff --git a/meta-oe/recipes-graphics/pango/pango/pkgconfig_fixes.patch b/meta-oe/recipes-graphics/pango/pango/pkgconfig_fixes.patch
deleted file mode 100644
index f021591a9..000000000
--- a/meta-oe/recipes-graphics/pango/pango/pkgconfig_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-oe/recipes-graphics/pango/pango_1.29.4.bb b/meta-oe/recipes-graphics/pango/pango_1.29.4.bb
index 70f881502..65c402837 100644
--- a/meta-oe/recipes-graphics/pango/pango_1.29.4.bb
+++ b/meta-oe/recipes-graphics/pango/pango_1.29.4.bb
@@ -1,9 +1,14 @@
-require pango.inc
+require recipes-graphics/pango/pango.inc
+
+BBCLASSEXTEND = "native"
+DEPENDS_virtclass-native = "glib-2.0-native cairo-native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
 
 SRC_URI[archive.md5sum] = "a5ee785f4f31d6bdd8625a09ea3f8b4b"
 SRC_URI[archive.sha256sum] = "f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b"
 
-PR = "${INC_PR}.1"
+SRC_URI += "file://no-tests.patch"
+
+PR = "r3"