From 199e1778e4839ea1d26abfa35073af2ea67d5c6b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 13 Apr 2007 17:44:36 +0000 Subject: opensync: merge with poky --- .../opensync/libopensync-plugin-evo2-sync_0.22.bb | 6 ++++ .../opensync/libopensync-plugin-evo2-sync_svn.bb | 8 +++++ .../opensync/libopensync-plugin-file-sync_0.22.bb | 2 ++ .../opensync/libopensync-plugin-file-sync_svn.bb | 5 ++++ .../opensync/libopensync-plugin-irmc-sync_0.22.bb | 2 ++ .../.mtn2git_empty | 0 .../missing-syncml-config.patch | 8 +++++ .../syncml-client-plugin-cpp.patch | 11 +++++++ .../libopensync-plugin-syncml-client-plugin_0.1.bb | 13 ++++++++ .../opensync/libopensync-plugin-syncml-plugin.bb | 16 ++++++++++ .../opensync/libopensync-plugin-syncml_0.22.bb | 13 ++++++++ packages/opensync/libopensync-plugin.inc | 24 +++++++++++++++ packages/opensync/libopensync-plugin_0.22.inc | 12 ++++++++ packages/opensync/libopensync_0.22.bb | 21 +++++++++++++ packages/opensync/libopensync_svn.bb | 18 +++++++++++ packages/opensync/libsyncml_svn.bb | 35 ++++++++++++++++++++++ packages/opensync/msynctool_0.22.bb | 9 ++++++ packages/opensync/msynctool_svn.bb | 10 +++++++ packages/opensync/opensync-unpack.inc | 5 ++++ packages/opensync/syncml-client-0.1/.mtn2git_empty | 0 .../syncml-client-pc-in-cross.patch | 10 +++++++ .../syncml-client-0.1/syncml-client-plugin-h.patch | 11 +++++++ packages/opensync/syncml-client_0.1.bb | 12 ++++++-- 23 files changed, 248 insertions(+), 3 deletions(-) create mode 100644 packages/opensync/libopensync-plugin-evo2-sync_0.22.bb create mode 100644 packages/opensync/libopensync-plugin-evo2-sync_svn.bb create mode 100644 packages/opensync/libopensync-plugin-file-sync_0.22.bb create mode 100644 packages/opensync/libopensync-plugin-file-sync_svn.bb create mode 100644 packages/opensync/libopensync-plugin-irmc-sync_0.22.bb create mode 100644 packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/.mtn2git_empty create mode 100644 packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch create mode 100644 packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch create mode 100644 packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb create mode 100644 packages/opensync/libopensync-plugin-syncml-plugin.bb create mode 100644 packages/opensync/libopensync-plugin-syncml_0.22.bb create mode 100644 packages/opensync/libopensync-plugin.inc create mode 100644 packages/opensync/libopensync-plugin_0.22.inc create mode 100644 packages/opensync/libopensync_0.22.bb create mode 100644 packages/opensync/libopensync_svn.bb create mode 100644 packages/opensync/libsyncml_svn.bb create mode 100644 packages/opensync/msynctool_0.22.bb create mode 100644 packages/opensync/msynctool_svn.bb create mode 100644 packages/opensync/opensync-unpack.inc create mode 100644 packages/opensync/syncml-client-0.1/.mtn2git_empty create mode 100644 packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch create mode 100644 packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch (limited to 'packages/opensync') diff --git a/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb b/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb new file mode 100644 index 0000000000..6b2609902a --- /dev/null +++ b/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb @@ -0,0 +1,6 @@ +PLUGIN_ARCHIVE = "evolution2" + +require libopensync-plugin.inc +require libopensync-plugin_0.22.inc + +DEPENDS += " eds-dbus" diff --git a/packages/opensync/libopensync-plugin-evo2-sync_svn.bb b/packages/opensync/libopensync-plugin-evo2-sync_svn.bb new file mode 100644 index 0000000000..0a8084e519 --- /dev/null +++ b/packages/opensync/libopensync-plugin-evo2-sync_svn.bb @@ -0,0 +1,8 @@ + +SRC_URI = "svn://svn.opensync.org/plugins;module=evolution2;proto=http" +S = "${WORKDIR}/evolution2" + +require libopensync-plugin.inc + +DEPENDS += " eds-dbus" + diff --git a/packages/opensync/libopensync-plugin-file-sync_0.22.bb b/packages/opensync/libopensync-plugin-file-sync_0.22.bb new file mode 100644 index 0000000000..d34473127d --- /dev/null +++ b/packages/opensync/libopensync-plugin-file-sync_0.22.bb @@ -0,0 +1,2 @@ +require libopensync-plugin.inc +require libopensync-plugin_0.22.inc diff --git a/packages/opensync/libopensync-plugin-file-sync_svn.bb b/packages/opensync/libopensync-plugin-file-sync_svn.bb new file mode 100644 index 0000000000..ae300b402f --- /dev/null +++ b/packages/opensync/libopensync-plugin-file-sync_svn.bb @@ -0,0 +1,5 @@ + +SRC_URI = "svn://svn.opensync.org/plugins;module=file-sync;proto=http" +S = "${WORKDIR}/file-sync" + +require libopensync-plugin.inc diff --git a/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb b/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb new file mode 100644 index 0000000000..d34473127d --- /dev/null +++ b/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb @@ -0,0 +1,2 @@ +require libopensync-plugin.inc +require libopensync-plugin_0.22.inc diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/.mtn2git_empty b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch new file mode 100644 index 0000000000..0fac67e5d9 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch @@ -0,0 +1,8 @@ +--- tmp/src/missing-syncml-client-plugin 2007-01-09 12:55:48.000000000 +0000 ++++ tmp/src/syncml-client-plugin 2007-01-09 12:55:48.000000000 +0000 +@@ -0,0 +1,5 @@ ++ ++ /apps/syncml-client ++ contact ++ card ++ diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch new file mode 100644 index 0000000000..7b659ce7c3 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch @@ -0,0 +1,11 @@ +--- tmp/src/syncml-client-plugin.cpp.orig 2007-01-09 12:27:33.000000000 +0000 ++++ tmp/src/syncml-client-plugin.cpp 2007-01-09 12:27:33.000000000 +0000 +@@ -94,7 +94,7 @@ + /** + * Initialize the plugin environment, read config data. + */ +-extern "C" static void* smc_initialize(OSyncMember *member, OSyncError **error) ++extern "C" void* smc_initialize(OSyncMember *member, OSyncError **error) + { + char *configData; + int configSize; diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb b/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb new file mode 100644 index 0000000000..a81417bf7e --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb @@ -0,0 +1,13 @@ +PR = "r1" + +SRC_URI = "svn://svn.opensync.org/plugins/syncml-client/plugin/tags;module=release-${PV};proto=http \ + file://missing-syncml-config.patch;patch=1 \ + file://syncml-client-plugin-cpp.patch;patch=1" + + +S = "${WORKDIR}/release-${PV}" + +require libopensync-plugin.inc + +DEPENDS += "syncml-client" + diff --git a/packages/opensync/libopensync-plugin-syncml-plugin.bb b/packages/opensync/libopensync-plugin-syncml-plugin.bb new file mode 100644 index 0000000000..0a7d82db74 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-plugin.bb @@ -0,0 +1,16 @@ + +SRC_URI = "svn://svn.opensync.org/plugins;module=syncml;proto=http" +S = "${WORKDIR}/syncml" + +require libopensync-plugin.inc + +DEPENDS += " libsyncml" + +do_install() { + install -d ${D}${datadir}/opensync/defaults + install -d ${D}${libdir}/opensync/plugins + install -m 644 src/syncml-http-server ${D}${datadir}/opensync/defaults + install -m 644 src/syncml-obex-client ${D}${datadir}/opensync/defaults + install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/ +} + diff --git a/packages/opensync/libopensync-plugin-syncml_0.22.bb b/packages/opensync/libopensync-plugin-syncml_0.22.bb new file mode 100644 index 0000000000..2a26eb1674 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml_0.22.bb @@ -0,0 +1,13 @@ + +require libopensync-plugin.inc + +DEPENDS += " libsyncml" + +do_install() { + install -d ${D}${datadir}/opensync/defaults + install -d ${D}${libdir}/opensync/plugins + install -m 644 src/syncml-http-server ${D}${datadir}/opensync/defaults + install -m 644 src/syncml-obex-client ${D}${datadir}/opensync/defaults + install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/ +} + diff --git a/packages/opensync/libopensync-plugin.inc b/packages/opensync/libopensync-plugin.inc new file mode 100644 index 0000000000..b1986a9e64 --- /dev/null +++ b/packages/opensync/libopensync-plugin.inc @@ -0,0 +1,24 @@ + +PV = "0.22+svn${SRCDATE}" +PLUGIN_NAME ?= "${@bb.data.getVar('PN', d, 1).replace('libopensync-plugin-','')}" +PLUGIN_SONAME ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-','_')}.so" +SRC_URI ?= "svn://svn.opensync.org/plugins;module=${PLUGIN_NAME};proto=http" +S ?= "${WORKDIR}/${PLUGIN_NAME}" + +LICENSE ?= "LGPL" +DEPENDS += " libopensync" +RRECOMMENDS += " msynctool" +HOMEPAGE ?= "http://www.opensync.org/" + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir} ${libdir}/opensync/plugins/*.so" +FILES_${PN}-dbg += "${libdir}/opensync/plugins/.debug" + +do_install() { + install -d ${D}${datadir}/opensync/defaults + install -d ${D}${libdir}/opensync/plugins + install -m 644 src/${PLUGIN_NAME} ${D}${datadir}/opensync/defaults + install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/ +} + diff --git a/packages/opensync/libopensync-plugin_0.22.inc b/packages/opensync/libopensync-plugin_0.22.inc new file mode 100644 index 0000000000..03857dce53 --- /dev/null +++ b/packages/opensync/libopensync-plugin_0.22.inc @@ -0,0 +1,12 @@ +PV = "0.22" +PLUGIN_ARCHIVE ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-sync','')}" +SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw" + +S = "${WORKDIR}/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}/" + +do_unpack2() { + cd ${WORKDIR} && tar jxf libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw +} + +addtask unpack2 after do_unpack before do_patch + diff --git a/packages/opensync/libopensync_0.22.bb b/packages/opensync/libopensync_0.22.bb new file mode 100644 index 0000000000..ed4ef740bc --- /dev/null +++ b/packages/opensync/libopensync_0.22.bb @@ -0,0 +1,21 @@ +LICENSE = "LGPL" +HOMEPAGE = "http://www.opensync.org/" + +DEPENDS = "sqlite3 libxml2 zlib glib-2.0" + +SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-0.22.tar.bz2?format=raw" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "--disable-python" +LEAD_SONAME = "libopensync.so" + +FILES_${PN} += " ${libdir}/opensync/formats/*.so" +FILES_${PN}-dbg += " ${libdir}/opensync/formats/.debug/*.so" + +require opensync-unpack.inc + +do_stage() { +autotools_stage_all +} + diff --git a/packages/opensync/libopensync_svn.bb b/packages/opensync/libopensync_svn.bb new file mode 100644 index 0000000000..ac7da051c8 --- /dev/null +++ b/packages/opensync/libopensync_svn.bb @@ -0,0 +1,18 @@ +LICENSE = "LGPL" +HOMEPAGE = "http://www.opensync.org/" +DEPENDS = "sqlite3 libxml2 zlib glib-2.0" +PV = "0.22+svn${SRCDATE}" +SRC_URI = "svn://svn.opensync.org;module=trunk;proto=http" + +inherit autotools pkgconfig lib_package + +S = "${WORKDIR}/trunk" +EXTRA_OECONF = "--disable-python" +LEAD_SONAME = "libopensync.so" + +FILES_${PN} += " ${libdir}/opensync/formats/*.so" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/opensync/libsyncml_svn.bb b/packages/opensync/libsyncml_svn.bb new file mode 100644 index 0000000000..17b2537e85 --- /dev/null +++ b/packages/opensync/libsyncml_svn.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol." +HOMEPAGE = "http://libsyncml.opensync.org/" +LICENSE = "LGPL" + +DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez-libs openobex" + +PV = "0.4.2+svn${SRCDATE}" +SRC_URI = "svn://svn.opensync.org/libsyncml;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +inherit autotools pkgconfig + +EXTRA_OECONF = " --enable-http \ + --enable-obex \ + --enable-bluetooth \ + --enable-tools \ + --with-wbxml" + +CFLAGS += "-I${STAGING_INCDIR}/libsoup-2.2" + +do_configure_append() { + sed -i s:-I/usr/include/:-I/foo/:g Makefile + sed -i s:-I/usr/include/:-I/foo/:g */Makefile + sed -i s:-I/usr/include/:-I/foo/:g */*/Makefile +} + +do_stage() { + autotools_stage_all +} + +PACKAGES += "${PN}-tools" + +FILES_${PN}-tools = "${bindir}" +FILES_${PN} = "${libdir}/*.so.*" + diff --git a/packages/opensync/msynctool_0.22.bb b/packages/opensync/msynctool_0.22.bb new file mode 100644 index 0000000000..018c227e36 --- /dev/null +++ b/packages/opensync/msynctool_0.22.bb @@ -0,0 +1,9 @@ +SRC_URI = "http://www.opensync.org/attachment/wiki/download/msynctool-0.22.tar.bz2?format=raw" + +LICENSE = "GPL" +DEPENDS = "libopensync" +HOMEPAGE = "http://www.opensync.org/" + +inherit autotools pkgconfig + +require opensync-unpack.inc diff --git a/packages/opensync/msynctool_svn.bb b/packages/opensync/msynctool_svn.bb new file mode 100644 index 0000000000..319cf39d05 --- /dev/null +++ b/packages/opensync/msynctool_svn.bb @@ -0,0 +1,10 @@ +PV = "0.22+svn${SRCDATE}" +SRC_URI = "svn://svn.opensync.org/multisync;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +LICENSE = "GPL" +DEPENDS = "libopensync" +HOMEPAGE = "http://www.opensync.org/" + +inherit autotools pkgconfig + diff --git a/packages/opensync/opensync-unpack.inc b/packages/opensync/opensync-unpack.inc new file mode 100644 index 0000000000..d5443187bd --- /dev/null +++ b/packages/opensync/opensync-unpack.inc @@ -0,0 +1,5 @@ +do_unpack2() { + cd ${WORKDIR} && tar jxf ${PN}-${PV}.tar.bz2?format=raw +} + +addtask unpack2 after do_unpack before do_patch diff --git a/packages/opensync/syncml-client-0.1/.mtn2git_empty b/packages/opensync/syncml-client-0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch b/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch new file mode 100644 index 0000000000..364f7643c5 --- /dev/null +++ b/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch @@ -0,0 +1,10 @@ +--- tmp/syncml-client.pc.in.orig 2007-01-09 09:43:18.000000000 +0000 ++++ tmp/syncml-client.pc.in 2007-01-09 09:43:18.000000000 +0000 +@@ -8,6 +8,6 @@ + Version: @VERSION@ + Requires: libcurl, gconf-2.0 + Libs: @SYNCML_LIBS@ -lsyncmlclient +-Cflags: @SYNCML_CFLAGS@ -I@includedir@/syncml-client ++Cflags: @SYNCML_CFLAGS@ -I${includedir}/syncml-client + ~ + diff --git a/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch b/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch new file mode 100644 index 0000000000..c936445a95 --- /dev/null +++ b/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch @@ -0,0 +1,11 @@ +--- tmp/src/syncml-client.h.orig 2007-01-09 12:15:41.000000000 +0000 ++++ tmp/src/syncml-client-plugin.h 2007-01-09 12:15:41.000000000 +0000 +@@ -20,7 +20,7 @@ + #define SYNCML_CLIENT_PLUGIN + + #include +-#include ++#include + #include "SmcSyncSource.h" + #include "SmcConfig.h" + diff --git a/packages/opensync/syncml-client_0.1.bb b/packages/opensync/syncml-client_0.1.bb index 729ac9a559..95a4e339c7 100644 --- a/packages/opensync/syncml-client_0.1.bb +++ b/packages/opensync/syncml-client_0.1.bb @@ -1,8 +1,14 @@ -SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz" - LICENSE = "GPL" DEPENDS = "gtk+ curl gconf" HOMEPAGE = "http://hem.bredband.net/miko22/" -DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." +DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." +PR="r1" + +SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz \ + file://syncml-client-pc-in-cross.patch;patch=1 " inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit 1.2.3-korg