From b6e43a2e89bcfd40dac884639d6560f15aaf1a1e Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 25 Apr 2007 12:39:49 +0000
Subject: libopensync: make SVN version buildable (disabled by default)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1556 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/opensync/libopensync/fix-attr.patch  | 13 ++++++++++
 meta/packages/opensync/libopensync/gcc.patch       | 29 ++++++++++++++++++++++
 meta/packages/opensync/libopensync/no-werror.patch | 13 ++++++++++
 meta/packages/opensync/libopensync/zlib.patch      | 13 ++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 meta/packages/opensync/libopensync/fix-attr.patch
 create mode 100644 meta/packages/opensync/libopensync/gcc.patch
 create mode 100644 meta/packages/opensync/libopensync/no-werror.patch
 create mode 100644 meta/packages/opensync/libopensync/zlib.patch

(limited to 'meta/packages/opensync/libopensync')

diff --git a/meta/packages/opensync/libopensync/fix-attr.patch b/meta/packages/opensync/libopensync/fix-attr.patch
new file mode 100644
index 000000000..7a2e5441c
--- /dev/null
+++ b/meta/packages/opensync/libopensync/fix-attr.patch
@@ -0,0 +1,13 @@
+Index: trunk/opensync/merger/opensync_xmlfield.c
+===================================================================
+--- trunk.orig/opensync/merger/opensync_xmlfield.c	2007-04-12 16:40:07.000000000 +0200
++++ trunk/opensync/merger/opensync_xmlfield.c	2007-04-12 16:40:11.000000000 +0200
+@@ -298,7 +298,7 @@
+ 	int count;
+ 	xmlAttrPtr attr = xmlfield->node->properties;
+ 	
+-	for(count=0; attribute != NULL; count++) {
++	for(count=0; attr != NULL; count++) {
+ 		if(count == nth)
+ 			return (const char *)attr->name;
+ 		attr = attr->next;
diff --git a/meta/packages/opensync/libopensync/gcc.patch b/meta/packages/opensync/libopensync/gcc.patch
new file mode 100644
index 000000000..3eee01433
--- /dev/null
+++ b/meta/packages/opensync/libopensync/gcc.patch
@@ -0,0 +1,29 @@
+Index: trunk/SConstruct
+===================================================================
+--- trunk.orig/SConstruct	2007-04-25 13:20:13.000000000 +0200
++++ trunk/SConstruct	2007-04-25 14:00:02.000000000 +0200
+@@ -36,7 +36,11 @@
+ opts.Add(BoolOption('enable_python', 'Build python wrapper? (swig required)', 0))
+ opts.Add(BoolOption('debug_modules', 'Should unloading of shared modules be avoided (DEBUGGING ONLY!)', 0))
+ opts.Add(BoolOption('enable_doxygen', 'Generating OpenSync API with doxygen?', 0))
+-
++opts.AddOptions(
++('CC', 'Path to Custom c compiler', 'gcc'),
++('CXX', 'Path to Custom c++ compiler flags', 'g++'),
++('LDFLAGS', 'Linker flags', ''),
++)
+ 
+ target_dir = SelectBuildDir('build')
+ sys.path.append(target_dir)
+@@ -63,6 +67,11 @@
+ env.Append(CCFLAGS = r'-DENABLE_TOOLS=$enable_tools')
+ env.Append(CCFLAGS = r'-DENABLE_PROFILING=$enable_profiling')
+ 
++env.Replace(
++       CC = env['CC'],
++       CXX = env['CXX'],
++       LDFLAGS = env['LDFLAGS']
++)
+ 
+ # pkg config files
+ subst_dict={'@prefix@': '$prefix',
diff --git a/meta/packages/opensync/libopensync/no-werror.patch b/meta/packages/opensync/libopensync/no-werror.patch
new file mode 100644
index 000000000..523ceaaeb
--- /dev/null
+++ b/meta/packages/opensync/libopensync/no-werror.patch
@@ -0,0 +1,13 @@
+Index: trunk/build/linux/osync_build.py
+===================================================================
+--- trunk.orig/build/linux/osync_build.py	2007-04-25 13:28:44.000000000 +0200
++++ trunk/build/linux/osync_build.py	2007-04-25 13:28:54.000000000 +0200
+@@ -48,7 +48,7 @@
+ 	env.ParseConfig('pkg-config --cflags --libs libxml-2.0')
+ 	env.ParseConfig('pkg-config --cflags --libs sqlite3')
+ 	env.Append(CCFLAGS = r'-I.')
+-	env.Append(CCFLAGS = [r'-Wall', r'-Werror'])
++	env.Append(CCFLAGS = [r'-Wall'])
+ 	
+ 	testenv = env.Copy()
+ 	testenv.Append(CCFLAGS = r'-I' + testenv.GetLaunchDir() + '/tests')
diff --git a/meta/packages/opensync/libopensync/zlib.patch b/meta/packages/opensync/libopensync/zlib.patch
new file mode 100644
index 000000000..89c10a85b
--- /dev/null
+++ b/meta/packages/opensync/libopensync/zlib.patch
@@ -0,0 +1,13 @@
+Index: trunk/opensync/SConscript
+===================================================================
+--- trunk.orig/opensync/SConscript	2007-04-25 14:08:21.000000000 +0200
++++ trunk/opensync/SConscript	2007-04-25 14:08:40.000000000 +0200
+@@ -149,6 +149,8 @@
+ gmodule-2.0
+ libxml2
+ sqlite3
++z
++m
+ """
+ 
+ libopensync = env.SharedLibrary('opensync', Split(sources), LIBS = Split(Libraries))
-- 
cgit v1.2.3