diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-31 14:51:43 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-31 14:51:43 +0100 |
commit | 51536c814ae073a2b5d0c62f6377594da1ccad3c (patch) | |
tree | 0d2c800bca9e76ba4985ca6f0d49094dc44da982 /meta/packages/opensync | |
parent | e2182c5b04c8cb4479f921bb7e204c8f2fcb0ae9 (diff) | |
download | poky-51536c814ae073a2b5d0c62f6377594da1ccad3c.tar.gz |
opensync: Remove further old code
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/opensync')
12 files changed, 1 insertions, 121 deletions
diff --git a/meta/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb b/meta/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb deleted file mode 100644 index 6b2609902a..0000000000 --- a/meta/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | PLUGIN_ARCHIVE = "evolution2" | ||
2 | |||
3 | require libopensync-plugin.inc | ||
4 | require libopensync-plugin_0.22.inc | ||
5 | |||
6 | DEPENDS += " eds-dbus" | ||
diff --git a/meta/packages/opensync/libopensync-plugin-file-sync_0.22.bb b/meta/packages/opensync/libopensync-plugin-file-sync_0.22.bb deleted file mode 100644 index d34473127d..0000000000 --- a/meta/packages/opensync/libopensync-plugin-file-sync_0.22.bb +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | require libopensync-plugin.inc | ||
2 | require libopensync-plugin_0.22.inc | ||
diff --git a/meta/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb b/meta/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb deleted file mode 100644 index 55df4e4d78..0000000000 --- a/meta/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | require libopensync-plugin.inc | ||
2 | require libopensync-plugin_0.22.inc | ||
3 | |||
4 | DEPENDS += "openobex bluez-libs" | ||
diff --git a/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb b/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb index 295dfdecfa..c06de2fde8 100644 --- a/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb +++ b/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb | |||
@@ -1,3 +1,3 @@ | |||
1 | require libopensync-plugin_0.36.inc | 1 | require libopensync-plugin_0.36.inc |
2 | 2 | ||
3 | DEPENDS += "openobex bluez-libs" | 3 | DEPENDS += "openobex bluez4" |
diff --git a/meta/packages/opensync/libopensync-plugin-svn.inc b/meta/packages/opensync/libopensync-plugin-svn.inc deleted file mode 100644 index b268a007d7..0000000000 --- a/meta/packages/opensync/libopensync-plugin-svn.inc +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | PV = "0.22+svnr${SRCREV}" | ||
diff --git a/meta/packages/opensync/libopensync-plugin.inc b/meta/packages/opensync/libopensync-plugin.inc deleted file mode 100644 index ce686321a4..0000000000 --- a/meta/packages/opensync/libopensync-plugin.inc +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | LICENSE ?= "LGPL" | ||
2 | DEPENDS += " libopensync" | ||
3 | RRECOMMENDS += " msynctool" | ||
4 | HOMEPAGE ?= "http://www.opensync.org/" | ||
5 | |||
6 | PLUGIN_NAME ?= "${@bb.data.getVar('PN', d, 1).replace('libopensync-plugin-','')}" | ||
7 | PLUGIN_SONAME ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-','_')}.so" | ||
8 | SRC_URI ?= "svn://svn.opensync.org/plugins;module=${PLUGIN_NAME};proto=http" | ||
9 | S ?= "${WORKDIR}/${PLUGIN_NAME}" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
12 | |||
13 | FILES_${PN} += "${datadir} ${libdir}/opensync/plugins/*.so" | ||
14 | FILES_${PN}-dbg += "${libdir}/opensync/plugins/.debug" | ||
15 | |||
16 | do_install() { | ||
17 | install -d ${D}${datadir}/opensync/defaults | ||
18 | install -d ${D}${libdir}/opensync/plugins | ||
19 | install -m 644 src/${PLUGIN_NAME} ${D}${datadir}/opensync/defaults | ||
20 | install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/ | ||
21 | } | ||
diff --git a/meta/packages/opensync/libopensync-plugin_0.22.inc b/meta/packages/opensync/libopensync-plugin_0.22.inc deleted file mode 100644 index 31709e8b28..0000000000 --- a/meta/packages/opensync/libopensync-plugin_0.22.inc +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | PV = "0.22" | ||
2 | PLUGIN_ARCHIVE ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-sync','')}" | ||
3 | SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2" | ||
4 | |||
5 | S = "${WORKDIR}/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}/" | ||
6 | |||
diff --git a/meta/packages/opensync/libopensync/fix-attr.patch b/meta/packages/opensync/libopensync/fix-attr.patch deleted file mode 100644 index 7a2e5441c8..0000000000 --- a/meta/packages/opensync/libopensync/fix-attr.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: trunk/opensync/merger/opensync_xmlfield.c | ||
2 | =================================================================== | ||
3 | --- trunk.orig/opensync/merger/opensync_xmlfield.c 2007-04-12 16:40:07.000000000 +0200 | ||
4 | +++ trunk/opensync/merger/opensync_xmlfield.c 2007-04-12 16:40:11.000000000 +0200 | ||
5 | @@ -298,7 +298,7 @@ | ||
6 | int count; | ||
7 | xmlAttrPtr attr = xmlfield->node->properties; | ||
8 | |||
9 | - for(count=0; attribute != NULL; count++) { | ||
10 | + for(count=0; attr != NULL; count++) { | ||
11 | if(count == nth) | ||
12 | return (const char *)attr->name; | ||
13 | attr = attr->next; | ||
diff --git a/meta/packages/opensync/libopensync/gcc.patch b/meta/packages/opensync/libopensync/gcc.patch deleted file mode 100644 index 3eee014339..0000000000 --- a/meta/packages/opensync/libopensync/gcc.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Index: trunk/SConstruct | ||
2 | =================================================================== | ||
3 | --- trunk.orig/SConstruct 2007-04-25 13:20:13.000000000 +0200 | ||
4 | +++ trunk/SConstruct 2007-04-25 14:00:02.000000000 +0200 | ||
5 | @@ -36,7 +36,11 @@ | ||
6 | opts.Add(BoolOption('enable_python', 'Build python wrapper? (swig required)', 0)) | ||
7 | opts.Add(BoolOption('debug_modules', 'Should unloading of shared modules be avoided (DEBUGGING ONLY!)', 0)) | ||
8 | opts.Add(BoolOption('enable_doxygen', 'Generating OpenSync API with doxygen?', 0)) | ||
9 | - | ||
10 | +opts.AddOptions( | ||
11 | +('CC', 'Path to Custom c compiler', 'gcc'), | ||
12 | +('CXX', 'Path to Custom c++ compiler flags', 'g++'), | ||
13 | +('LDFLAGS', 'Linker flags', ''), | ||
14 | +) | ||
15 | |||
16 | target_dir = SelectBuildDir('build') | ||
17 | sys.path.append(target_dir) | ||
18 | @@ -63,6 +67,11 @@ | ||
19 | env.Append(CCFLAGS = r'-DENABLE_TOOLS=$enable_tools') | ||
20 | env.Append(CCFLAGS = r'-DENABLE_PROFILING=$enable_profiling') | ||
21 | |||
22 | +env.Replace( | ||
23 | + CC = env['CC'], | ||
24 | + CXX = env['CXX'], | ||
25 | + LDFLAGS = env['LDFLAGS'] | ||
26 | +) | ||
27 | |||
28 | # pkg config files | ||
29 | subst_dict={'@prefix@': '$prefix', | ||
diff --git a/meta/packages/opensync/libopensync/no-werror.patch b/meta/packages/opensync/libopensync/no-werror.patch deleted file mode 100644 index 523ceaaeb5..0000000000 --- a/meta/packages/opensync/libopensync/no-werror.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: trunk/build/linux/osync_build.py | ||
2 | =================================================================== | ||
3 | --- trunk.orig/build/linux/osync_build.py 2007-04-25 13:28:44.000000000 +0200 | ||
4 | +++ trunk/build/linux/osync_build.py 2007-04-25 13:28:54.000000000 +0200 | ||
5 | @@ -48,7 +48,7 @@ | ||
6 | env.ParseConfig('pkg-config --cflags --libs libxml-2.0') | ||
7 | env.ParseConfig('pkg-config --cflags --libs sqlite3') | ||
8 | env.Append(CCFLAGS = r'-I.') | ||
9 | - env.Append(CCFLAGS = [r'-Wall', r'-Werror']) | ||
10 | + env.Append(CCFLAGS = [r'-Wall']) | ||
11 | |||
12 | testenv = env.Copy() | ||
13 | testenv.Append(CCFLAGS = r'-I' + testenv.GetLaunchDir() + '/tests') | ||
diff --git a/meta/packages/opensync/libopensync/zlib.patch b/meta/packages/opensync/libopensync/zlib.patch deleted file mode 100644 index 89c10a85bc..0000000000 --- a/meta/packages/opensync/libopensync/zlib.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: trunk/opensync/SConscript | ||
2 | =================================================================== | ||
3 | --- trunk.orig/opensync/SConscript 2007-04-25 14:08:21.000000000 +0200 | ||
4 | +++ trunk/opensync/SConscript 2007-04-25 14:08:40.000000000 +0200 | ||
5 | @@ -149,6 +149,8 @@ | ||
6 | gmodule-2.0 | ||
7 | libxml2 | ||
8 | sqlite3 | ||
9 | +z | ||
10 | +m | ||
11 | """ | ||
12 | |||
13 | libopensync = env.SharedLibrary('opensync', Split(sources), LIBS = Split(Libraries)) | ||
diff --git a/meta/packages/opensync/libsyncml/remove-insane-assembler.patch b/meta/packages/opensync/libsyncml/remove-insane-assembler.patch deleted file mode 100644 index ad3ba01a2c..0000000000 --- a/meta/packages/opensync/libsyncml/remove-insane-assembler.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: libsyncml-0.4.7/tests/check_http.c | ||
2 | =================================================================== | ||
3 | --- libsyncml-0.4.7.orig/tests/check_http.c 2008-10-20 14:16:26.000000000 +0100 | ||
4 | +++ libsyncml-0.4.7/tests/check_http.c 2008-10-20 14:16:53.000000000 +0100 | ||
5 | @@ -221,7 +221,6 @@ | ||
6 | |||
7 | break; | ||
8 | default: | ||
9 | - __asm__("int $3"); | ||
10 | fail(NULL); | ||
11 | } | ||
12 | |||