[oe-commits] org.oe.dev sapwood: fixed packaging, recreated patch
hrw commit
openembedded-commits at lists.openembedded.org
Thu Mar 29 14:25:58 UTC 2007
sapwood: fixed packaging, recreated patch
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a5a1bb0dfcc9fe8ad8eb18505cdf8ccf37310788
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a5a1bb0dfcc9fe8ad8eb18505cdf8ccf37310788
Files:
1
packages/sapwood/sapwood/sockets.patch
packages/sapwood/sapwood_svn.bb
Diffs:
#
# mt diff -r0cd41ad0186a071b90d58836339c2b059e412f70 -ra5a1bb0dfcc9fe8ad8eb18505cdf8ccf37310788
#
#
#
# patch "packages/sapwood/sapwood/sockets.patch"
# from [285be4fc947a73d316888e618205d605290f6835]
# to [8185f1f44f2129305f3e94dc2498f2431bebcd55]
#
# patch "packages/sapwood/sapwood_svn.bb"
# from [8cb22d95e7a7b60822448c0eb2faa62a752d8728]
# to [cc41be25a17685b57c5adf0ea8e2998804c15199]
#
============================================================
--- packages/sapwood/sapwood/sockets.patch 285be4fc947a73d316888e618205d605290f6835
+++ packages/sapwood/sapwood/sockets.patch 8185f1f44f2129305f3e94dc2498f2431bebcd55
@@ -1,9 +1,12 @@
---- 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 @@
+Index: sapwood/configure.in
+===================================================================
+--- sapwood.orig/configure.in 2007-03-29 16:04:12.000000000 +0200
++++ sapwood/configure.in 2007-03-29 16:04:15.000000000 +0200
+@@ -13,63 +13,6 @@
+ AC_PROG_INSTALL
AC_PROG_MAKE_SET
- dnl abstract sockets namespace checks, from dbus
+-dnl abstract sockets namespace checks, from dbus
-AC_ARG_ENABLE(abstract-sockets,
- [AC_HELP_STRING([--enable-abstract-sockets],
- [use abstract socket namespace (linux only)])],
@@ -13,21 +16,12 @@
-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>
+-#include <sys/types.h>
+-#include <stdlib.h>
+-#include <stdio.h>
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <errno.h>
-]],
-[[
- int listen_fd;
@@ -68,46 +62,7 @@
-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])
+ fi
============================================================
--- packages/sapwood/sapwood_svn.bb 8cb22d95e7a7b60822448c0eb2faa62a752d8728
+++ packages/sapwood/sapwood_svn.bb cc41be25a17685b57c5adf0ea8e2998804c15199
@@ -1,9 +1,8 @@ LICENSE = "LGPL"
DESCRIPTION = "GTK theme engine Sapwood"
LICENSE = "LGPL"
-
DEPENDS = "gtk+"
-
PV = "2.43+svn${SRCDATE}"
+PR = "r1"
SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \
file://sockets.patch;patch=1 \
@@ -20,5 +19,5 @@ do_install_append () {
install -m755 ${S}/debian/sapwood-server.sh ${D}${sysconfdir}/osso-af-init/sapwood-server.sh
}
+FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libsapwood.so"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug/libsapwood.so"
-FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/engines/"
-
More information about the Openembedded-commits
mailing list