[oe-commits] org.oe.dev opensync: merge with poky

koen commit openembedded-commits at lists.openembedded.org
Fri Apr 13 17:39:50 UTC 2007 

opensync: merge with poky

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: a77f39463e6269c845c6ea4e27fb4f93d44719b1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a77f39463e6269c845c6ea4e27fb4f93d44719b1
Files:
1
packages/opensync/libopensync-plugin-syncml-client-plugin-0.1
packages/opensync/syncml-client-0.1
packages/opensync/libopensync-plugin-evo2-sync_0.22.bb
packages/opensync/libopensync-plugin-evo2-sync_svn.bb
packages/opensync/libopensync-plugin-file-sync_0.22.bb
packages/opensync/libopensync-plugin-file-sync_svn.bb
packages/opensync/libopensync-plugin-irmc-sync_0.22.bb
packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch
packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch
packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
packages/opensync/libopensync-plugin-syncml-plugin.bb
packages/opensync/libopensync-plugin-syncml_0.22.bb
packages/opensync/libopensync-plugin.inc
packages/opensync/libopensync-plugin_0.22.inc
packages/opensync/libopensync_0.22.bb
packages/opensync/libopensync_svn.bb
packages/opensync/libsyncml_svn.bb
packages/opensync/msynctool_0.22.bb
packages/opensync/msynctool_svn.bb
packages/opensync/opensync-unpack.inc
packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch
packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch
packages/opensync/syncml-client_0.1.bb
Diffs:

