merge of '359cb2ede75783898c85d7b22cc9699eaf345d8a'

     and '81ad048dfdc6a3a80a0a2fa696910b31ad099b1d'

4 files changed, 137 insertions, 0 deletions

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/"
+