rev 12135 - in branches/kde4/packages/kdepim/debian: . patches

[Armin Berres]

Author: trigger-guest
Date: 2008-09-10 22:31:26 +0000 (Wed, 10 Sep 2008)
New Revision: 12135

Added:
   branches/kde4/packages/kdepim/debian/patches/01_at_least_build_against_new_opensync.diff
Modified:
   branches/kde4/packages/kdepim/debian/changelog
   branches/kde4/packages/kdepim/debian/patches/series
Log:
Add patch to at least build against latest opensync. Functionality
of Kitchensync is not guaranteed anymore.

Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog	2008-09-10 22:24:38 UTC (rev 12134)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-09-10 22:31:26 UTC (rev 12135)
@@ -8,8 +8,10 @@
 
   * Change shlibs to enforce a strict dependency on the libraries which
     are shipped with kdepim (Closes: #498371).
+  * Add patch to at least build against latest opensync. Functionality
+    of Kitchensync is not guaranteed anymore.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Sep 2008 00:15:16 +0200
+ -- Armin Berres <trigger+debian at space-based.de>  Thu, 11 Sep 2008 00:21:47 +0200
 
 kdepim (4:4.1.1-1) experimental; urgency=low
 

Added: branches/kde4/packages/kdepim/debian/patches/01_at_least_build_against_new_opensync.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/01_at_least_build_against_new_opensync.diff	                        (rev 0)
+++ branches/kde4/packages/kdepim/debian/patches/01_at_least_build_against_new_opensync.diff	2008-09-10 22:31:26 UTC (rev 12135)
@@ -0,0 +1,40 @@
+The name should say it all.
+--- a/cmake/modules/FindOpensync.cmake
++++ b/cmake/modules/FindOpensync.cmake
+@@ -17,7 +17,7 @@ else (OPENSYNC_INCLUDE_DIRS AND OPENSYNC
+   IF (NOT WIN32)
+     # use pkg-config to get the directories and then use these values
+     # in the FIND_PATH() and FIND_LIBRARY() calls
+-    PKG_CHECK_MODULES(OPENSYNC opensync-1.0>=0.33)
++    PKG_CHECK_MODULES(OPENSYNC libopensync>=0.37)
+   ENDIF(NOT WIN32)
+ 
+   include(FindPackageHandleStandardArgs)
+--- a/kitchensync/libqopensync/member.cpp
++++ b/kitchensync/libqopensync/member.cpp
+@@ -94,21 +94,21 @@ void Member::setConfiguration( const QBy
+ {
+   Q_ASSERT( mMember );
+ 
+-  osync_member_set_config( mMember, configurationData.data() );
++//  osync_member_set_config( mMember, configurationData.data() );
+ }
+ 
+ Result Member::configuration( QByteArray &configurationData, bool useDefault ) const
+ {
+   Q_ASSERT( mMember );
+ 
+-  const char *data;
++  const char *data = 0;
+   int size;
+ 
+   OSyncError *error = 0;
+   if ( useDefault ) {
+-    data = osync_member_get_config_or_default( mMember, &error );
++//    data = osync_member_get_config_or_default( mMember, &error );
+   } else {
+-    data = osync_member_get_config( mMember, &error );
++//    data = osync_member_get_config( mMember, &error );
+   }
+ 
+   if ( !data ) {

Modified: branches/kde4/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/series	2008-09-10 22:24:38 UTC (rev 12134)
+++ branches/kde4/packages/kdepim/debian/patches/series	2008-09-10 22:31:26 UTC (rev 12135)
@@ -1,2 +1,3 @@
+01_at_least_build_against_new_opensync.diff
 30_debianize_akregator_default.diff
 97_fix_target_link_libraries.diff