#
# mt diff -ra212790a49d7417a94f5c1d0bf6b335141414778 -ra77f39463e6269c845c6ea4e27fb4f93d44719b1
#
# 
# 
# add_dir "packages/opensync/libopensync-plugin-syncml-client-plugin-0.1"
# 
# add_dir "packages/opensync/syncml-client-0.1"
# 
# add_file "packages/opensync/libopensync-plugin-evo2-sync_0.22.bb"
#  content [1958b7bf76b4046e79c9ddaeb020f0081a432a3d]
# 
# add_file "packages/opensync/libopensync-plugin-evo2-sync_svn.bb"
#  content [57e7fc0b22851f2ee1304a129facd1cf0d4b88d6]
# 
# add_file "packages/opensync/libopensync-plugin-file-sync_0.22.bb"
#  content [31a926deec10dc0d36b34a309c03aa5834afa63f]
# 
# add_file "packages/opensync/libopensync-plugin-file-sync_svn.bb"
#  content [4f86e286e11a3a4e9cfc5be3309c7700ab50ec37]
# 
# add_file "packages/opensync/libopensync-plugin-irmc-sync_0.22.bb"
#  content [31a926deec10dc0d36b34a309c03aa5834afa63f]
# 
# add_file "packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch"
#  content [1993c28de8aab2a790c824bc8a4f2693989b618f]
# 
# add_file "packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch"
#  content [684c645855332bb7fd4b0090becfc7159ef4c502]
# 
# add_file "packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb"
#  content [2149e76c7e7d2183a56a5bd426d983c0ea96c99a]
# 
# add_file "packages/opensync/libopensync-plugin-syncml-plugin.bb"
#  content [6c115a4f2fb99c3e95ea96320b927e40421b929a]
# 
# add_file "packages/opensync/libopensync-plugin-syncml_0.22.bb"
#  content [f1b94d0f65a6a17ce806c09b36cdaab964d128b4]
# 
# add_file "packages/opensync/libopensync-plugin.inc"
#  content [cafd7e66a49a56ed2b613ac78cd24bc94f9c920d]
# 
# add_file "packages/opensync/libopensync-plugin_0.22.inc"
#  content [bc80e3320e3fddfb6d8246a1f976dcf23df6c916]
# 
# add_file "packages/opensync/libopensync_0.22.bb"
#  content [96823a8cbe6ede9837269c912798f7a4db7d0759]
# 
# add_file "packages/opensync/libopensync_svn.bb"
#  content [f425fe41b8edd49b0aa6eb86969fe2cd68c5da20]
# 
# add_file "packages/opensync/libsyncml_svn.bb"
#  content [a0776d1763885a16b2ef19b9c8d868c7bbdeba47]
# 
# add_file "packages/opensync/msynctool_0.22.bb"
#  content [bca002ac87986369a58183879ea3837e49e7aac7]
# 
# add_file "packages/opensync/msynctool_svn.bb"
#  content [2d91eaf06e9a21fa435d5f90fa8d4425a19bb06c]
# 
# add_file "packages/opensync/opensync-unpack.inc"
#  content [bcb6c091d7e9f7f4fa4fb09ee5bfc5786d9938f3]
# 
# add_file "packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch"
#  content [e7639b283898cb5a819786a7be40805859f52afd]
# 
# add_file "packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch"
#  content [a9eba740374083e101bb78c967cb1562744275bc]
# 
# patch "packages/opensync/syncml-client_0.1.bb"
#  from [6b9299abdfcc64c346e0592b6ecd4e16bc713134]
#    to [d92f21020c65f7b841ade3e8f4a0991929583f31]
# 
============================================================
--- packages/opensync/libopensync-plugin-evo2-sync_0.22.bb	1958b7bf76b4046e79c9ddaeb020f0081a432a3d
+++ packages/opensync/libopensync-plugin-evo2-sync_0.22.bb	1958b7bf76b4046e79c9ddaeb020f0081a432a3d
@@ -0,0 +1,6 @@
+PLUGIN_ARCHIVE = "evolution2"
+
+require libopensync-plugin.inc
+require libopensync-plugin_0.22.inc
+
+DEPENDS += " eds-dbus"
============================================================
--- packages/opensync/libopensync-plugin-evo2-sync_svn.bb	57e7fc0b22851f2ee1304a129facd1cf0d4b88d6
+++ packages/opensync/libopensync-plugin-evo2-sync_svn.bb	57e7fc0b22851f2ee1304a129facd1cf0d4b88d6
@@ -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"
+
============================================================
--- packages/opensync/libopensync-plugin-file-sync_0.22.bb	31a926deec10dc0d36b34a309c03aa5834afa63f
+++ packages/opensync/libopensync-plugin-file-sync_0.22.bb	31a926deec10dc0d36b34a309c03aa5834afa63f
@@ -0,0 +1,2 @@
+require libopensync-plugin.inc
+require libopensync-plugin_0.22.inc
============================================================
--- packages/opensync/libopensync-plugin-file-sync_svn.bb	4f86e286e11a3a4e9cfc5be3309c7700ab50ec37
+++ packages/opensync/libopensync-plugin-file-sync_svn.bb	4f86e286e11a3a4e9cfc5be3309c7700ab50ec37
@@ -0,0 +1,5 @@
+
+SRC_URI = "svn://svn.opensync.org/plugins;module=file-sync;proto=http"
+S = "${WORKDIR}/file-sync"
+
+require libopensync-plugin.inc
============================================================
--- packages/opensync/libopensync-plugin-irmc-sync_0.22.bb	31a926deec10dc0d36b34a309c03aa5834afa63f
+++ packages/opensync/libopensync-plugin-irmc-sync_0.22.bb	31a926deec10dc0d36b34a309c03aa5834afa63f
@@ -0,0 +1,2 @@
+require libopensync-plugin.inc
+require libopensync-plugin_0.22.inc
============================================================
--- packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch	1993c28de8aab2a790c824bc8a4f2693989b618f
+++ packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch	1993c28de8aab2a790c824bc8a4f2693989b618f
@@ -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 @@
++<config>
++    <gconf-uri>/apps/syncml-client</gconf-uri>
++    <object-type>contact</object-type>
++    <sync-source-name>card</sync-source-name>
++</config>
============================================================
--- packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch	684c645855332bb7fd4b0090becfc7159ef4c502
+++ packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch	684c645855332bb7fd4b0090becfc7159ef4c502
@@ -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;
============================================================
--- packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb	2149e76c7e7d2183a56a5bd426d983c0ea96c99a
+++ packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb	2149e76c7e7d2183a56a5bd426d983c0ea96c99a
@@ -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"
+
============================================================
--- packages/opensync/libopensync-plugin-syncml-plugin.bb	6c115a4f2fb99c3e95ea96320b927e40421b929a
+++ packages/opensync/libopensync-plugin-syncml-plugin.bb	6c115a4f2fb99c3e95ea96320b927e40421b929a
@@ -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/
+}
+
============================================================
--- packages/opensync/libopensync-plugin-syncml_0.22.bb	f1b94d0f65a6a17ce806c09b36cdaab964d128b4
+++ packages/opensync/libopensync-plugin-syncml_0.22.bb	f1b94d0f65a6a17ce806c09b36cdaab964d128b4
@@ -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/
+}
+
============================================================
--- packages/opensync/libopensync-plugin.inc	cafd7e66a49a56ed2b613ac78cd24bc94f9c920d
+++ packages/opensync/libopensync-plugin.inc	cafd7e66a49a56ed2b613ac78cd24bc94f9c920d
@@ -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/
+}
+
============================================================
--- packages/opensync/libopensync-plugin_0.22.inc	bc80e3320e3fddfb6d8246a1f976dcf23df6c916
+++ packages/opensync/libopensync-plugin_0.22.inc	bc80e3320e3fddfb6d8246a1f976dcf23df6c916
@@ -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
+
============================================================
--- packages/opensync/libopensync_0.22.bb	96823a8cbe6ede9837269c912798f7a4db7d0759
+++ packages/opensync/libopensync_0.22.bb	96823a8cbe6ede9837269c912798f7a4db7d0759
@@ -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
+}
+
============================================================
--- packages/opensync/libopensync_svn.bb	f425fe41b8edd49b0aa6eb86969fe2cd68c5da20
+++ packages/opensync/libopensync_svn.bb	f425fe41b8edd49b0aa6eb86969fe2cd68c5da20
@@ -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
+}
+
============================================================
--- packages/opensync/libsyncml_svn.bb	a0776d1763885a16b2ef19b9c8d868c7bbdeba47
+++ packages/opensync/libsyncml_svn.bb	a0776d1763885a16b2ef19b9c8d868c7bbdeba47
@@ -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.*"
+
============================================================
--- packages/opensync/msynctool_0.22.bb	bca002ac87986369a58183879ea3837e49e7aac7
+++ packages/opensync/msynctool_0.22.bb	bca002ac87986369a58183879ea3837e49e7aac7
@@ -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
============================================================
--- packages/opensync/msynctool_svn.bb	2d91eaf06e9a21fa435d5f90fa8d4425a19bb06c
+++ packages/opensync/msynctool_svn.bb	2d91eaf06e9a21fa435d5f90fa8d4425a19bb06c
@@ -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
+
============================================================
--- packages/opensync/opensync-unpack.inc	bcb6c091d7e9f7f4fa4fb09ee5bfc5786d9938f3
+++ packages/opensync/opensync-unpack.inc	bcb6c091d7e9f7f4fa4fb09ee5bfc5786d9938f3
@@ -0,0 +1,5 @@
+do_unpack2() {
+    cd ${WORKDIR} && tar jxf ${PN}-${PV}.tar.bz2?format=raw
+}
+
+addtask unpack2 after do_unpack before do_patch
============================================================
--- packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch	e7639b283898cb5a819786a7be40805859f52afd
+++ packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch	e7639b283898cb5a819786a7be40805859f52afd
@@ -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 at includedir@/syncml-client
++Cflags: @SYNCML_CFLAGS@ -I${includedir}/syncml-client
+ ~
+ 
============================================================
--- packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch	a9eba740374083e101bb78c967cb1562744275bc
+++ packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch	a9eba740374083e101bb78c967cb1562744275bc
@@ -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 <opensync/opensync.h>
+-#include <syncml-client.h>
++#include <syncml-client/syncml-client.h>
+ #include "SmcSyncSource.h"
+ #include "SmcConfig.h"
+ 
============================================================
--- packages/opensync/syncml-client_0.1.bb	6b9299abdfcc64c346e0592b6ecd4e16bc713134
+++ packages/opensync/syncml-client_0.1.bb	d92f21020c65f7b841ade3e8f4a0991929583f31
@@ -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
+}

More information about the Openembedded-commits mailing list