Hello community, here is the log from the commit of package libopensync-plugin-opie checked in at Wed Apr 2 21:53:16 CEST 2008. -------- --- libopensync-plugin-opie/libopensync-plugin-opie.changes 2007-08-15 17:54:35.000000000 +0200 +++ libopensync-plugin-opie/libopensync-plugin-opie.changes 2008-04-01 15:27:12.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 1 15:27:00 CEST 2008 - mmarek@suse.cz + +- fixed build with new curl + +------------------------------------------------------------------- New: ---- libopensync-plugin-opie-0.22-curl-callbacks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopensync-plugin-opie.spec ++++++ --- /var/tmp/diff_new_pack.CB7152/_old 2008-04-02 21:52:39.000000000 +0200 +++ /var/tmp/diff_new_pack.CB7152/_new 2008-04-02 21:52:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libopensync-plugin-opie (Version 0.22) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,16 +10,18 @@ # norootforbuild + Name: libopensync-plugin-opie BuildRequires: curl-devel glib2-devel libopensync-devel libxml2-devel openssl-devel sqlite-devel -URL: http://www.opensync.org +Url: http://www.opensync.org Version: 0.22 -Release: 36 +Release: 101 Summary: Opie Synchronization Plug-In for OpenSync License: GPL v2 or later Group: Productivity/Other -Autoreqprov: on +AutoReqProv: on Source: %{name}-%{version}.tar.bz2 +Patch1: libopensync-plugin-opie-0.22-curl-callbacks.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: sqlite curl libxml2 openssl glib2 %define prefix /usr @@ -39,6 +41,7 @@ %prep %setup -q +%patch1 autoreconf -sfi %build @@ -66,17 +69,19 @@ %doc AUTHORS COPYING README NEWS %changelog -* Thu Mar 29 2007 - cstender@suse.de +* Tue Apr 01 2008 mmarek@suse.cz +- fixed build with new curl +* Thu Mar 29 2007 cstender@suse.de - updated to version 0.22 o fixed missing call to osync_change_set_member o added initial support for syncing notes o added support for recurrence of todos -* Mon Nov 06 2006 - cstender@suse.de +* Mon Nov 06 2006 cstender@suse.de - updated to version 0.20 o fixed build against new libopensync timeapi o fixed build against new glib version (change of GTime) o avoid gcc warnings (-Wno-pointer-sign) -* Tue Oct 10 2006 - cstender@suse.de +* Tue Oct 10 2006 cstender@suse.de - updated to version 0.19 o changed license to GPL o replaced xmlNewChild with xmlNewTextChild @@ -84,5 +89,5 @@ o added initial todo handling code o fixed some memory leaks o several bugfixes -* Mon Feb 06 2006 - dgollub@suse.de +* Mon Feb 06 2006 dgollub@suse.de - initial version of opensync plugin opie (0.18_SVN815) ++++++ libopensync-plugin-opie-0.22-curl-callbacks.patch ++++++ --- src/opie_comms.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- src/opie_comms.c.orig +++ src/opie_comms.c @@ -64,10 +64,10 @@ const char *OPIE_TODO_FILE = "Applic const char *OPIE_CALENDAR_FILE = "Applications/datebook/datebook.xml"; const char *OPIE_CATEGORY_FILE = "Settings/Categories.xml"; -int opie_curl_fwrite(void* buffer, size_t size, size_t nmemb, void* stream); -int opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream); -int opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream); -int opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream); +size_t opie_curl_fwrite(void* buffer, size_t size, size_t nmemb, void* stream); +size_t opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream); +size_t opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream); +size_t opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream); gboolean ftp_fetch_files(OpieSyncEnv* env, GList* files_to_fetch); gboolean scp_fetch_files(OpieSyncEnv* env, GList* files_to_fetch); gboolean ftp_put_files(OpieSyncEnv* env, GList* files_to_put); @@ -1146,7 +1146,7 @@ gboolean scp_put_files(OpieSyncEnv* env, /* * opie_curl_fwrite */ -int opie_curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) +size_t opie_curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) { size_t written = fwrite(buffer, size, nmemb, (FILE *)stream); return written; @@ -1155,7 +1155,7 @@ int opie_curl_fwrite(void *buffer, size_ /* * opie_curl_strwrite */ -int opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream) +size_t opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream) { g_string_append_len((GString *)stream, buffer, size * nmemb); return size * nmemb; @@ -1164,7 +1164,7 @@ int opie_curl_strwrite(void *buffer, siz /* * opie_curl_nullwrite */ -int opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream) +size_t opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream) { return size * nmemb; } @@ -1172,13 +1172,13 @@ int opie_curl_nullwrite(void *buffer, si /* * opie_curl_strread */ -int opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream) +size_t opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream) { char *str = ((char *)stream) + m_totalwritten; if(str[0] == '\0') return 0; - int numbytes = strlen(str); + size_t numbytes = strlen(str); if(numbytes >= (nmemb * size)) numbytes = (nmemb * size); memcpy(buffer, str, numbytes); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org