import clean BK tree at cset 1.3670

15 files changed, 683 insertions, 0 deletions

diff --git a/packages/glib-2.0/.mtn2git_empty b/packages/glib-2.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/.mtn2git_empty
diff --git a/packages/glib-2.0/files/.mtn2git_empty b/packages/glib-2.0/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/files/.mtn2git_empty
diff --git a/packages/glib-2.0/files/glib-gettextize-dir.patch b/packages/glib-2.0/files/glib-gettextize-dir.patch
index e69de29bb2..989211c927 100644
--- a/packages/glib-2.0/files/glib-gettextize-dir.patch
+++ b/packages/glib-2.0/files/glib-gettextize-dir.patch
@@ -0,0 +1,11 @@
+--- glib-2.6.2/glib-gettextize.in.old	2005-02-15 02:43:17.000000000 +0000
++++ glib-2.6.2/glib-gettextize.in	2005-02-15 02:43:18.000000000 +0000
+@@ -43,7 +43,7 @@
+ 
+ # Directory where the sources are stored.
+ prefix=@prefix@
+-gettext_dir=@prefix@/share/glib-2.0/gettext
++gettext_dir=@datadir@/glib-2.0/gettext
+ 
+ while test $# -gt 0; do
+   case "$1" in
diff --git a/packages/glib-2.0/files/glibconfig-sysdefs.h b/packages/glib-2.0/files/glibconfig-sysdefs.h
index e69de29bb2..1329e7f21c 100644
--- a/packages/glib-2.0/files/glibconfig-sysdefs.h
+++ b/packages/glib-2.0/files/glibconfig-sysdefs.h
@@ -0,0 +1,6 @@
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32
diff --git a/packages/glib-2.0/files/glibinclude.patch b/packages/glib-2.0/files/glibinclude.patch
index e69de29bb2..5413e50e00 100644
--- a/packages/glib-2.0/files/glibinclude.patch
+++ b/packages/glib-2.0/files/glibinclude.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- glib-2.0-2.4.6-r1/glib-2.4.6/glib/Makefile.am~glibinclude.patch
++++ glib-2.0-2.4.6-r1/glib-2.4.6/glib/Makefile.am
+@@ -157,8 +157,8 @@
+ 	gprintf.h
+ 
+ install-data-local: install-ms-lib install-libtool-import-lib
+-	@if test -f $(glibincludedir)/glist.h ; then					\
+-	  echo "*** Old headers found in $(glibincludedir). You should remove the" ;	\
++	@if test -f $(DESTDIR)$(glibincludedir)/glist.h ; then					\
++	  echo "*** Old headers found in $(DESTDIR)$(glibincludedir). You should remove the" ;	\
+ 	  echo "*** contents of this directory and type 'make install' again." ;	\
+ 	  false ;									\
+         fi
diff --git a/packages/glib-2.0/files/gtk-doc.patch b/packages/glib-2.0/files/gtk-doc.patch
index e69de29bb2..4b9c234e21 100644
--- a/packages/glib-2.0/files/gtk-doc.patch
+++ b/packages/glib-2.0/files/gtk-doc.patch
@@ -0,0 +1,59 @@
+--- glib/acinclude.m4	2004-05-08 11:14:46.000000000 +0100
++++ glib/acinclude.m4	2004-05-08 11:14:55.000000000 +0100
+@@ -446,3 +446,56 @@
+ ])
+ 
+ 
++dnl -*- mode: autoconf -*-
++
++# serial 1
++
++dnl Usage:
++dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
++AC_DEFUN([GTK_DOC_CHECK],
++[
++  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++  dnl for overriding the documentation installation directory
++  AC_ARG_WITH(html-dir,
++    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++    [with_html_dir='${datadir}/gtk-doc/html'])
++  HTML_DIR="$with_html_dir"
++  AC_SUBST(HTML_DIR)
++
++  dnl enable/disable documentation building
++  AC_ARG_ENABLE(gtk-doc,
++    AC_HELP_STRING([--enable-gtk-doc],
++                   [use gtk-doc to build documentation [default=no]]),,
++    enable_gtk_doc=no)
++
++  have_gtk_doc=no
++  if test -z "$PKG_CONFIG"; then
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++  fi
++  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
++    have_gtk_doc=yes
++  fi
++
++  dnl do we want to do a version check?
++ifelse([$1],[],,
++  [gtk_doc_min_version=$1
++  if test "$have_gtk_doc" = yes; then
++    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
++    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
++      AC_MSG_RESULT(yes)
++    else
++      AC_MSG_RESULT(no)
++      have_gtk_doc=no
++    fi
++  fi
++])
++  if test x$enable_gtk_doc = xyes; then
++    if test "$have_gtk_doc" != yes; then
++      enable_gtk_doc=no
++    fi
++  fi
++
++  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
++  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
++])
diff --git a/packages/glib-2.0/glib-2.0-2.2.3/.mtn2git_empty b/packages/glib-2.0/glib-2.0-2.2.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-2.2.3/.mtn2git_empty
diff --git a/packages/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch b/packages/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch
index e69de29bb2..02e9b5f25e 100644
--- a/packages/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch
+++ b/packages/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch
@@ -0,0 +1,43 @@
+--- glib-2.2.3/gobject/Makefile.am.old	2004-03-06 20:48:33.000000000 +0000
++++ glib-2.2.3/gobject/Makefile.am	2004-03-06 20:50:58.000000000 +0000
+@@ -87,7 +87,7 @@
+ gobject_private_h_sources = @STRIP_BEGIN@ \
+ @STRIP_END@
+ # GObject library C sources to build the library from
+-gobject_c_sources = @STRIP_BEGIN@ \
++gobject_c_sources =  \
+ 	gboxed.c		\
+ 	gclosure.c		\
+ 	genums.c		\
+@@ -102,8 +102,7 @@
+ 	gvalue.c		\
+ 	gvaluearray.c		\
+ 	gvaluetransform.c	\
+-	gvaluetypes.c		\
+-@STRIP_END@
++	gvaluetypes.c
+ 
+ # we use our own built_sources variable rules to avoid automake's
+ # BUILT_SOURCES oddities
+@@ -135,9 +134,9 @@
+ #
+ gobject_target_headers = $(gobject_public_h_sources) $(gobject_built_public_sources)
+ gobject_target_sources = $(gobject_c_sources)
+-MAINTAINERCLEANFILES += $(gobject_built_sources)
+-EXTRA_HEADERS +=
+-EXTRA_DIST += $(gobject_private_h_sources) $(gobject_extra_sources)
++MAINTAINERCLEANFILES = $(gobject_built_sources)
++EXTRA_HEADERS =
++EXTRA_DIST = $(gobject_private_h_sources) $(gobject_extra_sources)
+ EXTRA_DIST += $(gobject_built_sources)
+ 
+ #
+@@ -145,7 +144,7 @@
+ #
+ # setup autogeneration dependancies
+ gen_sources = xgen-gmh xgen-gmc xgen-gms
+-CLEANFILES += $(gen_sources)
++CLEANFILES = $(gen_sources)
+ 
+ $(libgobject_2_0_la_OBJECTS): $(gobject_built_sources)  ${gobject_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
+ # initial creation of the real stamp-* files
diff --git a/packages/glib-2.0/glib-2.0-2.2.3/configure.patch b/packages/glib-2.0/glib-2.0-2.2.3/configure.patch
index e69de29bb2..f6a04e34c5 100644
--- a/packages/glib-2.0/glib-2.0-2.2.3/configure.patch
+++ b/packages/glib-2.0/glib-2.0-2.2.3/configure.patch
@@ -0,0 +1,174 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- glib-2.1.3/configure.in~configure
++++ glib-2.1.3/configure.in
+@@ -15,7 +15,9 @@
+ cflags_set=${CFLAGS+set}
+ 
+ # we rewrite this file
++if "x$cross_compiling" != xyes; then
+ rm -f glibconfig-sysdefs.h
++fi
+ 
+ GLIB_AC_DIVERT_BEFORE_HELP([
+ #
+@@ -402,10 +404,13 @@
+   fi
+ fi
+ 
++AC_CHECK_LIBM
++LIBS="$LIBS $LIBM"
++
+ dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
+ AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
+ glib_save_LIBS=$LIBS
+-LIBS="$LIBS -lm"
++#LIBS="$LIBS -lm"
+ AC_TRY_RUN([#include <math.h>
+              int main (void) { return (log(1) != log(1.)); }],
+      AC_MSG_RESULT(none needed),
+@@ -417,8 +422,10 @@
+          AC_MSG_RESULT()
+          CFLAGS=$glib_save_CFLAGS
+          AC_MSG_WARN(
+-                [No ANSI prototypes found in library. (-std1 didn't work.)])
+-     )
++		[No ANSI prototypes found in library. (-std1 didn't work.)]),
++	 AC_MSG_RESULT()
++      ),
++      AC_MSG_RESULT([assuming none needed])
+ )
+ LIBS=$glib_save_LIBS
+ 
+@@ -844,18 +851,18 @@
+ dnl *** strlcpy/strlcat                  ***
+ dnl ****************************************
+ # Check for strlcpy
+-AC_MSG_CHECKING(for OpenBSD strlcpy/strlcat)
+-AC_TRY_RUN([
+-#include <string.h>
+-int main() {
+-  char *p = malloc (10);
+-  (void) strlcpy (p, "hi", 10);
+-  if (strlcat (p, "bye", 0) != 3) 
+-    exit (1);
+-  return 0;
+-}], glib_ok=yes, glib_ok=no)
+-AC_MSG_RESULT($glib_ok)
+-if test "$glib_ok" = "yes"; then
++AC_CACHE_CHECK([for OpenBSD strlcpy/strlcat],[glib_cv_strlcpy],
++	AC_TRY_RUN([
++	#include <string.h>
++	int main() {
++	  char *p = malloc (10);
++	  (void) strlcpy (p, "hi", 10);
++	  if (strlcat (p, "bye", 0) != 3) 
++	    exit (1);
++	  return 0;
++	}], glib_cv_strlcpy=yes, glib_cv_strlcpy=no)
++)
++if test "x$glib_cv_strlcpy" = xyes; then
+     AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat])
+ fi
+   
+@@ -1302,16 +1309,15 @@
+     for flag in pthread pthreads; do
+       glib_save_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -$flag"
+-      AC_TRY_RUN([#include <pthread.h> 
++      AC_TRY_LINK([#include <pthread.h>],[
+ 	          int check_me = 0;
+ 		  void* func(void* data) {return check_me = 42;}
+-		  main()
+-		  { pthread_t t; 
++		    pthread_t t; 
+ 		    void *ret;
+ 		    pthread_create (&t, 0, func, 0);
+ 		    pthread_join (t, &ret);
+ 		    exit (check_me != 42 || ret != 42);
+-		   }],
++		   ],
+ 		   [G_THREAD_CFLAGS=-$flag
+ 		    G_THREAD_LIBS=-$flag])
+       CFLAGS="$glib_save_CFLAGS"
+@@ -1431,16 +1437,15 @@
+ 			LIBS="$glib_save_LIBS $add_thread_lib"
+ 			
+ 			AC_MSG_CHECKING(for pthread_create/pthread_join$IN)
+-			AC_TRY_RUN([#include <pthread.h> 
++			AC_TRY_LINK([#include <pthread.h>],[ 
+ 				int check_me = 0;
+ 				void* func(void* data) {check_me = 42;}
+-                                main()
+-				{ pthread_t t; 
++				  pthread_t t; 
+ 				  void *ret;
+ 				  pthread_create (&t, $defattr, func, 0);
+ 				  pthread_join (t, &ret);
+ 				  exit (check_me != 42);
+-				}],
++				],
+ 				[AC_MSG_RESULT(yes)
+ 				G_THREAD_LIBS="$add_thread_lib"
+ 				break],
+@@ -1466,12 +1471,11 @@
+ 	    LIBS="$glib_save_LIBS $add_thread_lib"
+ 	
+             AC_MSG_CHECKING(for sched_get_priority_min$IN)
+-	    AC_TRY_RUN([#include <sched.h>
+-		        #include <errno.h>
+-		        int main() {
++	    AC_TRY_LINK([#include <sched.h>
++		        #include <errno.h>],[
+     			  errno = 0;
+                           return sched_get_priority_min(SCHED_OTHER)==-1
+-			 	&& errno != 0;}],
++			 	&& errno != 0;],
+ 	 		[AC_MSG_RESULT(yes)
+ 		 	 G_THREAD_LIBS="$G_THREAD_LIBS $add_thread_lib"
+ 			 posix_priority_min="sched_get_priority_min(SCHED_OTHER)"
+@@ -1636,7 +1640,8 @@
+ 		AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func,[The POSIX RT yield function])
+ 		CPPFLAGS="$glib_save_CPPFLAGS"
+ 
+-		AC_MSG_CHECKING(whether to use the PID niceness surrogate for thread priorities)
++		AC_CACHE_CHECK([whether to use the PID niceness surrogate for thread priorities],
++		[glib_cv_sys_use_pid_niceness_surrogate],
+ 		AC_TRY_RUN([#include <pthread.h> 
+ 			#include <sys/types.h>
+ 			#include <unistd.h>
+@@ -1651,10 +1656,12 @@
+ 			  exit (getpid()==other_pid || 
+ 				$posix_priority_min != $posix_priority_max);
+ 			}],
+-			[AC_MSG_RESULT(yes)
+-			  AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, [whether to use the PID niceness surrogate for thread priorities])
+-                        ],
+-			[AC_MSG_RESULT(no)])
++			[ glib_cv_sys_use_pid_niceness_surrogate=yes ],
++			[ glib_cv_sys_use_pid_niceness_surrogate=no ])
++		)
++		if test x"$glib_cv_sys_use_pid_niceness_surrogate" = xyes; then
++			AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, [whether to use the PID niceness surrogate for thread priorities])
++		fi
+ 	elif test x"$have_threads" = xwin32; then
+ 		# It's a pointer to a private struct
+ 		GLIB_SIZEOF(,struct _GThreadData *, system_thread)
+@@ -1717,12 +1724,14 @@
+ dnl ****************************************
+ dnl *** GLib POLL* compatibility defines ***
+ dnl ****************************************
++if test x"$cross_compiling" != xyes; then
+ GLIB_SYSDEFS(
+ [#include <sys/types.h>
+ #include <sys/poll.h>],
+ 	POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
+ 	glibconfig-sysdefs.h,
+ 	=)
++fi
+ 
+ dnl **********************
+ dnl *** Win32 API libs ***
diff --git a/packages/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h b/packages/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h
index e69de29bb2..1329e7f21c 100644
--- a/packages/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h
+++ b/packages/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h
@@ -0,0 +1,6 @@
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32
diff --git a/packages/glib-2.0/glib-2.0_2.2.3.bb b/packages/glib-2.0/glib-2.0_2.2.3.bb
index e69de29bb2..65cba086e9 100644
--- a/packages/glib-2.0/glib-2.0_2.2.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.2.3.bb
@@ -0,0 +1,105 @@
+LICENSE = LGPL
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0-native"
+DEPENDS += "virtual/libiconv virtual/libintl"
+
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \
+           file://automake-lossage.patch;patch=1 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools  pkgconfig gettext
+
+python () {
+	if bb.data.getVar("USE_NLS", d, 1) == "no":
+		raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h
+	install -m 0644 ${S}/glib/glib.h ${STAGING_INCDIR}/glib-2.0/glib.h
+	install -m 0644 ${S}/gmodule/gmodule.h ${STAGING_INCDIR}/glib-2.0/gmodule.h
+	install -m 0644 ${S}/glib/galloca.h ${STAGING_INCDIR}/glib-2.0/glib/galloca.h
+	install -m 0644 ${S}/glib/garray.h ${STAGING_INCDIR}/glib-2.0/glib/garray.h
+	install -m 0644 ${S}/glib/gasyncqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gasyncqueue.h
+	install -m 0644 ${S}/glib/gbacktrace.h ${STAGING_INCDIR}/glib-2.0/glib/gbacktrace.h
+	install -m 0644 ${S}/glib/gcache.h ${STAGING_INCDIR}/glib-2.0/glib/gcache.h
+	install -m 0644 ${S}/glib/gcompletion.h ${STAGING_INCDIR}/glib-2.0/glib/gcompletion.h
+	install -m 0644 ${S}/glib/gconvert.h ${STAGING_INCDIR}/glib-2.0/glib/gconvert.h
+	install -m 0644 ${S}/glib/gdataset.h ${STAGING_INCDIR}/glib-2.0/glib/gdataset.h
+	install -m 0644 ${S}/glib/gdate.h ${STAGING_INCDIR}/glib-2.0/glib/gdate.h
+	install -m 0644 ${S}/glib/gdir.h ${STAGING_INCDIR}/glib-2.0/glib/gdir.h
+	install -m 0644 ${S}/glib/gerror.h ${STAGING_INCDIR}/glib-2.0/glib/gerror.h
+	install -m 0644 ${S}/glib/gfileutils.h ${STAGING_INCDIR}/glib-2.0/glib/gfileutils.h
+	install -m 0644 ${S}/glib/ghash.h ${STAGING_INCDIR}/glib-2.0/glib/ghash.h
+	install -m 0644 ${S}/glib/ghook.h ${STAGING_INCDIR}/glib-2.0/glib/ghook.h
+	install -m 0644 ${S}/glib/giochannel.h ${STAGING_INCDIR}/glib-2.0/glib/giochannel.h
+	install -m 0644 ${S}/glib/glist.h ${STAGING_INCDIR}/glib-2.0/glib/glist.h
+	install -m 0644 ${S}/glib/gmacros.h ${STAGING_INCDIR}/glib-2.0/glib/gmacros.h
+	install -m 0644 ${S}/glib/gmain.h ${STAGING_INCDIR}/glib-2.0/glib/gmain.h
+	install -m 0644 ${S}/glib/gmarkup.h ${STAGING_INCDIR}/glib-2.0/glib/gmarkup.h
+	install -m 0644 ${S}/glib/gmem.h ${STAGING_INCDIR}/glib-2.0/glib/gmem.h
+	install -m 0644 ${S}/glib/gmessages.h ${STAGING_INCDIR}/glib-2.0/glib/gmessages.h
+	install -m 0644 ${S}/glib/gnode.h ${STAGING_INCDIR}/glib-2.0/glib/gnode.h
+	install -m 0644 ${S}/glib/gpattern.h ${STAGING_INCDIR}/glib-2.0/glib/gpattern.h
+	install -m 0644 ${S}/glib/gprimes.h ${STAGING_INCDIR}/glib-2.0/glib/gprimes.h
+	install -m 0644 ${S}/glib/gqsort.h ${STAGING_INCDIR}/glib-2.0/glib/gqsort.h
+	install -m 0644 ${S}/glib/gquark.h ${STAGING_INCDIR}/glib-2.0/glib/gquark.h
+	install -m 0644 ${S}/glib/gqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gqueue.h
+	install -m 0644 ${S}/glib/grand.h ${STAGING_INCDIR}/glib-2.0/glib/grand.h
+	install -m 0644 ${S}/glib/grel.h ${STAGING_INCDIR}/glib-2.0/glib/grel.h
+	install -m 0644 ${S}/glib/gscanner.h ${STAGING_INCDIR}/glib-2.0/glib/gscanner.h
+	install -m 0644 ${S}/glib/gshell.h ${STAGING_INCDIR}/glib-2.0/glib/gshell.h
+	install -m 0644 ${S}/glib/gslist.h ${STAGING_INCDIR}/glib-2.0/glib/gslist.h
+	install -m 0644 ${S}/glib/gspawn.h ${STAGING_INCDIR}/glib-2.0/glib/gspawn.h
+	install -m 0644 ${S}/glib/gstrfuncs.h ${STAGING_INCDIR}/glib-2.0/glib/gstrfuncs.h
+	install -m 0644 ${S}/glib/gstring.h ${STAGING_INCDIR}/glib-2.0/glib/gstring.h
+	install -m 0644 ${S}/glib/gthread.h ${STAGING_INCDIR}/glib-2.0/glib/gthread.h
+	install -m 0644 ${S}/glib/gthreadpool.h ${STAGING_INCDIR}/glib-2.0/glib/gthreadpool.h
+	install -m 0644 ${S}/glib/gtimer.h ${STAGING_INCDIR}/glib-2.0/glib/gtimer.h
+	install -m 0644 ${S}/glib/gtree.h ${STAGING_INCDIR}/glib-2.0/glib/gtree.h
+	install -m 0644 ${S}/glib/gtypes.h ${STAGING_INCDIR}/glib-2.0/glib/gtypes.h
+	install -m 0644 ${S}/glib/gunicode.h ${STAGING_INCDIR}/glib-2.0/glib/gunicode.h
+	install -m 0644 ${S}/glib/gutils.h ${STAGING_INCDIR}/glib-2.0/glib/gutils.h
+	install -m 0644 ${S}/glib/gwin32.h ${STAGING_INCDIR}/glib-2.0/glib/gwin32.h
+	install -m 0644 ${S}/glib/gprintf.h ${STAGING_INCDIR}/glib-2.0/glib/gprintf.h
+	install -d ${STAGING_INCDIR}/glib-2.0/gobject
+	install -m 0644 ${S}/gobject/gboxed.h ${STAGING_INCDIR}/glib-2.0/gobject/gboxed.h
+	install -m 0644 ${S}/gobject/gclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gclosure.h
+	install -m 0644 ${S}/gobject/genums.h ${STAGING_INCDIR}/glib-2.0/gobject/genums.h
+	install -m 0644 ${S}/gobject/gobject.h ${STAGING_INCDIR}/glib-2.0/gobject/gobject.h
+	install -m 0644 ${S}/gobject/gparam.h ${STAGING_INCDIR}/glib-2.0/gobject/gparam.h
+	install -m 0644 ${S}/gobject/gparamspecs.h ${STAGING_INCDIR}/glib-2.0/gobject/gparamspecs.h
+	install -m 0644 ${S}/gobject/gsignal.h ${STAGING_INCDIR}/glib-2.0/gobject/gsignal.h
+	install -m 0644 ${S}/gobject/gsourceclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gsourceclosure.h
+	install -m 0644 ${S}/gobject/gtype.h ${STAGING_INCDIR}/glib-2.0/gobject/gtype.h
+	install -m 0644 ${S}/gobject/gtypemodule.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypemodule.h
+	install -m 0644 ${S}/gobject/gtypeplugin.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypeplugin.h
+	install -m 0644 ${S}/gobject/gvalue.h ${STAGING_INCDIR}/glib-2.0/gobject/gvalue.h
+	install -m 0644 ${S}/gobject/gvaluearray.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluearray.h
+	install -m 0644 ${S}/gobject/gvaluecollector.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluecollector.h
+	install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h
+	install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c
+	install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/glib-2.0/glib-2.0_2.4.5.bb b/packages/glib-2.0/glib-2.0_2.4.5.bb
index e69de29bb2..11a6c2a2d1 100644
--- a/packages/glib-2.0/glib-2.0_2.4.5.bb
+++ b/packages/glib-2.0/glib-2.0_2.4.5.bb
@@ -0,0 +1,114 @@
+LICENSE = LGPL
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0-native"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \
+           file://gtk-doc.patch;patch=1 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+python () {
+	if bb.data.getVar("USE_NLS", d, 1) == "no":
+		raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h
+	install -m 0644 ${S}/glib/glib.h ${STAGING_INCDIR}/glib-2.0/glib.h
+	install -m 0644 ${S}/gmodule/gmodule.h ${STAGING_INCDIR}/glib-2.0/gmodule.h
+	install -m 0644 ${S}/glib/galloca.h ${STAGING_INCDIR}/glib-2.0/glib/galloca.h
+	install -m 0644 ${S}/glib/gatomic.h ${STAGING_INCDIR}/glib-2.0/glib/gatomic.h
+	install -m 0644 ${S}/glib/garray.h ${STAGING_INCDIR}/glib-2.0/glib/garray.h
+	install -m 0644 ${S}/glib/gasyncqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gasyncqueue.h
+	install -m 0644 ${S}/glib/gbacktrace.h ${STAGING_INCDIR}/glib-2.0/glib/gbacktrace.h
+	install -m 0644 ${S}/glib/gcache.h ${STAGING_INCDIR}/glib-2.0/glib/gcache.h
+	install -m 0644 ${S}/glib/gcompletion.h ${STAGING_INCDIR}/glib-2.0/glib/gcompletion.h
+	install -m 0644 ${S}/glib/gconvert.h ${STAGING_INCDIR}/glib-2.0/glib/gconvert.h
+	install -m 0644 ${S}/glib/gdataset.h ${STAGING_INCDIR}/glib-2.0/glib/gdataset.h
+	install -m 0644 ${S}/glib/gdate.h ${STAGING_INCDIR}/glib-2.0/glib/gdate.h
+	install -m 0644 ${S}/glib/gdir.h ${STAGING_INCDIR}/glib-2.0/glib/gdir.h
+	install -m 0644 ${S}/glib/gerror.h ${STAGING_INCDIR}/glib-2.0/glib/gerror.h
+	install -m 0644 ${S}/glib/gfileutils.h ${STAGING_INCDIR}/glib-2.0/glib/gfileutils.h
+	install -m 0644 ${S}/glib/ghash.h ${STAGING_INCDIR}/glib-2.0/glib/ghash.h
+	install -m 0644 ${S}/glib/ghook.h ${STAGING_INCDIR}/glib-2.0/glib/ghook.h
+	install -m 0644 ${S}/glib/giochannel.h ${STAGING_INCDIR}/glib-2.0/glib/giochannel.h
+	install -m 0644 ${S}/glib/glist.h ${STAGING_INCDIR}/glib-2.0/glib/glist.h
+	install -m 0644 ${S}/glib/gmacros.h ${STAGING_INCDIR}/glib-2.0/glib/gmacros.h
+	install -m 0644 ${S}/glib/gmain.h ${STAGING_INCDIR}/glib-2.0/glib/gmain.h
+	install -m 0644 ${S}/glib/gmarkup.h ${STAGING_INCDIR}/glib-2.0/glib/gmarkup.h
+	install -m 0644 ${S}/glib/gmem.h ${STAGING_INCDIR}/glib-2.0/glib/gmem.h
+	install -m 0644 ${S}/glib/gmessages.h ${STAGING_INCDIR}/glib-2.0/glib/gmessages.h
+	install -m 0644 ${S}/glib/gnode.h ${STAGING_INCDIR}/glib-2.0/glib/gnode.h
+	install -m 0644 ${S}/glib/gpattern.h ${STAGING_INCDIR}/glib-2.0/glib/gpattern.h
+	install -m 0644 ${S}/glib/gprimes.h ${STAGING_INCDIR}/glib-2.0/glib/gprimes.h
+	install -m 0644 ${S}/glib/gqsort.h ${STAGING_INCDIR}/glib-2.0/glib/gqsort.h
+	install -m 0644 ${S}/glib/gquark.h ${STAGING_INCDIR}/glib-2.0/glib/gquark.h
+	install -m 0644 ${S}/glib/gqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gqueue.h
+	install -m 0644 ${S}/glib/grand.h ${STAGING_INCDIR}/glib-2.0/glib/grand.h
+	install -m 0644 ${S}/glib/grel.h ${STAGING_INCDIR}/glib-2.0/glib/grel.h
+	install -m 0644 ${S}/glib/gscanner.h ${STAGING_INCDIR}/glib-2.0/glib/gscanner.h
+	install -m 0644 ${S}/glib/gshell.h ${STAGING_INCDIR}/glib-2.0/glib/gshell.h
+	install -m 0644 ${S}/glib/gslist.h ${STAGING_INCDIR}/glib-2.0/glib/gslist.h
+	install -m 0644 ${S}/glib/gspawn.h ${STAGING_INCDIR}/glib-2.0/glib/gspawn.h
+	install -m 0644 ${S}/glib/gstrfuncs.h ${STAGING_INCDIR}/glib-2.0/glib/gstrfuncs.h
+	install -m 0644 ${S}/glib/gstring.h ${STAGING_INCDIR}/glib-2.0/glib/gstring.h
+	install -m 0644 ${S}/glib/gthread.h ${STAGING_INCDIR}/glib-2.0/glib/gthread.h
+	install -m 0644 ${S}/glib/gthreadpool.h ${STAGING_INCDIR}/glib-2.0/glib/gthreadpool.h
+	install -m 0644 ${S}/glib/gtimer.h ${STAGING_INCDIR}/glib-2.0/glib/gtimer.h
+	install -m 0644 ${S}/glib/gtree.h ${STAGING_INCDIR}/glib-2.0/glib/gtree.h
+	install -m 0644 ${S}/glib/gtypes.h ${STAGING_INCDIR}/glib-2.0/glib/gtypes.h
+	install -m 0644 ${S}/glib/gunicode.h ${STAGING_INCDIR}/glib-2.0/glib/gunicode.h
+	install -m 0644 ${S}/glib/gutils.h ${STAGING_INCDIR}/glib-2.0/glib/gutils.h
+	install -m 0644 ${S}/glib/gwin32.h ${STAGING_INCDIR}/glib-2.0/glib/gwin32.h
+	install -m 0644 ${S}/glib/gprintf.h ${STAGING_INCDIR}/glib-2.0/glib/gprintf.h
+	install -m 0644 ${S}/glib/gi18n.h ${STAGING_INCDIR}/glib-2.0/glib/gi18n.h
+	install -d ${STAGING_INCDIR}/glib-2.0/gobject
+	install -m 0644 ${S}/gobject/gboxed.h ${STAGING_INCDIR}/glib-2.0/gobject/gboxed.h
+	install -m 0644 ${S}/gobject/gclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gclosure.h
+	install -m 0644 ${S}/gobject/genums.h ${STAGING_INCDIR}/glib-2.0/gobject/genums.h
+	install -m 0644 ${S}/gobject/gobject.h ${STAGING_INCDIR}/glib-2.0/gobject/gobject.h
+	install -m 0644 ${S}/gobject/gparam.h ${STAGING_INCDIR}/glib-2.0/gobject/gparam.h
+	install -m 0644 ${S}/gobject/gparamspecs.h ${STAGING_INCDIR}/glib-2.0/gobject/gparamspecs.h
+	install -m 0644 ${S}/gobject/gsignal.h ${STAGING_INCDIR}/glib-2.0/gobject/gsignal.h
+	install -m 0644 ${S}/gobject/gsourceclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gsourceclosure.h
+	install -m 0644 ${S}/gobject/gtype.h ${STAGING_INCDIR}/glib-2.0/gobject/gtype.h
+	install -m 0644 ${S}/gobject/gtypemodule.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypemodule.h
+	install -m 0644 ${S}/gobject/gtypeplugin.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypeplugin.h
+	install -m 0644 ${S}/gobject/gvalue.h ${STAGING_INCDIR}/glib-2.0/gobject/gvalue.h
+	install -m 0644 ${S}/gobject/gvaluearray.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluearray.h
+	install -m 0644 ${S}/gobject/gvaluecollector.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluecollector.h
+	install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h
+	install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c
+	install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}
diff --git a/packages/glib-2.0/glib-2.0_2.6.2.bb b/packages/glib-2.0/glib-2.0_2.6.2.bb
index e69de29bb2..2765cc0a63 100644
--- a/packages/glib-2.0/glib-2.0_2.6.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.2.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+PR = "r0"
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
+           file://glibinclude.patch;patch=1;pnum=2 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+python () {
+	if bb.data.getVar("USE_NLS", d, 1) == "no":
+		raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+	autotools_stage_includes
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}
diff --git a/packages/glib-2.0/glib-2.0_2.6.3.bb b/packages/glib-2.0/glib-2.0_2.6.3.bb
index e69de29bb2..2765cc0a63 100644
--- a/packages/glib-2.0/glib-2.0_2.6.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.3.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+PR = "r0"
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
+           file://glibinclude.patch;patch=1;pnum=2 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+python () {
+	if bb.data.getVar("USE_NLS", d, 1) == "no":
+		raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+	autotools_stage_includes
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}
diff --git a/packages/glib-2.0/glib-2.0_2.6.4.bb b/packages/glib-2.0/glib-2.0_2.6.4.bb
index e69de29bb2..2765cc0a63 100644
--- a/packages/glib-2.0/glib-2.0_2.6.4.bb
+++ b/packages/glib-2.0/glib-2.0_2.6.4.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS += "glib-2.0-native gtk-doc"
+DEPENDS += "virtual/libiconv virtual/libintl"
+PACKAGES =+ "glib-2.0-utils "
+PR = "r0"
+
+LEAD_SONAME = "libglib-2.0.*"
+FILES_glib-2.0-utils = "${bindir}/*"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \
+           file://glibinclude.patch;patch=1;pnum=2 \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig gettext
+
+python () {
+	if bb.data.getVar("USE_NLS", d, 1) == "no":
+		raise bb.parse.SkipPackage("${PN} requires native language support.")
+}
+
+acpaths = ""
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+	autotools_stage_includes
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+}