summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-moblin/packages/bickley/bickley_git.bb2
-rw-r--r--meta-moblin/packages/samba/files/tdbheaderfix.patch14
-rw-r--r--meta-moblin/packages/samba/samba_3.3.0.bb4
3 files changed, 17 insertions, 3 deletions
diff --git a/meta-moblin/packages/bickley/bickley_git.bb b/meta-moblin/packages/bickley/bickley_git.bb
index 3a2af260f..cdd89634f 100644
--- a/meta-moblin/packages/bickley/bickley_git.bb
+++ b/meta-moblin/packages/bickley/bickley_git.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "A meta data manager API and framework (including Media)"
SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
PV = "0.0+git${SRCREV}"
-PR = "r1"
+PR = "r2"
DEPENDS = "redland gtk+ dbus-glib clutter-gst-0.8 libexif taglib gupnp gupnp-av samba"
diff --git a/meta-moblin/packages/samba/files/tdbheaderfix.patch b/meta-moblin/packages/samba/files/tdbheaderfix.patch
new file mode 100644
index 000000000..e37c9b0d5
--- /dev/null
+++ b/meta-moblin/packages/samba/files/tdbheaderfix.patch
@@ -0,0 +1,14 @@
+Index: source/lib/tdb/include/tdb.h
+===================================================================
+--- source.orig/lib/tdb/include/tdb.h 2009-05-17 17:42:41.000000000 +0100
++++ source/lib/tdb/include/tdb.h 2009-05-17 17:42:46.000000000 +0100
+@@ -1,6 +1,9 @@
+ #ifndef __TDB_H__
+ #define __TDB_H__
+
++#include <signal.h>
++
++
+ /*
+ Unix SMB/CIFS implementation.
+
diff --git a/meta-moblin/packages/samba/samba_3.3.0.bb b/meta-moblin/packages/samba/samba_3.3.0.bb
index c561d9552..87a7c5e7f 100644
--- a/meta-moblin/packages/samba/samba_3.3.0.bb
+++ b/meta-moblin/packages/samba/samba_3.3.0.bb
@@ -11,9 +11,9 @@ DEFAULT_PREFERENCE = "-1"
SRC_URI += "file://configure-3.3.0.patch;patch=1 \
file://config-h.patch;patch=1 \
file://mtab.patch;patch=1 \
- "
+ file://tdbheaderfix.patch;patch=1 "
-PR = "r2"
+PR = "r3"
EXTRA_OECONF += "\
SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \