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

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	libopensync-plugin-kdepim-0.22-kde4.patch 
Log Message:
More 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 07:06:17 -0000	1.3
+++ libopensync-plugin-kdepim-0.22-kde4.patch	2 Apr 2009 07:23:03 -0000	1.4
@@ -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 08:59:40.000000000 +0200
++++ libopensync-plugin-kdepim-0.22-kde4/src/kaddrbook.cpp	2009-04-02 09:20:52.000000000 +0200
 @@ -28,8 +28,8 @@
  
  #include "kaddrbook.h"
@@ -77,6 +77,24 @@
  
  	QString hash = calc_hash(*a);
  
+@@ -154,7 +155,7 @@
+ 	// only vcard3.0 exports Categories
+ 	QString tmp = converter->createVCard(*a, VCardConverter::v3_0);
+ 
+-	char *data = strdup((const char *)tmp.utf8());
++	char *data = strdup((const char *)tmp.toUtf8());
+ 
+ 	osync_trace(TRACE_SENSITIVE,"\n%s", data);
+ 
+@@ -164,7 +165,7 @@
+ 	osync_change_set_objtype_string(chg, "contact");
+ 	osync_change_set_objformat_string(chg, "vcard30");
+ 
+-	osync_change_set_hash(chg, hash.data());
++	osync_change_set_hash(chg, hash.toUtf8());
+ 
+ 	return (chg);
+ }
 @@ -223,7 +224,7 @@
  	OSyncChangeType chtype = osync_change_get_changetype(chg);
  	switch(chtype) {