ofono: upgrade to 1.13

obsolete_automake_macros.patch and
missing-ssize_t.patch no longer needed,
included in upstream.
Better support for BlueZ5.

(From OE-Core rev: 50ea6d79fbbece279cda908ea768673de02a3d82)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

4 files changed, 11 insertions, 52 deletions

diff --git a/meta/recipes-connectivity/ofono/ofono-1.12/obsolete_automake_macros.patch b/meta/recipes-connectivity/ofono/ofono-1.12/obsolete_automake_macros.patch
deleted file mode 100644
index 31a102e0ca..0000000000
--- a/meta/recipes-connectivity/ofono/ofono-1.12/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Submitted [ofono@ofono.org]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd ofono-1.12/configure.ac ofono-1.12/configure.ac
---- ofono-1.12/configure.ac     2012-12-19 21:28:44.000000000 +0200
-+++ ofono-1.12/configure.ac     2013-01-12 11:18:40.681410757 +0200
-@@ -2,7 +2,7 @@
- AC_INIT(ofono, 1.12)
-
- AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/meta/recipes-connectivity/ofono/ofono/missing-ssize_t.patch b/meta/recipes-connectivity/ofono/ofono/missing-ssize_t.patch
deleted file mode 100644
index 71903c47da..0000000000
--- a/meta/recipes-connectivity/ofono/ofono/missing-ssize_t.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-include unistd.h for getting ssize_t definitions
-Fixes errors like
-
-| In file included from src/sms.c:38:0:
-| src/storage.h:32:1: error: unknown type name 'ssize_t'
-| src/storage.h:36:1: error: unknown type name 'ssize_t'
-
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: ofono-1.12/src/storage.h
-===================================================================
---- ofono-1.12.org/src/storage.h        2013-01-04 10:01:24.137804178 -0800
-+++ ofono-1.12/src/storage.h    2013-01-04 10:02:09.325806426 -0800
-@@ -26,6 +26,7 @@
- #endif
- 
- #include <fcntl.h>
-+#include <unistd.h>
- 
- int create_dirs(const char *filename, const mode_t mode);
- 
diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb
deleted file mode 100644
index ad524a0418..0000000000
--- a/meta/recipes-connectivity/ofono/ofono_1.12.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require ofono.inc
-
-SRC_URI  = "\
-  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
-  file://ofono \
-  file://missing-ssize_t.patch \
-  file://obsolete_automake_macros.patch \
-"
-
-PR = "r2"
-
-SRC_URI[md5sum] = "aa8924c0e8de3ec7ac5e41fe7df4cb99"
-SRC_URI[sha256sum] = "733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b3ef751"
-
-CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.13.bb b/meta/recipes-connectivity/ofono/ofono_1.13.bb
new file mode 100644
index 0000000000..7a7e65c77c
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono_1.13.bb
@@ -0,0 +1,11 @@
+require ofono.inc
+
+SRC_URI  = "\
+  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+  file://ofono \
+"
+
+SRC_URI[md5sum] = "78112668d8444bc28d4b3359efd866f6"
+SRC_URI[sha256sum] = "3329c0af1e672777122981dfb9728b2c517f30f9d1b997e08e6177eb0109f0d3"
+
+CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"