add phoned to Odello image

Change-Id: I0f9bcb3785b9ccedd2eb448aa77544a924a9c93a
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/recipes-image/packagegroups/packagegroups-ivi-Modello.bb b/recipes-image/packagegroups/packagegroups-ivi-Modello.bb
index 335c802..f8d229d 100644 (file)
--- a/recipes-image/packagegroups/packagegroups-ivi-Modello.bb
+++ b/recipes-image/packagegroups/packagegroups-ivi-Modello.bb
@@ -9,7 +9,6 @@ PACKAGES = "\
             "
 
 # Modello modules
-# To add: "Modello-Phone"
 RDEPENDS_packagegroup-tizen-ivi-modello = " \
                                             Modello-Installer-xwalk \ 
                                             Modello-AMBSimulator \
@@ -21,4 +20,5 @@ RDEPENDS_packagegroup-tizen-ivi-modello = " \
                                             Modello-Multimediaplayer \
                                             Modello-Nav \
                                             Modello-SDL \
+                                            Modello-Phone \
                                             "

diff --git a/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc b/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc
index fc0bf2e..7611d37 100644 (file)
--- a/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc
+++ b/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc
@@ -8,14 +8,37 @@ export BUILD_SYS
 export STAGING_LIBDIR
 export STAGING_INCDIR
 
+export B="${S}"
+
 #DEPENDS += "gobject-introspection"
 #gtk-doc-stub?
 
 # -ldb needs this on some platforms
 LDFLAGS += "-lpthread"
 
+EXTRA_OECONF += "--with-libdb=${STAGING_DIR_HOST}${prefix}"
+
 # Parallel make shows many issues with this source code.
 # Current problems seem to be duplicate execution of the calander/backends
 # directories by make resulting in truncated/corrupt .la files
 #PARALLEL_MAKE = ""
 
+do_compile_prepend() {
+    cp ${WORKDIR}/iconv-detect.h ${S}
+}
+
+
+do_install_append() {
+    rm -fr ${D}/usr/share/help
+}
+
+SRC_URI = " \
+    file://iconv-detect.h \
+    file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
+"
+
+FILES_${PN}-dbg += "/usr/lib/evolution-data-server/calendar-backends/.debug"
+FILES_${PN}-dbg += "/usr/lib/evolution-data-server/camel-providers/.debug"
+FILES_${PN}-dbg += "/usr/lib/evolution-data-server/registry-modules/.debug"
+FILES_${PN}-dbg += "/usr/lib/evolution-data-server/addressbook-backends/.debug"
+FILES_${PN}-dbg += "/usr/libexec/evolution-data-server/.debug"
\ No newline at end of file

diff --git a/recipes-tizen/evolution-data-server/evolution-data-server.inc b/recipes-tizen/evolution-data-server/evolution-data-server.inc
index c462551..74c48ee 100644 (file)
--- a/recipes-tizen/evolution-data-server/evolution-data-server.inc
+++ b/recipes-tizen/evolution-data-server/evolution-data-server.inc
@@ -12,17 +12,9 @@ inherit autotools-brokensep
 BBCLASSEXTEND = ""
 PROVIDES = ""
 
-#PROVIDES by typelib-EBook
-PROVIDES += "typelib-EBook"
-
-
 #PROVIDES by evolution-data-server
 
 
-#PROVIDES by typelib-EDataServer
-PROVIDES += "typelib-EDataServer"
-
-
 #PROVIDES by libedataserver
 PROVIDES += "libedataserver"
 
@@ -43,10 +35,6 @@ PROVIDES += "libedata-cal"
 PROVIDES += "libebook-contacts"
 
 
-#PROVIDES by typelib-EBookContacts
-PROVIDES += "typelib-EBookContacts"
-
-
 #PROVIDES by libedata-book
 PROVIDES += "libedata-book"
 
@@ -75,9 +63,7 @@ RDEPENDS_${PN} += "glib-2.0"
 RDEPENDS_${PN}-doc += "evolution-data-server"
 
 #RDEPENDS of evolution-data-server-dev (${PN}-dev)
