From: Richard Purdie <richard@openedhand.com>
Date: Mon, 20 Oct 2008 12:10:53 +0000 (+0000)
Subject: libopensync-plugin-evolution2: Fix to work with libopensync 0.37
X-Git-Tag: 2011-1~7981
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=14e3c93c80b3817690dae6cbbb24de96126e1ad1;p=openembedded-core.git

libopensync-plugin-evolution2: Fix to work with libopensync 0.37

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5543 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch b/meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
new file mode 100644
index 0000000000..4a1802ce17
--- /dev/null
+++ b/meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
@@ -0,0 +1,23 @@
+Index: libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake
+===================================================================
+--- libopensync-plugin-evolution2-0.36.orig/cmake/modules/FindOpenSync.cmake	2008-10-20 13:07:14.000000000 +0100
++++ libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake	2008-10-20 13:08:09.000000000 +0100
+@@ -23,15 +23,15 @@
+ ENDIF ( OpenSync_FIND_REQUIRED )
+ 
+ IF ( OPENSYNC_MIN_VERSION )
+-	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0>=${OPENSYNC_MIN_VERSION} )
++	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync>=${OPENSYNC_MIN_VERSION} )
+ ELSE ( OPENSYNC_MIN_VERSION )
+-	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0 )
++	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync )
+ ENDIF ( OPENSYNC_MIN_VERSION )
+ 
+ FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config )
+ 
+ IF ( PKGCONFIG_EXECUTABLE )
+-	EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS opensync-1.0 --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
++	EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libopensync --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
+ 	STRING( REGEX REPLACE "[\r\n]" " " _opensync_data_DIR "${_opensync_data_DIR}"  )
+ ENDIF ( PKGCONFIG_EXECUTABLE )
+ 
diff --git a/meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb b/meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb
index da4ecb80b3..a1c4cb1887 100644
--- a/meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb
+++ b/meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb
@@ -1,3 +1,7 @@
 require libopensync-plugin_0.36.inc
 
 DEPENDS += " eds-dbus"
+
+SRC_URI += "file://0.37-fixes.patch;patch=1"
+
+PR = "r1"