merge of '0675e9a3e7f3d9faa1311df4548be2e200c02760'

     and 'ed7f086a6f3dc6bc06899e467a960cd37d7f2a9c'

3 files changed, 54 insertions, 0 deletions

diff --git a/packages/opensync/libopensync-0.36/build-in-src.patch b/packages/opensync/libopensync-0.36/build-in-src.patch
new file mode 100644
index 0000000000..1810b339a6
--- /dev/null
+++ b/packages/opensync/libopensync-0.36/build-in-src.patch
@@ -0,0 +1,18 @@
+---
+ cmake/OpenSyncInternal.cmake.in |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in
++++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in
+@@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting )
+ INCLUDE( OpenSyncPackaging )
+ INCLUDE( OpenSyncPlugin )
+ INCLUDE( OpenSyncPlatforms )
+ INCLUDE( MacroEnsureOutOfSourceBuild )
+ 
+-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
+ 
+ 
+ SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" )
+ SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" )
+ SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" )
diff --git a/packages/opensync/libopensync-0.36/cmake.patch b/packages/opensync/libopensync-0.36/cmake.patch
new file mode 100644
index 0000000000..0884e4cb79
--- /dev/null
+++ b/packages/opensync/libopensync-0.36/cmake.patch
@@ -0,0 +1,18 @@
+---
+ opensync/CMakeLists.txt |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/opensync/CMakeLists.txt
++++ libopensync-0.36/opensync/CMakeLists.txt
+@@ -55,11 +55,10 @@ SET( libopensync_LIB_SRCS
+ ADD_LIBRARY( opensync SHARED ${libopensync_LIB_SRCS} )
+ 
+ TARGET_LINK_LIBRARIES( opensync ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES} )
+ 
+ SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+-SET_TARGET_PROPERTIES( opensync PROPERTIES LINK_FLAGS ${SYMBOLS_VISIBILITY} )
+ 
+ IF ( OPENSYNC_UNITTESTS )
+ 	ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} )
+ 	TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${SQLITE3_LIBRARIES} )
+ ENDIF ( OPENSYNC_UNITTESTS )
diff --git a/packages/opensync/libopensync-0.36/no-python-check.patch b/packages/opensync/libopensync-0.36/no-python-check.patch
new file mode 100644
index 0000000000..08a53cb9eb
--- /dev/null
+++ b/packages/opensync/libopensync-0.36/no-python-check.patch
@@ -0,0 +1,18 @@
+---
+ CMakeLists.txt |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- libopensync-0.36.orig/CMakeLists.txt
++++ libopensync-0.36/CMakeLists.txt
+@@ -26,11 +26,10 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BIN
+ 
+ FIND_PACKAGE( GLIB2 REQUIRED )
+ FIND_PACKAGE( Sqlite3 REQUIRED )
+ FIND_PACKAGE( LibXml2 REQUIRED )
+ FIND_PACKAGE( SWIG )	
+-FIND_PACKAGE( PythonLibs )
+ FIND_PACKAGE( Check )
+ 
+ ADD_SUBDIRECTORY( opensync )
+ ADD_SUBDIRECTORY( formats )
+ ADD_SUBDIRECTORY( tools )