From 1c0a1337ee0ebd837847419c1e526c365322a19a Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 7 Oct 2014 15:17:33 +0200 Subject: [PATCH] Update recipes Change-Id: If25ca26ba6f1e9cd2f1ab19b0a34c5fbd0a79f2d Signed-off-by: Ronan Le Martret --- .../evolution-data-server-extraconf.inc | 3 ++- .../evolution-data-server.inc | 23 ++++++++++++---------- .../evolution-data-server_git.bb | 2 +- recipes-tizen/libwebsockets/libwebsockets.inc | 4 ++++ recipes-tizen/libwebsockets/libwebsockets_git.bb | 2 +- recipes-tizen/meta-common/meta-common_git.bb | 2 +- recipes-tizen/meta-generic/meta-generic_git.bb | 2 +- .../tizen-platform-config_git.bb | 2 +- .../tizen-platform-wrapper_git.bb | 2 +- 9 files changed, 25 insertions(+), 17 deletions(-) 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 f968335..fc0bf2e 100644 --- a/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc +++ b/recipes-tizen/evolution-data-server/evolution-data-server-extraconf.inc @@ -8,7 +8,8 @@ export BUILD_SYS export STAGING_LIBDIR export STAGING_INCDIR -DEPENDS += "gobject-introspection" +#DEPENDS += "gobject-introspection" +#gtk-doc-stub? # -ldb needs this on some platforms LDFLAGS += "-lpthread" diff --git a/recipes-tizen/evolution-data-server/evolution-data-server.inc b/recipes-tizen/evolution-data-server/evolution-data-server.inc index df61d37..c462551 100644 --- a/recipes-tizen/evolution-data-server/evolution-data-server.inc +++ b/recipes-tizen/evolution-data-server/evolution-data-server.inc @@ -141,12 +141,14 @@ do_compile() { autotools_do_configure - make -j16 V=1 + oe_runmake -j16 V=1 + + } -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 # end of configure line" +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 " do_install() { export RPM_BUILD_ROOT=${D} @@ -167,8 +169,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.12 - mv evolution-data-server-3.12.lang evolution-data-server.lang + #find_lang evolution-data-server-3.11 + mv evolution-data-server-3.11.lang evolution-data-server.lang #fdupes ${D} #lang_package @@ -306,6 +308,7 @@ 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" evolution-data-server_files += "${prefix}/share/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml" evolution-data-server_files += "${prefix}/share/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml" evolution-data-server_files += "${prefix}/share/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml" @@ -320,16 +323,16 @@ typelib-EDataServer_files = "" typelib-EDataServer_files += "${prefix}/lib/girepository-1.0/EDataServer-1.2.typelib" libecal_files = "" -libecal_files += "${prefix}/lib/libecal-1.2.so.16*" +libecal_files += "${prefix}/lib/libecal-1.2.so.15*" libcamel_files = "" -libcamel_files += "${prefix}/lib/libcamel-1.2.so.49*" +libcamel_files += "${prefix}/lib/libcamel-1.2.so.43*" libedataserver_files = "" -libedataserver_files += "${prefix}/lib/libedataserver-1.2.so.18*" +libedataserver_files += "${prefix}/lib/libedataserver-1.2.so.17*" libedata-cal_files = "" -libedata-cal_files += "${prefix}/lib/libedata-cal-1.2.so.23*" +libedata-cal_files += "${prefix}/lib/libedata-cal-1.2.so.20*" libebook-contacts_files = "" libebook-contacts_files += "${prefix}/lib/libebook-contacts-1.2.so.0*" @@ -341,10 +344,10 @@ libebook_files = "" libebook_files += "${prefix}/lib/libebook-1.2.so.14*" libedata-book_files = "" -libedata-book_files += "${prefix}/lib/libedata-book-1.2.so.20*" +libedata-book_files += "${prefix}/lib/libedata-book-1.2.so.17*" libebackend_files = "" -libebackend_files += "${prefix}/lib/libebackend-1.2.so.7*" +libebackend_files += "${prefix}/lib/libebackend-1.2.so.6*" evolution-data-server-dev_files = "" evolution-data-server-dev_files += "${prefix}/include/evolution-data-server/" 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 3568fdb..115de03 100644 --- 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=478626e83843b8a5c93eccd8e3dd5241805b0244;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/evolution-data-server;tag=a30577d9663f329a258fd3f774e43979bb3f3e1b;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libwebsockets/libwebsockets.inc b/recipes-tizen/libwebsockets/libwebsockets.inc index d8d4375..87c0ebe 100644 --- a/recipes-tizen/libwebsockets/libwebsockets.inc +++ b/recipes-tizen/libwebsockets/libwebsockets.inc @@ -38,6 +38,8 @@ do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n libwebsockets-1.2 + cp ${S}/packaging/libwebsockets.manifest . + } @@ -119,11 +121,13 @@ libwebsockets_files = "" libwebsockets_files += "${prefix}/bin/libwebsockets*" libwebsockets_files += "${prefix}/lib/libwebsockets*.so.*" libwebsockets_files += "${prefix}/share/libwebsockets-test-server/*" +MANIFESTFILES_${PN} = "libwebsockets.manifest" libwebsockets-dev_files = "" libwebsockets-dev_files += "${prefix}/include/libwebsockets.h" libwebsockets-dev_files += "${prefix}/lib/libwebsockets.so" libwebsockets-dev_files += "${prefix}/lib/pkgconfig/*" +MANIFESTFILES_${PN}-dev = "libwebsockets.manifest" FILES_${PN} = "${libwebsockets_files}" FILES_${PN}-dev = "${libwebsockets-dev_files}" diff --git a/recipes-tizen/libwebsockets/libwebsockets_git.bb b/recipes-tizen/libwebsockets/libwebsockets_git.bb index dfdc0f9..3e65864 100644 --- a/recipes-tizen/libwebsockets/libwebsockets_git.bb +++ b/recipes-tizen/libwebsockets/libwebsockets_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/profile/ivi/libwebsockets;tag=d23ec16cf1cd3cc8c85884ed2b2c9afbcdedc027;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/libwebsockets;tag=5c054a5a61ec540e5bd5e2aa55742a3ed070b540;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/meta-common/meta-common_git.bb b/recipes-tizen/meta-common/meta-common_git.bb index ac3adf6..b4a2a8f 100644 --- a/recipes-tizen/meta-common/meta-common_git.bb +++ b/recipes-tizen/meta-common/meta-common_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/profile/common/meta;tag=1071c301c12500e7aae7b459a61e8fce1e855ff4;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/common/meta;tag=ebbc2b97e4bfb99afbab1ec7741c835e4f9161b7;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/meta-generic/meta-generic_git.bb b/recipes-tizen/meta-generic/meta-generic_git.bb index efc6a7c..16f4337 100644 --- a/recipes-tizen/meta-generic/meta-generic_git.bb +++ b/recipes-tizen/meta-generic/meta-generic_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/meta-generic;tag=fc60ec482d7da9dbddbd29bdeb1328aad3eedcec;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/meta-generic;tag=966ec85226e3aeb07dc4294d77c32a5746994690;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/tizen-platform-config/tizen-platform-config_git.bb b/recipes-tizen/tizen-platform-config/tizen-platform-config_git.bb index a5a7f1a..c21dee1 100644 --- a/recipes-tizen/tizen-platform-config/tizen-platform-config_git.bb +++ b/recipes-tizen/tizen-platform-config/tizen-platform-config_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/core/appfw/tizen-platform-config;tag=12f2548e81994d97efc7f62bb8eb10ac4079e273;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/tizen-platform-config;tag=4bf974331864fd6f5c29e2c2f4c813c4c1f0159a;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper_git.bb b/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper_git.bb index bc2ae7f..19e16c2 100644 --- a/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper_git.bb +++ b/recipes-tizen/tizen-platform-wrapper/tizen-platform-wrapper_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/core/appfw/tizen-platform-wrapper;tag=c085c25c97cf7e13a9ca539495e457cb33f217aa;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/tizen-platform-wrapper;tag=8b5967cd28a02dd169920f84722d5946d76b1690;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4