-RDEPENDS_${PN}-dev += "typelib-EBook"
 RDEPENDS_${PN}-dev += "evolution-data-server"
-RDEPENDS_${PN}-dev += "typelib-EDataServer"
 RDEPENDS_${PN}-dev += "libedataserver"
 RDEPENDS_${PN}-dev += "libecal"
 RDEPENDS_${PN}-dev += "libcamel"
@@ -99,7 +85,6 @@ DEPENDS += "eglibc-locale"
 DEPENDS += "db"
 #Replace "DEPENDS" on gettext by "inherit gettext"
 inherit gettext
-DEPENDS += "gtk-doc-stub"
 DEPENDS += "libical"
 DEPENDS += "libsoup-2.4"
 inherit pythonnative
@@ -116,6 +101,7 @@ do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
+ cp ${S}/packaging/evolution-data-server.manifest .
  
  
 }
@@ -145,10 +131,8 @@ do_compile() {
   
   
   
-  
-  
 }
-EXTRA_OECONF += " --libexecdir=${prefix}/libexec/evolution-data-server --disable-maintainer-mode --enable-ipv6= --enable-smime= --enable-nntp= --disable-static --disable-uoa --enable-goa=no --enable-weather=no --enable-gtk=no --enable-google=no --enable-vala-bindings --enable-introspection --disable-examples "
+EXTRA_OECONF += " --libexecdir=${prefix}/libexec/evolution-data-server --disable-maintainer-mode --enable-ipv6= --enable-smime= --enable-nntp= --disable-static --disable-uoa --enable-goa=no --enable-weather=no --enable-gtk=no --enable-google=no --disable-vala-bindings --disable-introspection --disable-examples"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -169,8 +153,8 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  mkdir -p ${D}/${prefix}/share/help
- #find_lang evolution-data-server-3.11
- mv evolution-data-server-3.11.lang evolution-data-server.lang
+ find ${D} -name evolution-data-server-3.11.mo -execdir mv {} evolution-data-server.mo \;
+ #find_lang evolution-data-server
  #fdupes ${D}
  
  #lang_package
@@ -190,20 +174,20 @@ pkg_postinst_libecal() {
     [ "x$D" == "x" ] && ldconfig
 }
 
