merge of '359cb2ede75783898c85d7b22cc9699eaf345d8a'

     and '81ad048dfdc6a3a80a0a2fa696910b31ad099b1d'

16 files changed, 194 insertions, 32 deletions

diff --git a/packages/alp/.mtn2git_empty b/packages/alp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alp/.mtn2git_empty
diff --git a/packages/alp/hiker_0.9.bb b/packages/alp/hiker_0.9.bb
new file mode 100644
index 0000000000..17e34efceb
--- /dev/null
+++ b/packages/alp/hiker_0.9.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Hiker Application Framework™"
+LICENSE = "MPL"
+
+DEPENDS = "gtk+ sqlite3 gnet dbus-glib"
+
+SRC_URI = "http://www.access-company.com/downloads/${P}.tar.gz"
+
+inherit autotools pkgconfig lib_package
+
+export CFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG" 
+export CXXFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG"
+
+do_configure_prepend() {
+	sed -i s:unittest::g utils/Makefile.am
+}
+
+PACKAGES =+ "libhiker libsqlfs"
+FILES_libhiker += "${libdir}/libhiker*.so.*"
+FILES_libsqlfs += "${libdir}/libsql*.so.*"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/cairo/cairo_1.3.8.bb b/packages/cairo/cairo.inc
index d9454fadcd..e405257dfb 100644
--- a/packages/cairo/cairo_1.3.8.bb
+++ b/packages/cairo/cairo.inc
@@ -1,14 +1,9 @@
-#This is a development snapshot, so lets hint OE to use the releases
-DEFAULT_PREFERENCE = "-1"
-
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
 
-SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
-
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 
 require cairo-fpu.inc
 EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}"
diff --git a/packages/cairo/cairo_1.3.10.bb b/packages/cairo/cairo_1.3.10.bb
new file mode 100644
index 0000000000..883884d15f
--- /dev/null
+++ b/packages/cairo/cairo_1.3.10.bb
@@ -0,0 +1,7 @@
+#This is a development snapshot, so lets hint OE to use the releases
+DEFAULT_PREFERENCE = "-1"
+
+require cairo.inc
+
+SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz"
+
diff --git a/packages/gnet/gnet_cvs.bb b/packages/gnet/gnet_cvs.bb
index 28b9f1e2e3..42a216f1db 100644
--- a/packages/gnet/gnet_cvs.bb
+++ b/packages/gnet/gnet_cvs.bb
@@ -12,3 +12,7 @@ S = "${WORKDIR}/gnet"
 EXTRA_OECONF =	"--disable-pthreads"
 
 inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}	
