merge of '7dac8ac92aeba65ca1a74b6ff34b5bcfce5d6ee2'

     and '87682066586eade9fec532c4e17ea6c8b242428d'

72 files changed, 154 insertions, 7707 deletions

diff --git a/packages/gtk+/gtk+-2.10.10/.mtn2git_empty b/packages/glibc/eglibc-svn/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gtk+/gtk+-2.10.10/.mtn2git_empty
+++ b/packages/glibc/eglibc-svn/.mtn2git_empty
diff --git a/packages/glibc/eglibc-svn/export-fcntl2.patch b/packages/glibc/eglibc-svn/export-fcntl2.patch
new file mode 100644
index 0000000000..0bf6c57852
--- /dev/null
+++ b/packages/glibc/eglibc-svn/export-fcntl2.patch
@@ -0,0 +1,11 @@
+--- libc/io/Makefile.orig	2007-08-07 17:41:33.000000000 -0700
++++ libc/io/Makefile	2007-08-07 17:42:25.000000000 -0700
+@@ -23,7 +23,7 @@ subdir	:= io
+ 
+ headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \
+ 	   sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \
+-	   poll.h sys/poll.h bits/poll.h \
++	   poll.h sys/poll.h bits/poll.h bits/fcntl2.h \
+ 	   utime.h ftw.h fts.h sys/sendfile.h
+ 
+ routines :=								\
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index bf5023ca85..81d5916a21 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -1,10 +1,12 @@
 require glibc.inc
 
 DEFAULT_PREFERENCE = "-1"
-
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.6+svn${SRCDATE}"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
-          "
+           file://export-fcntl2.patch;patch=1 \
+           file://etc/ld.so.conf \
+           file://generate-supported.mk"
 S = "${WORKDIR}/trunk/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
@@ -83,5 +85,51 @@ do_compile () {
         ) 
 }       
 
+do_stage() {
+        rm -f ${STAGING_LIBDIR}/libc.so.6
+        oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
+                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+                   '${STAGING_LIBDIR}/libc.so.6' \
+                   install-headers install-lib
+
+        install -d ${STAGING_INCDIR}/gnu \
+                   ${STAGING_INCDIR}/bits \
+                   ${STAGING_INCDIR}/rpcsvc
+        install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+        install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+        install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+        for r in ${rpcsvc}; do
+                h=`echo $r|sed -e's,\.x$,.h,'`
+                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
+        done
+        for i in libc.a libc_pic.a libc_nonshared.a; do
+                install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+        done
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+
+        rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
+        oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
+                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
+                   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
+                   install-headers install-lib
+
+        install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
+                   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
+                   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
+        install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
+        install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
+        install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
+        for r in ${rpcsvc}; do
+                h=`echo $r|sed -e's,\.x$,.h,'`
+                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
+        done
+
+        for i in libc.a libc_pic.a libc_nonshared.a; do
+                install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
+        done
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
+}
 
 require glibc-package.bbclass