-pkg_postinst_${PN}() {
+pkg_postinst_libedata-cal() {
     #!/bin/sh -e
 
-    %glib2_gsettings_schema_post
-
+    [ "x$D" == "x" ] && ldconfig
 }
 
-pkg_postinst_libebackend() {
+pkg_postinst_${PN}() {
     #!/bin/sh -e
 
-    [ "x$D" == "x" ] && ldconfig
+    %glib2_gsettings_schema_post
+
 }
 
-pkg_postinst_libedata-cal() {
+pkg_postinst_libebackend() {
     #!/bin/sh -e
 
     [ "x$D" == "x" ] && ldconfig
@@ -251,17 +235,17 @@ pkg_postrm_libedata-book() {
     [ "x$D" == "x" ] && ldconfig
 }
 
-pkg_postrm_${PN}() {
+pkg_postrm_libebackend() {
     #!/bin/sh -e
 
-    %glib2_gsettings_schema_postun
-
+    [ "x$D" == "x" ] && ldconfig
 }
 
-pkg_postrm_libebackend() {
+pkg_postrm_${PN}() {
     #!/bin/sh -e
 
-    [ "x$D" == "x" ] && ldconfig
+    %glib2_gsettings_schema_postun
+
 }
 
 pkg_postrm_libedataserver() {
@@ -289,23 +273,17 @@ pkg_postrm_libebook-contacts() {
 }
 
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
-PACKAGES += " typelib-EBook "
 PACKAGES += " evolution-data-server "
-PACKAGES += " typelib-EDataServer "
+PACKAGES += " libedataserver "
 PACKAGES += " libecal "
 PACKAGES += " libcamel "
-PACKAGES += " libedataserver "
 PACKAGES += " libedata-cal "
 PACKAGES += " libebook-contacts "
-PACKAGES += " typelib-EBookContacts "
 PACKAGES += " libebook "
 PACKAGES += " libedata-book "
 PACKAGES += " libebackend "
 PACKAGES += " evolution-data-server-dev "
 
-typelib-EBook_files = ""
-typelib-EBook_files += "${prefix}/lib/girepository-1.0/EBook-1.2.typelib"
-
 evolution-data-server_files = ""
 evolution-data-server_files += "${prefix}/share/GConf/gsettings/evolution-data-server.convert"
 evolution-data-server_files += "${prefix}/share/GConf/gsettings/libedataserver.convert"
@@ -318,73 +296,63 @@ evolution-data-server_files += "${prefix}/share/pixmaps/evolution-data-server/"
 evolution-data-server_files += "${prefix}/share/dbus-1/services/org.gnome.evolution.dataserver.*.service"
 evolution-data-server_files += "${prefix}/lib/evolution-data-server/"
 evolution-data-server_files += "${prefix}/libexec/evolution-data-server/"
+MANIFESTFILES_${PN} = "evolution-data-server.manifest"
 
-typelib-EDataServer_files = ""
-typelib-EDataServer_files += "${prefix}/lib/girepository-1.0/EDataServer-1.2.typelib"
+libedataserver_files = ""
+libedataserver_files += "${prefix}/lib/libedataserver-1.2.so.17*"
+MANIFESTFILES_libedataserver = "evolution-data-server.manifest"
 
 libecal_files = ""
 libecal_files += "${prefix}/lib/libecal-1.2.so.15*"
+MANIFESTFILES_libecal = "evolution-data-server.manifest"
 
 libcamel_files = ""
 libcamel_files += "${prefix}/lib/libcamel-1.2.so.43*"
-
-libedataserver_files = ""
-libedataserver_files += "${prefix}/lib/libedataserver-1.2.so.17*"
+MANIFESTFILES_libcamel = "evolution-data-server.manifest"
 
 libedata-cal_files = ""
 libedata-cal_files += "${prefix}/lib/libedata-cal-1.2.so.20*"
+MANIFESTFILES_libedata-cal = "evolution-data-server.manifest"
 
 libebook-contacts_files = ""
 libebook-contacts_files += "${prefix}/lib/libebook-contacts-1.2.so.0*"
-
-typelib-EBookContacts_files = ""
-typelib-EBookContacts_files += "${prefix}/lib/girepository-1.0/EBookContacts-1.2.typelib"
+MANIFESTFILES_libebook-contacts = "evolution-data-server.manifest"
 
 libebook_files = ""
 libebook_files += "${prefix}/lib/libebook-1.2.so.14*"
+MANIFESTFILES_libebook = "evolution-data-server.manifest"
 
 libedata-book_files = ""
 libedata-book_files += "${prefix}/lib/libedata-book-1.2.so.17*"
+MANIFESTFILES_libedata-book = "evolution-data-server.manifest"
 
 libebackend_files = ""
 libebackend_files += "${prefix}/lib/libebackend-1.2.so.6*"
+MANIFESTFILES_libebackend = "evolution-data-server.manifest"
 
 evolution-data-server-dev_files = ""
 evolution-data-server-dev_files += "${prefix}/include/evolution-data-server/"
 evolution-data-server-dev_files += "${prefix}/lib/*.so"
 evolution-data-server-dev_files += "${prefix}/lib/pkgconfig/*.pc"
-evolution-data-server-dev_files += "${prefix}/share/gir-1.0/*.gir"
-evolution-data-server-dev_files += "${prefix}/share/vala"
-evolution-data-server-dev_files += "${prefix}/share/vala/vapi"
-evolution-data-server-dev_files += "${prefix}/share/vala/vapi/*.deps"
-evolution-data-server-dev_files += "${prefix}/share/vala/vapi/*.vapi"
-DIRFILES_${PN}-dev = ""
-DIRFILES_${PN}-dev += "${prefix}/share/vala"
-DIRFILES_${PN}-dev += "${prefix}/share/vala/vapi"
-
-FILES_typelib-EBook = "${typelib-EBook_files}"
+MANIFESTFILES_${PN}-dev = "evolution-data-server.manifest"
+
 FILES_${PN} = "${evolution-data-server_files}"
-FILES_typelib-EDataServer = "${typelib-EDataServer_files}"
+FILES_libedataserver = "${libedataserver_files}"
 FILES_libecal = "${libecal_files}"
 FILES_libcamel = "${libcamel_files}"
-FILES_libedataserver = "${libedataserver_files}"
 FILES_libedata-cal = "${libedata-cal_files}"
 FILES_libebook-contacts = "${libebook-contacts_files}"
-FILES_typelib-EBookContacts = "${typelib-EBookContacts_files}"
 FILES_libebook = "${libebook_files}"
 FILES_libedata-book = "${libedata-book_files}"
 FILES_libebackend = "${libebackend_files}"
 FILES_${PN}-dev = "${evolution-data-server-dev_files}"
 
-PKG_typelib-EBook= "typelib-EBook"
 PKG_evolution-data-server= "evolution-data-server"
-PKG_typelib-EDataServer= "typelib-EDataServer"
+PKG_libedataserver= "libedataserver"
 PKG_libecal= "libecal"
 PKG_libcamel= "libcamel"
-PKG_libedataserver= "libedataserver"
 PKG_libedata-cal= "libedata-cal"
 PKG_libebook-contacts= "libebook-contacts"
-PKG_typelib-EBookContacts= "typelib-EBookContacts"
 PKG_libebook= "libebook"
 PKG_libedata-book= "libedata-book"
 PKG_libebackend= "libebackend"

diff --git a/recipes-tizen/evolution-data-server/evolution-data-server_git.bb b/recipes-tizen/evolution-data-server/evolution-data-server_git.bb
index 115de03..e6f808b 100644 (file)
--- a/recipes-tizen/evolution-data-server/evolution-data-server_git.bb
+++ b/recipes-tizen/evolution-data-server/evolution-data-server_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/evolution-data-server;tag=a30577d9663f329a258fd3f774e43979bb3f3e1b;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/evolution-data-server;tag=653b6ed2103475434475d89019dac05efd62d37a;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/recipes-tizen/evolution-data-server/files/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch b/recipes-tizen/evolution-data-server/files/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
new file mode 100644 (file)
index 0000000..1383347
--- /dev/null
+++ b/recipes-tizen/evolution-data-server/files/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch
@@ -0,0 +1,39 @@
+From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sun, 4 Aug 2013 10:57:08 +0200
+Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host
+ paths
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ calendar/libecal/libecal.pc.in | 2 +-
+ configure.ac                   | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in
+index fc6b359..d3435bb 100644
+--- a/calendar/libecal/libecal.pc.in
++++ b/calendar/libecal/libecal.pc.in
+@@ -12,4 +12,4 @@ Description: Client library for evolution calendars
+ Version: @VERSION@
+ Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0
+ Libs: -L${libdir} -lecal-1.2
+-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
++Cflags: -I${privincludedir}
+diff --git a/configure.ac b/configure.ac
+index 1c802ff..f1d4ce8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1351,7 +1351,8 @@ dnl to differentiate between <libical/ical.h> and <ical.h>
+ dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
+ dnl libical is fixed, we have to work-around the buggy CFlags.
+ dnl *****
+-      LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
++      m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++      LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
+       LIBICAL_EXTRA_LIBS=""
+       AC_SUBST(LIBICAL_EXTRA_CFLAGS)
+       AC_SUBST(LIBICAL_EXTRA_LIBS)
+-- 
+1.8.3.2
+

diff --git a/recipes-tizen/evolution-data-server/files/iconv-detect.h b/recipes-tizen/evolution-data-server/files/iconv-detect.h
new file mode 100644 (file)
index 0000000..46f476d
--- /dev/null
+++ b/recipes-tizen/evolution-data-server/files/iconv-detect.h
@@ -0,0 +1,5 @@
+/* This is an auto-generated header, DO NOT EDIT! */
+
+#define ICONV_ISO_D_FORMAT "iso-%d-%d"
+#define ICONV_ISO_S_FORMAT "iso-%d-%s"
+#define ICONV_10646 "iso-10646"