15 Oct
2012
15 Oct
'12
3:47 a.m.
OpenSync 0.22 is fine - exactly this version is used
on
Debian / Ubuntu. But on the newer Ubuntu I note problems with build OpenSync 0.22
- as I wrote earlier. Therefore, it would be good if we could support the
newer version OpenSync that are included in newer distributions.
I discovered part of the problem.
With libopensync 0.22 the following are installed:
/usr/lib/pkgconfig/opensync-1.0.pc
/usr/lib/pkgconfig/osengine-1.0.pc
With libopensync 0.39 only the following is installed:
/usr/lib/pkgconfig/libopensync.pc
There are no osengine files installed with 0.39.
The following need patching to support both 0.22 and >=0.30:
tdepim/kitchensync/libqopensync/ConfigureChecks.cmake
tdepim/kitchensync/configure.in.in
I'm still testing (and ask others to do likewise), but here is my proposed patch:
=========================================
diff -urN tdepim/kitchensync/configure.in.in tdepim.new/kitchensync/configure.in.in
--- tdepim/kitchensync/configure.in.in 2012-09-14 18:01:26.000000000 -0500
+++ tdepim.new/kitchensync/configure.in.in 2012-10-14 22:42:40.000000000 -0500
@@ -31,7 +31,11 @@
HAVE_OPENSYNC=0
HAVE_OPENSYNC_ENGINE=0
PKG_CHECK_MODULES(OPENSYNC, opensync-1.0 >= 0.19, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0)
-PKG_CHECK_MODULES(OPENSYNCENGINE, osengine-1.0 >= 0.19, HAVE_OPENSYNC_ENGINE=1,
HAVE_OPENSYNC_ENGINE=0)
+if test "$HAVE_OPENSYNC" = 1; then
+ PKG_CHECK_MODULES(OPENSYNCENGINE, osengine-1.0 >= 0.19, HAVE_OPENSYNC_ENGINE=1,
HAVE_OPENSYNC_ENGINE=0)
+else
+ PKG_CHECK_MODULES(OPENSYNC, libopensync >= 0.19, HAVE_OPENSYNC=1,HAVE_OPENSYNC=0)
+fi
PKG_CHECK_MODULES(LIBXML, libxml-2.0, , HAVE_OPENSYNC=0)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, , HAVE_OPENSYNC=0)
diff -urN tdepim/kitchensync/libqopensync/ConfigureChecks.cmake
tdepim.new/kitchensync/libqopensync/ConfigureChecks.cmake
--- tdepim/kitchensync/libqopensync/ConfigureChecks.cmake 2012-09-14 18:01:26.000000000
-0500
+++ tdepim.new/kitchensync/libqopensync/ConfigureChecks.cmake 2012-10-14
22:39:45.000000000 -0500
@@ -13,10 +13,13 @@
pkg_search_module( OPENSYNC opensync-1.0 )
if( NOT OPENSYNC_FOUND )
- tde_message_fatal( "opensync-1.0 is requested, but was not found on your
system" )
-endif( )
-
-pkg_search_module( OSENGINE osengine-1.0 )
-if( NOT OSENGINE_FOUND )
- tde_message_fatal( "osengine-1.0 is requested, but was not found on your
system" )
+ pkg_search_module( OPENSYNC libopensync )
+ if( NOT OPENSYNC_FOUND )
+ tde_message_fatal( "libopensync is requested, but was not found on your
system" )
+ endif( )
+else()
+ pkg_search_module( OSENGINE osengine-1.0 )
+ if( NOT OSENGINE_FOUND )
+ tde_message_fatal( "osengine-1.0 is requested, but was not found on your
system" )
+ endif( )
endif( )
=========================================
Darrell