diff --git a/packages/libzvbi/libzvbi_0.2.24.bb b/packages/libzvbi/libzvbi_0.2.24.bb
new file mode 100644
index 0000000000..c14376387b
--- /dev/null
+++ b/packages/libzvbi/libzvbi_0.2.24.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "The Zapping VBI library, in short ZVBI, provides functions to \
+capture and decode VBI data. It is written in plain ANSI C with few dependencies \
+on other tools and libraries."
+HOMEPAGE = "http://zapping.sourceforge.net/ZVBI/index.html"
+LICENSE = "GPL"
+SECTION = "libs/multimedia"
+DEPENDS = "libpng"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2"
+S = "${WORKDIR}/zvbi-${PV}"
+
+EXTRA_OECONF = "--without-x"
+
+inherit autotools
+
+do_stage() {
+	autotools_stage_all
+}
+
+
diff --git a/packages/obsolete/tasks/.mtn2git_empty b/packages/obsolete/tasks/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/tasks/.mtn2git_empty
diff --git a/packages/tasks/task-bootstrap-unionroot.bb b/packages/obsolete/tasks/task-bootstrap-unionroot.bb
index e737e31608..e737e31608 100644
--- a/packages/tasks/task-bootstrap-unionroot.bb
+++ b/packages/obsolete/tasks/task-bootstrap-unionroot.bb
diff --git a/packages/tasks/task-bootstrap.bb b/packages/obsolete/tasks/task-bootstrap.bb
index d84f331102..d84f331102 100644
--- a/packages/tasks/task-bootstrap.bb
+++ b/packages/obsolete/tasks/task-bootstrap.bb
diff --git a/packages/tasks/task-bootstrap.inc b/packages/obsolete/tasks/task-bootstrap.inc
index 073da7055f..073da7055f 100644
--- a/packages/tasks/task-bootstrap.inc
+++ b/packages/obsolete/tasks/task-bootstrap.inc
diff --git a/packages/sapwood/.mtn2git_empty b/packages/sapwood/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sapwood/.mtn2git_empty
diff --git a/packages/sapwood/sapwood/.mtn2git_empty b/packages/sapwood/sapwood/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sapwood/sapwood/.mtn2git_empty
diff --git a/packages/sapwood/sapwood/sockets.patch b/packages/sapwood/sapwood/sockets.patch
new file mode 100644
index 0000000000..1568206e2a
--- /dev/null
+++ b/packages/sapwood/sapwood/sockets.patch
@@ -0,0 +1,113 @@
+--- configure.in.old	2005-06-10 17:04:52.000000000 +0200
++++ configure.in	2005-06-10 17:20:47.000000000 +0200
+@@ -13,61 +13,61 @@
+ AC_PROG_MAKE_SET
+ 
+ dnl abstract sockets namespace checks, from dbus
+-AC_ARG_ENABLE(abstract-sockets,
+-	      [AC_HELP_STRING([--enable-abstract-sockets],
+-			      [use abstract socket namespace (linux only)])],
+-	      [enable_abstract_sockets=$enableval],
+-	      [enable_abstract_sockets=auto])
+-
+-AC_MSG_CHECKING(abstract socket namespace)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-[[
++#AC_ARG_ENABLE(abstract-sockets,
++#	      [AC_HELP_STRING([--enable-abstract-sockets],
++#			      [use abstract socket namespace (linux only)])],
++#	      [enable_abstract_sockets=$enableval],
++#	      [enable_abstract_sockets=no])
++#
++#AC_MSG_CHECKING(abstract socket namespace)
++#AC_RUN_IFELSE([AC_LANG_PROGRAM(
++#[[
+ #include <sys/types.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <errno.h>
+-]],
+-[[
+-  int listen_fd;
+-  struct sockaddr_un addr;
+-
+-  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
+-
+-  if (listen_fd < 0)
+-    {
+-      fprintf (stderr, "socket() failed: %s\n", strerror (errno));
+-      exit (1);
+-    }
+-
+-  memset (&addr, '\0', sizeof (addr));
+-  addr.sun_family = AF_UNIX;
+-  strcpy (addr.sun_path, "X/tmp/sapwood-fake-socket-path-used-in-configure-test");
+-  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
+-
+-  if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
+-    {
+-      fprintf (stderr, "Abstract socket namespace bind() failed: %s\n",
+-               strerror (errno));
+-      exit (1);
+-    }
+-  else
+-    exit (0);
+-]])],
+-  [have_abstract_sockets=yes],
+-  [have_abstract_sockets=no])
+-AC_MSG_RESULT($have_abstract_sockets)
+-
+-if test x$enable_abstract_sockets = xyes; then
+-  if test x$have_abstract_sockets = xno; then
+-    AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.])
+-  fi
+-fi
+-
+-if test x$enable_abstract_sockets = xno; then
+-  have_abstract_sockets=no
+-fi
++#]],
++#[[
++#  int listen_fd;
++#  struct sockaddr_un addr;
++#
++#  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
++
++#  if (listen_fd < 0)
++#    {
++#      fprintf (stderr, "socket() failed: %s\n", strerror (errno));
++#      exit (1);
++#   }
++#
++#  memset (&addr, '\0', sizeof (addr));
++#  addr.sun_family = AF_UNIX;
++#  strcpy (addr.sun_path, "X/tmp/sapwood-fake-socket-path-used-in-configure-test");
++#  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
++#
++#  if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
++#    {
++#      fprintf (stderr, "Abstract socket namespace bind() failed: %s\n",
++#               strerror (errno));
++#      exit (1);
++#    }
++#  else
++#    exit (0);
++#]])],
++#  [have_abstract_sockets=no],
++#  [have_abstract_sockets=no])
++#AC_MSG_RESULT($have_abstract_sockets)
++
++#if test x$enable_abstract_sockets = xyes; then
++#  if test x$have_abstract_sockets = xno; then
++#    AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.])
++#  fi
++#fi
++
++#if test x$enable_abstract_sockets = xno; then
++have_abstract_sockets=no
++#fi
+ 
+ if test x$have_abstract_sockets = xyes; then
+   AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace])
diff --git a/packages/sapwood/sapwood_svn.bb b/packages/sapwood/sapwood_svn.bb
new file mode 100644
index 0000000000..11a26319de
--- /dev/null
+++ b/packages/sapwood/sapwood_svn.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "GTK theme engine Sapwood"
+LICENSE = "LGPL"
+
+DEPENDS = "gtk+"
+
+PV = "2.43+svn${SRCDATE}"
+
+SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \
+	   file://sockets.patch;patch=1 \
+	  " 
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-abstract-sockets=no"
+
+do_install_append () {
+        install -d ${D}${sysconfdir}/osso-af-init
+        install -m755 ${S}/debian/sapwood-server.sh  ${D}${sysconfdir}/osso-af-init/sapwood-server.sh
+}
+
+FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/engines/"
+
diff --git a/packages/tasks/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb
deleted file mode 100644
index 14397e288c..0000000000
--- a/packages/tasks/task-pivotboot.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Basic packages required for a pivot root image"
-PR = "r0"
-
-# The PIVOTBOOT_EXTRA_ variables are often manipulated by the
-# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-
-MODUTILS ?= "24 26"
-
-require task-bootstrap.inc
-
-HOTPLUG ?= "linux-hotplug"
-PIVOTBOOT_EXTRA_RDEPENDS ?= ""
-PIVOTBOOT_EXTRA_RRECOMMENDS ?= ""
-
-RDEPENDS = 'base-files base-passwd busybox \
-	netbase modutils-initscripts \
-	${HOTPLUG} \
-	${PIVOTBOOT_EXTRA_RDEPENDS} \
-	${@bootstrap_modutils_rdepends(d)}'
-
-RRECOMMENDS = '${PIVOTBOOT_EXTRA_RRECOMMENDS}'
-LICENSE = "MIT"
diff --git a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
index 98b49f99ac..051a9e5f63 100644
--- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/apps"
 LICENSE = "MIT-X"
 S="${WORKDIR}/mkfontscale-${PV}"
 
-DEPENDS = "libx11-native libfontenc-native"
+DEPENDS = "libx11-native libfontenc-native freetype-native"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2"