Add glib-2.0 2.1.3, and fix the pango 1.2.5 build.

BKrev: 3fe2236csD7efLWjkT13A_G1S_GwDA

diff --git a/glib-2.0/glib-2.0-native_2.0.7.oe b/glib-2.0/glib-2.0-2.1.3/configure.patch
similarity index 100%
rename from glib-2.0/glib-2.0-native_2.0.7.oe
rename to glib-2.0/glib-2.0-2.1.3/configure.patch

diff --git a/glib-2.0/glib-2.0-native_2.1.3.oe b/glib-2.0/glib-2.0-native_2.1.3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-2.0/glib-2.0_2.0.7.oe b/glib-2.0/glib-2.0_2.0.7.oe
deleted file mode 100644 (file)
index 18ef5b0..0000000
--- a/glib-2.0/glib-2.0_2.0.7.oe
+++ /dev/null
@@ -1,47 +0,0 @@
-DEPENDS = virtual/libc glib-2.0-native
-RDEPENDS = libc6
-
-SRC_URI = http://ftp.gnome.org/pub/gnome/sources/glib/2.0/glib-${PV}.tar.bz2 \
-         file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/glib-${PV}
-
-inherit autotools libtool pkgconfig
-
-acpaths=
-do_configure_prepend () {
-       install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h .
-}
-
-SOV=0.0.7
-do_stage () {
-       install -m 0755 glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/libglib-2.0.so.${SOV}
-       install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la
-       install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a
-       install -m 0755 gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/libgmodule-2.0.so.${SOV}
-       install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la
-       install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a
-       install -m 0755 gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/libgthread-2.0.so.${SOV}
-       install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la
-       install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a
-       install -m 0755 gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/libgobject-2.0.so.${SOV}
-       install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la
-       install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a
-       ln -sf libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/libglib-2.0.so.0
-       ln -sf libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/libglib-2.0.so
-       ln -sf libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/libgmodule-2.0.so.0
-       ln -sf libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/libgmodule-2.0.so
-       ln -sf libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/libgthread-2.0.so.0
-       ln -sf libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/libgthread-2.0.so
-       ln -sf libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/libgobject-2.0.so.0
-       ln -sf libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/libgobject-2.0.so
-       ln -sf libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/libglib-2.0.so.0
-       ln -sf libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/libglib-2.0.so
-       install -d ${STAGING_INCDIR}/glib-2.0/glib
-       install -d ${STAGING_INCDIR}/glib-2.0/gobject
-       install -m 0755 glib/glib.h ${STAGING_INCDIR}/glib-2.0/glib.h
-       install -m 0755 glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
-       cp -f glib/*.h ${STAGING_INCDIR}/glib-2.0/glib/
-       cp -f gobject/*.h ${STAGING_INCDIR}/glib-2.0/gobject/
-       cp -f gmodule/*.h ${STAGING_INCDIR}/glib-2.0/
-       cp -f gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/
-}

diff --git a/glib-2.0/glib-2.0_2.1.3.oe b/glib-2.0/glib-2.0_2.1.3.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/nonworking/pango/pango-1.2.5/ft2.patch b/nonworking/pango/pango-1.2.5/ft2.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/nonworking/pango/pango_1.2.5.oe b/nonworking/pango/pango_1.2.5.oe
index e69de29..971cf6c 100644 (file)
--- a/nonworking/pango/pango_1.2.5.oe
+++ b/nonworking/pango/pango_1.2.5.oe
@@ -0,0 +1,43 @@
+DEPENDS = virtual/libc glib-2.0 fontconfig freetype zlib x11-cvs xft-cvs xproto-cvs
+
+SRC_URI = http://ftp.gnome.org/pub/gnome/sources/pango/1.2/pango-${PV}.tar.bz2 \
+         file://${FILESDIR}/ft2.patch;patch=1
+
+inherit autotools libtool
+
+EXTRA_OECONF = '--disable-glibtest \
+               --enable-explicit-deps=no'
+
+FILES_${PN}-doc:=${FILES_pango-doc} ${datadir}/gtk-doc
+
+do_compile_prepend () {
+       (cd tests && \
+       /bin/sh ${S}/libtool --silent --mode=link ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR}/glib-2.0 -lglib-2.0 gen-all-unicode.c -o gen-all-unicode && \
+       touch gen-all-unicode.c .libs/gen-all-unicde gen-all-unicode gen-all-unicode.o)
+}
+
+SOV=0.200.5
+do_stage () {
+       install -m 0755 pango/.libs/libpangoft2-1.0.so.${SOV} ${STAGING_LIBDIR}/
+       install -m 0755 pango/.libs/libpangoft2-1.0.lai ${STAGING_LIBDIR}/libpangoft2-1.0.la
+       install -m 0755 pango/.libs/libpangoft2-1.0.a ${STAGING_LIBDIR}/
+       install -m 0755 pango/.libs/libpangox-1.0.so.${SOV} ${STAGING_LIBDIR}/
+       install -m 0755 pango/.libs/libpangox-1.0.lai ${STAGING_LIBDIR}/libpangox-1.0.la
+       install -m 0755 pango/.libs/libpangox-1.0.a ${STAGING_LIBDIR}/
+       install -m 0755 pango/.libs/libpangoxft-1.0.so.${SOV} ${STAGING_LIBDIR}/
+       install -m 0755 pango/.libs/libpangoxft-1.0.lai ${STAGING_LIBDIR}/libpangoxft-1.0.la
+       install -m 0755 pango/.libs/libpangoxft-1.0.a ${STAGING_LIBDIR}/
+       install -m 0755 pango/.libs/libpango-1.0.so.${SOV} ${STAGING_LIBDIR}/
+       install -m 0755 pango/.libs/libpango-1.0.lai ${STAGING_LIBDIR}/libpango-1.0.la
+       install -m 0755 pango/.libs/libpango-1.0.a ${STAGING_LIBDIR}/
+       ln -sf libpango-1.0.so.${SOV} ${STAGING_LIBDIR}/libpango-1.0.so.0
+       ln -sf libpango-1.0.so.${SOV} ${STAGING_LIBDIR}/libpango-1.0.so
+       ln -sf libpangox-1.0.so.${SOV} ${STAGING_LIBDIR}/libpangox-1.0.so.0
+       ln -sf libpangox-1.0.so.${SOV} ${STAGING_LIBDIR}/libpangox-1.0.so
+       ln -sf libpangoxft-1.0.so.${SOV} ${STAGING_LIBDIR}/libpangoxft-1.0.so.0
+       ln -sf libpangoxft-1.0.so.${SOV} ${STAGING_LIBDIR}/libpangoxft-1.0.so
+       ln -sf libpangoft2-1.0.so.${SOV} ${STAGING_LIBDIR}/libpangoft2-1.0.so.0
+       ln -sf libpangoft2-1.0.so.${SOV} ${STAGING_LIBDIR}/libpangoft2-1.0.so
+       install -d ${STAGING_INCDIR}/pango
+       install -m 0644 pango/pango*.h ${STAGING_INCDIR}/pango/
+}