diff --git a/packages/gtk+/gtk+-2.10.10/automake-lossage.patch b/packages/gtk+/gtk+-2.10.10/automake-lossage.patch
deleted file mode 100644
index 0d423ddbb9..0000000000
--- a/packages/gtk+/gtk+-2.10.10/automake-lossage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gtk+-2.4.1/docs/tutorial/Makefile.am~	2003-05-06 22:54:20.000000000 +0100
-+++ gtk+-2.4.1/docs/tutorial/Makefile.am	2004-05-08 12:31:41.000000000 +0100
-@@ -52,21 +52,5 @@
- 
- dist-hook: html
- 	cp -Rp $(srcdir)/html $(distdir)
--else
--html:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--pdf:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "***"
--
--dist-hook:
--	echo "***"
--	echo "*** Warning: Tutorial not built"
--	echo "*** DISTRIBUTION IS INCOMPLETE"
--	echo "***"
- endif
- 
diff --git a/packages/gtk+/gtk+-2.10.10/disable-print.patch b/packages/gtk+/gtk+-2.10.10/disable-print.patch
deleted file mode 100644
index 1067773f12..0000000000
--- a/packages/gtk+/gtk+-2.10.10/disable-print.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtk+-2.10.0/configure.in~	2006-07-05 18:11:44.000000000 +0200
-+++ gtk+-2.10.0/configure.in	2006-07-05 18:11:44.000000000 +0200
-@@ -1539,26 +1539,27 @@
- # Printing system checks
- ################################################################
- 
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
--if test "x$CUPS_CONFIG" != "xno"; then
--  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
--  CUPS_LIBS=`cups-config --libs`
--
--  CUPS_API_VERSION=`cups-config --api-version`
--  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
--  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
--
--  if test $CUPS_API_MAJOR -gt 1 -o \
--          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
--    AC_DEFINE(HAVE_CUPS_API_1_2)
--  fi
--
--  AC_SUBST(CUPS_API_MAJOR)
--  AC_SUBST(CUPS_API_MINOR)
--  AC_SUBST(CUPS_CFLAGS)
--  AC_SUBST(CUPS_LIBS)
--fi
--AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+#AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-+#if test "x$CUPS_CONFIG" != "xno"; then
-+#  CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-+#  CUPS_LIBS=`cups-config --libs`
-+#
-+#  CUPS_API_VERSION=`cups-config --api-version`
-+#  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
-+#  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
-+#
-+#  if test $CUPS_API_MAJOR -gt 1 -o \
-+#          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
-+#   AC_DEFINE(HAVE_CUPS_API_1_2)
-+# fi
-+#
-+#  AC_SUBST(CUPS_API_MAJOR)
-+#  AC_SUBST(CUPS_API_MINOR)
-+#  AC_SUBST(CUPS_CFLAGS)
-+#  AC_SUBST(CUPS_LIBS)
-+#fi
-+#AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-+AM_CONDITIONAL(HAVE_CUPS,false)
- 
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
diff --git a/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch b/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch
deleted file mode 100644
index d71d839c3c..0000000000
--- a/packages/gtk+/gtk+-2.10.10/disable-tooltips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.4.3/gtk/gtktooltips.c.old	2004-07-04 18:52:04.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtktooltips.c	2004-07-04 18:52:08.000000000 +0100
-@@ -118,7 +118,7 @@
-   tooltips->tips_data_list = NULL;
-   
-   tooltips->delay = DEFAULT_DELAY;
--  tooltips->enabled = TRUE;
-+  tooltips->enabled = FALSE;
-   tooltips->timer_tag = 0;
-   tooltips->use_sticky_delay = FALSE;
-   tooltips->last_popdown.tv_sec = -1;
diff --git a/packages/gtk+/gtk+-2.10.10/gnome-bug-341177.patch b/packages/gtk+/gtk+-2.10.10/gnome-bug-341177.patch
deleted file mode 100644
index c31868462a..0000000000
--- a/packages/gtk+/gtk+-2.10.10/gnome-bug-341177.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -uprN gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c
---- gtk+-2.8.13.org/gdk-pixbuf/pixops/pixops.c	Tue Jul 12 18:58:57 2005
-+++ gtk+-2.8.13.INNER_LOOP/gdk-pixbuf/pixops/pixops.c	Tue May  9 17:30:53 2006
-@@ -71,35 +71,24 @@ get_check_shift (int check_size)
-   return check_shift;
- }
- 
--static void
--pixops_scale_nearest (guchar        *dest_buf,
--		      int            render_x0,
--		      int            render_y0,
--		      int            render_x1,
--		      int            render_y1,
--		      int            dest_rowstride,
--		      int            dest_channels,
--		      gboolean       dest_has_alpha,
--		      const guchar  *src_buf,
--		      int            src_width,
--		      int            src_height,
--		      int            src_rowstride,
--		      int            src_channels,
--		      gboolean       src_has_alpha,
--		      double         scale_x,
--		      double         scale_y)
--{
--  int i;
--  int x;
--  int x_step = (1 << SCALE_SHIFT) / scale_x;
--  int y_step = (1 << SCALE_SHIFT) / scale_y;
--  int xmax, xstart, xstop, x_pos, y_pos;
--  const guchar *p;
-+typedef struct { guchar a,b,c; } b3;
-+extern void BUG_bad_size_of_struct_b3(void);
- 
--#define INNER_LOOP(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)     \
-+#define INNER_LOOP_PREP()                                       \
-+    do {                                                        \
-+      x = render_x0 * x_step + x_step / 2;                      \
-       xmax = x + (render_x1 - render_x0) * x_step;              \
-       xstart = MIN (0, xmax);                                   \
-       xstop = MIN (src_width << SCALE_SHIFT, xmax);             \
-+    } while(0)
-+
-+#define INNER_LOOP_BODY(SRC_CHANNELS,DEST_CHANNELS,ASSIGN_PIXEL)\
-+    do {                                                        \
-+      y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT; \
-+      y_pos = CLAMP (y_pos, 0, src_height - 1);                 \
-+      src  = src_buf + y_pos * src_rowstride;                   \
-+      dest = dest_buf + i * dest_rowstride;                     \
-+      x = render_x0 * x_step + x_step / 2;                      \
-       p = src + (CLAMP (x, xstart, xstop) >> SCALE_SHIFT) * SRC_CHANNELS; \
-       while (x < xstart)                                        \
-         {                                                       \
-@@ -121,42 +110,58 @@ pixops_scale_nearest (guchar        *des
-           ASSIGN_PIXEL;                                         \
-           dest += DEST_CHANNELS;                                \
-           x += x_step;                                          \
--        }
-+        }                                                       \
-+    } while(0)
- 
--  for (i = 0; i < (render_y1 - render_y0); i++)
--    {
--      const guchar *src;
--      guchar       *dest;
--      y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
--      y_pos = CLAMP (y_pos, 0, src_height - 1);
--      src  = src_buf + y_pos * src_rowstride;
--      dest = dest_buf + i * dest_rowstride;
-+static void
-+pixops_scale_nearest (guchar        *dest_buf,
-+		      int            render_x0,
-+		      int            render_y0,
-+		      int            render_x1,
-+		      int            render_y1,
-+		      int            dest_rowstride,
-+		      int            dest_channels,
-+		      gboolean       dest_has_alpha,
-+		      const guchar  *src_buf,
-+		      int            src_width,
-+		      int            src_height,
-+		      int            src_rowstride,
-+		      int            src_channels,
-+		      gboolean       src_has_alpha,
-+		      double         scale_x,
-+		      double         scale_y)
-+{
-+  int i;
-+  int x;
-+  int x_step = (1 << SCALE_SHIFT) / scale_x;
-+  int y_step = (1 << SCALE_SHIFT) / scale_y;
-+  int xmax, xstart, xstop, x_pos, y_pos;
-+  const guchar *p;
- 
--      x = render_x0 * x_step + x_step / 2;
-+  const guchar *src;
-+  guchar       *dest;
- 
--      if (src_channels == 3)
--	{
--	  if (dest_channels == 3)
--	    {
--	      INNER_LOOP (3, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]);
--	    }
--	  else
--	    {
--	      INNER_LOOP (3, 4, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2];dest[3]=0xff);
--	    }
--	}
--      else if (src_channels == 4)
--	{
--	  if (dest_channels == 3)
--	    {
--	      INNER_LOOP (4, 3, dest[0]=p[0];dest[1]=p[1];dest[2]=p[2]);
--	    }
--	  else
--	    {
--	      guint32 *p32;
--	      INNER_LOOP(4, 4, p32=(guint32*)dest;*p32=*((guint32*)p));
--	    }
--	}
-+  if(sizeof(b3) != 3) BUG_bad_size_of_struct_b3();
-+
-+  INNER_LOOP_PREP();
-+
-+  if (src_channels == 3)
-+    {
-+      if (dest_channels == 3)
-+	for (i = 0; i < (render_y1 - render_y0); i++)
-+	  INNER_LOOP_BODY (3, 3, *(b3*)dest = *(b3*)p);
-+      else
-+	for (i = 0; i < (render_y1 - render_y0); i++)
-+	  INNER_LOOP_BODY (3, 4, (*(b3*)dest = *(b3*)p, dest[3]=0xff) );
-+    }
-+  else if (src_channels == 4)
-+    {
-+      if (dest_channels == 3)
-+	for (i = 0; i < (render_y1 - render_y0); i++)
-+	  INNER_LOOP_BODY (4, 3, *(b3*)dest = *(b3*)p);
-+      else
-+	for (i = 0; i < (render_y1 - render_y0); i++)
-+	  INNER_LOOP_BODY (4, 4, *(guint32*)dest = *((guint32*)p));
-     }
- }
- 
-@@ -187,18 +192,14 @@ pixops_composite_nearest (guchar        
-   const guchar *p;
-   unsigned int  a0;
- 
-+  INNER_LOOP_PREP();
-+
-   for (i = 0; i < (render_y1 - render_y0); i++)
-     {
-       const guchar *src;
-       guchar       *dest;
--      y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
--      y_pos = CLAMP (y_pos, 0, src_height - 1);
--      src  = src_buf + y_pos * src_rowstride;
--      dest = dest_buf + i * dest_rowstride;
--
--      x = render_x0 * x_step + x_step / 2;
-       
--      INNER_LOOP(src_channels, dest_channels,
-+      INNER_LOOP_BODY(src_channels, dest_channels,
- 	  if (src_has_alpha)
- 	    a0 = (p[3] * overall_alpha) / 0xff;
- 	  else
-@@ -209,9 +210,7 @@ pixops_composite_nearest (guchar        
-             case 0:
-               break;
-             case 255:
--              dest[0] = p[0];
--              dest[1] = p[1];
--              dest[2] = p[2];
-+              *(b3*)dest = *(b3*)p;
-               if (dest_has_alpha)
-                 dest[3] = 0xff;
-               break;
-@@ -279,17 +278,12 @@ pixops_composite_color_nearest (guchar  
-   const guchar *p;
-   unsigned int  a0;
- 
-+  INNER_LOOP_PREP();
-+
-   for (i = 0; i < (render_y1 - render_y0); i++)
-     {
-       const guchar *src;
-       guchar       *dest;
--      y_pos = ((i + render_y0) * y_step + y_step / 2) >> SCALE_SHIFT;
--      y_pos = CLAMP (y_pos, 0, src_height - 1);
--      src  = src_buf + y_pos * src_rowstride;
--      dest = dest_buf + i * dest_rowstride;
--