rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim-0.22-kde4.patch, 1.2, 1.3

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20094/devel

Modified Files:
	libopensync-plugin-kdepim-0.22-kde4.patch 
Log Message:
Build fixes.

libopensync-plugin-kdepim-0.22-kde4.patch:

Index: libopensync-plugin-kdepim-0.22-kde4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim-0.22-kde4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 06:26:56 -0000	1.2
+++ libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 07:06:17 -0000	1.3
@@ -39,7 +39,7 @@
  AC_OUTPUT
 diff -ur libopensync-plugin-kdepim-0.22/src/kaddrbook.cpp libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp
 --- libopensync-plugin-kdepim-0.22/src/kaddrbook.cpp	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp	2009-04-02 07:48:44.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp	2009-04-02 08:59:40.000000000 +0200
 @@ -28,8 +28,8 @@
  
  #include "kaddrbook.h"
@@ -68,6 +68,15 @@
  
  	//get a handle to the standard KDE addressbook
  	addressbookptr = StdAddressBook::self(true);
+@@ -146,7 +147,7 @@
+ 	QString uid = a->uid();
+ 
+ 	osync_change_set_member(chg, member);
+-	osync_change_set_uid(chg, uid.local8Bit());
++	osync_change_set_uid(chg, uid.toLocal8Bit());
+ 
+ 	QString hash = calc_hash(*a);
+ 
 @@ -223,7 +224,7 @@
  	OSyncChangeType chtype = osync_change_get_changetype(chg);
  	switch(chtype) {
@@ -82,8 +91,9 @@
  
  			QString hash = calc_hash(addressee);
 -			osync_change_set_hash(chg, hash);
+-			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.local8Bit());
 +			osync_change_set_hash(chg, hash.toUtf8());
- 			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.local8Bit());
++			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY UPDATED (UID=%s)", (const char *)uid.toLocal8Bit());
  			break;
  		}
  		case CHANGE_ADDED: {
@@ -92,18 +102,33 @@
  
  			// ensure it has the correct revision
  			addressee.setRevision(QDateTime::currentDateTime());
-@@ -250,7 +251,7 @@
- 			osync_change_set_uid(chg, addressee.uid().local8Bit());
+@@ -247,11 +248,11 @@
+ 			// add the new address to the addressbook
+ 			addressbookptr->insertAddressee(addressee);
+ 
+-			osync_change_set_uid(chg, addressee.uid().local8Bit());
++			osync_change_set_uid(chg, addressee.uid().toLocal8Bit());
  
  			QString hash = calc_hash(addressee);
 -			osync_change_set_hash(chg, hash);
+-			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().local8Bit());
 +			osync_change_set_hash(chg, hash.toUtf8());
- 			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().local8Bit());
++			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY ADDED (UID=%s)", (const char *)addressee.uid().toLocal8Bit());
+ 			break;
+ 		}
+ 		case CHANGE_DELETED: {
+@@ -266,7 +267,7 @@
+ 			if(!addressee.isEmpty())
+ 				addressbookptr->removeAddressee(addressee);
+ 
+-			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY DELETED (UID=%s)", (const char*)uid.local8Bit());
++			osync_debug("kde", 3, "KDE ADDRESSBOOK ENTRY DELETED (UID=%s)", (const char*)uid.toLocal8Bit());
+ 
  			break;
  		}
 diff -ur libopensync-plugin-kdepim-0.22/src/kcal.cpp libopensync-plugin-kdepim-0.22-kde4/src/kcal.cpp
 --- libopensync-plugin-kdepim-0.22/src/kcal.cpp	2007-03-27 13:49:57.000000000 +0200
-+++ libopensync-plugin-kdepim-0.22-kde4/src/kcal.cpp	2009-04-02 08:02:40.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/kcal.cpp	2009-04-02 09:04:50.000000000 +0200
 @@ -26,7 +26,7 @@
  #include "kcal.h"
  
@@ -154,9 +179,52 @@
  		//e->setLastModified(&d);
  	}
  	/*FIXME: not i18ned string */
-@@ -263,10 +259,10 @@
+@@ -122,17 +118,17 @@
+ 
+ 	/* Build a local calendar for the incidence data */
+ 	KCal::CalendarLocal cal(calendar->timeZoneId());
+-	osync_debug("kcal", 3, "timezoneid: %s\n", (const char*)cal.timeZoneId().local8Bit());
++	osync_debug("kcal", 3, "timezoneid: %s\n", (const char*)cal.timeZoneId().toLocal8Bit());
+ 	cal.addIncidence(e->clone());
+ 
+ 	/* Convert the data to vcalendar */
+ 	KCal::ICalFormat format;
+-	QCString datastr = format.toString(&cal).utf8();
++	QByteArray datastr = format.toString(&cal).toUtf8();
+ 	const char *data = datastr;
+ 
+-	osync_debug("kcal", 3, "UID: %s\n", (const char*)uid.local8Bit());
++	osync_debug("kcal", 3, "UID: %s\n", (const char*)uid.toLocal8Bit());
+ 	OSyncChange *chg = osync_change_new();
+-	osync_change_set_uid(chg, uid.local8Bit());
++	osync_change_set_uid(chg, uid.toLocal8Bit());
+ 	osync_change_set_member(chg, member);
+ 
+ 	// object type and format
+@@ -142,7 +138,7 @@
+ 
+ 	// Use the hash table to check if the object
+ 	// needs to be reported
+-	osync_change_set_hash(chg, hash.data());
++	osync_change_set_hash(chg, hash.toUtf8());
+ 	if (osync_hashtable_detect_change(hashtable, chg)) {
+ 		osync_context_report_change(ctx, chg);
+ 		osync_hashtable_update_hash(hashtable, chg);
+@@ -191,7 +187,7 @@
+ 	}
+ 
+ 	for (KCal::Todo::List::ConstIterator i = todos.begin(); i != todos.end(); i++) {
+-		osync_debug("kcal", 3, "%p: doesFloat: %d", *i, (*i)->doesFloat());
++		osync_debug("kcal", 3, "%p: doesFloat: %d", *i, (*i)->allDay());
+ 		if (!report_incidence(ctx, *i, "todo", "vtodo20"))
+ 			return false;
+ 	}
+@@ -261,12 +257,12 @@
+ 					e->setUid(osync_change_get_uid(chg));
+ 
  				osync_debug("kcal", 3, "Writing incidence: uid: %s, summary: %s",
- 						(const char*)e->uid().local8Bit(), (const char*)e->summary().local8Bit());
+-						(const char*)e->uid().local8Bit(), (const char*)e->summary().local8Bit());
++						(const char*)e->uid().toLocal8Bit(), (const char*)e->summary().toLocal8Bit());
  
 -				QString c_uid = e->uid().utf8();
 -				osync_change_set_uid(chg, (const char*)c_uid);