diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-10-20 12:10:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-10-20 12:10:53 +0000 |
| commit | 14e3c93c80b3817690dae6cbbb24de96126e1ad1 (patch) | |
| tree | bc7d459934d82cee69dfa6e059ab3fd2e6bec5c2 /meta | |
| parent | 22170fe71182c7da0ae14fb3101be1c474753c64 (diff) | |
| download | openembedded-core-14e3c93c80b3817690dae6cbbb24de96126e1ad1.tar.gz openembedded-core-14e3c93c80b3817690dae6cbbb24de96126e1ad1.tar.bz2 openembedded-core-14e3c93c80b3817690dae6cbbb24de96126e1ad1.zip | |
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
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch | 23 | ||||
| -rw-r--r-- | meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb | 4 |
2 files changed, 27 insertions, 0 deletions
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" |