summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Frydrych <tf@openedhand.com>2007-01-09 13:13:38 (GMT)
committerTomas Frydrych <tf@openedhand.com>2007-01-09 13:13:38 (GMT)
commitf6cbd20e7bae744b011e4d0dfadb8ebcd014aeec (patch)
treee37ec8142a076900025a3ff1ccd4767060782bcd
parente42e2543f7343a1040ddc28ec6ee4a9c34ee903b (diff)
downloadpoky-f6cbd20e7bae744b011e4d0dfadb8ebcd014aeec.tar.gz
fix building of syncml-client and and the syncml-client-plugin
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1136 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch8
-rw-r--r--meta/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch11
-rw-r--r--meta/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb12
-rw-r--r--meta/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch10
-rw-r--r--meta/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch11
-rw-r--r--meta/packages/opensync/syncml-client_0.1.bb10
6 files changed, 56 insertions, 6 deletions
diff --git a/meta/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch b/meta/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch
new file mode 100644
index 0000000..0fac67e
--- /dev/null
+++ b/meta/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch
@@ -0,0 +1,8 @@
1--- tmp/src/missing-syncml-client-plugin 2007-01-09 12:55:48.000000000 +0000
2+++ tmp/src/syncml-client-plugin 2007-01-09 12:55:48.000000000 +0000
3@@ -0,0 +1,5 @@
4+<config>
5+ <gconf-uri>/apps/syncml-client</gconf-uri>
6+ <object-type>contact</object-type>
7+ <sync-source-name>card</sync-source-name>
8+</config>
diff --git a/meta/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch b/meta/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch
new file mode 100644
index 0000000..7b659ce
--- /dev/null
+++ b/meta/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch
@@ -0,0 +1,11 @@
1--- tmp/src/syncml-client-plugin.cpp.orig 2007-01-09 12:27:33.000000000 +0000
2+++ tmp/src/syncml-client-plugin.cpp 2007-01-09 12:27:33.000000000 +0000
3@@ -94,7 +94,7 @@
4 /**
5 * Initialize the plugin environment, read config data.
6 */
7-extern "C" static void* smc_initialize(OSyncMember *member, OSyncError **error)
8+extern "C" void* smc_initialize(OSyncMember *member, OSyncError **error)
9 {
10 char *configData;
11 int configSize;
diff --git a/meta/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb b/meta/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
index 9e47491..a81417b 100644
--- a/meta/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
+++ b/meta/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb
@@ -1,9 +1,13 @@
1PR = "r1"
1 2
2SRC_URI = "svn://svn.opensync.org/plugins/syncml-client/plugin/tags;module=release-0.1;proto=http" 3SRC_URI = "svn://svn.opensync.org/plugins/syncml-client/plugin/tags;module=release-${PV};proto=http \
3S = "${WORKDIR}/release-0.1" 4 file://missing-syncml-config.patch;patch=1 \
4PV = "0.1" 5 file://syncml-client-plugin-cpp.patch;patch=1"
6
7
8S = "${WORKDIR}/release-${PV}"
5 9
6require libopensync-plugin.inc 10require libopensync-plugin.inc
7 11
8DEPENDS += " syncml-client" 12DEPENDS += "syncml-client"
9 13
diff --git a/meta/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch b/meta/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch
new file mode 100644
index 0000000..364f764
--- /dev/null
+++ b/meta/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch
@@ -0,0 +1,10 @@
1--- tmp/syncml-client.pc.in.orig 2007-01-09 09:43:18.000000000 +0000
2+++ tmp/syncml-client.pc.in 2007-01-09 09:43:18.000000000 +0000
3@@ -8,6 +8,6 @@
4 Version: @VERSION@
5 Requires: libcurl, gconf-2.0
6 Libs: @SYNCML_LIBS@ -lsyncmlclient
7-Cflags: @SYNCML_CFLAGS@ -I@includedir@/syncml-client
8+Cflags: @SYNCML_CFLAGS@ -I${includedir}/syncml-client
9 ~
10
diff --git a/meta/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch b/meta/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch
new file mode 100644
index 0000000..c936445
--- /dev/null
+++ b/meta/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch
@@ -0,0 +1,11 @@
1--- tmp/src/syncml-client.h.orig 2007-01-09 12:15:41.000000000 +0000
2+++ tmp/src/syncml-client-plugin.h 2007-01-09 12:15:41.000000000 +0000
3@@ -20,7 +20,7 @@
4 #define SYNCML_CLIENT_PLUGIN
5
6 #include <opensync/opensync.h>
7-#include <syncml-client.h>
8+#include <syncml-client/syncml-client.h>
9 #include "SmcSyncSource.h"
10 #include "SmcConfig.h"
11
diff --git a/meta/packages/opensync/syncml-client_0.1.bb b/meta/packages/opensync/syncml-client_0.1.bb
index 7a99236..95a4e33 100644
--- a/meta/packages/opensync/syncml-client_0.1.bb
+++ b/meta/packages/opensync/syncml-client_0.1.bb
@@ -1,8 +1,14 @@
1SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz"
2
3LICENSE = "GPL" 1LICENSE = "GPL"
4DEPENDS = "gtk+ curl gconf" 2DEPENDS = "gtk+ curl gconf"
5HOMEPAGE = "http://hem.bredband.net/miko22/" 3HOMEPAGE = "http://hem.bredband.net/miko22/"
6DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." 4DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector."
5PR="r1"
6
7SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz \
8 file://syncml-client-pc-in-cross.patch;patch=1 "
7 9
8inherit autotools pkgconfig 10inherit autotools pkgconfig
11
12do_stage() {
13 autotools_stage_all
14}