rpms/evolution-webcal/devel evolution-webcal-2.12.0-libsoup2.4.patch, NONE, 1.1 evolution-webcal.spec, 1.37, 1.38

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/evolution-webcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15054

Modified Files:
	evolution-webcal.spec 
Added Files:
	evolution-webcal-2.12.0-libsoup2.4.patch 
Log Message:
- make source compilable against libsoup-2.4, patch from trunk (svn repository)


evolution-webcal-2.12.0-libsoup2.4.patch:

--- NEW FILE evolution-webcal-2.12.0-libsoup2.4.patch ---
diff -up evolution-webcal-2.12.0/src/evolution-webcal-notify.c.libsoup evolution-webcal-2.12.0/src/evolution-webcal-notify.c
--- evolution-webcal-2.12.0/src/evolution-webcal-notify.c.libsoup	2007-07-30 02:52:35.000000000 +0200
+++ evolution-webcal-2.12.0/src/evolution-webcal-notify.c	2008-01-30 13:51:47.000000000 +0100
@@ -249,7 +249,7 @@ void e_webcal_query_user (const gchar * 
   GtkWidget * rlabel, * clabel;
   GtkWidget * cbutton;
   GtkWidget * label, * button;
-  SoupUri * tmpuri;
+  SoupURI * tmpuri;
   gchar * tmpname;
   gchar * icofile, * mrkname, * ref_str;
   gint ref_timeout, ref_multi;
diff -up evolution-webcal-2.12.0/src/evolution-webcal-main.c.libsoup evolution-webcal-2.12.0/src/evolution-webcal-main.c
--- evolution-webcal-2.12.0/src/evolution-webcal-main.c.libsoup	2007-03-13 19:59:24.000000000 +0100
+++ evolution-webcal-2.12.0/src/evolution-webcal-main.c	2008-01-30 13:51:58.000000000 +0100
@@ -45,7 +45,7 @@ static void e_webcal_load (const gchar *
 
   comp = icalparser_parse_string (body);
   if (comp == NULL) {
-    SoupUri * tmpuri;
+    SoupURI * tmpuri;
     gchar * message, * tmpname;
 
     tmpuri = soup_uri_new (uri);
@@ -100,16 +100,15 @@ static void e_webcal_load (const gchar *
   bonobo_main_quit ();
 }
 
-static void e_webcal_read (SoupMessage * msg, gpointer data) {
-  const SoupUri * tmpuri;
+static void e_webcal_read (SoupSession *session, SoupMessage * msg, gpointer data) {
+  const SoupURI * tmpuri;
   const gchar * uri = (const gchar *) data;
   const gchar * header;
-  gchar * body;
 
   tmpuri = soup_message_get_uri (msg);
 
   if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) {
-    header = soup_message_get_header (msg->response_headers, "Location");
+    header = soup_message_headers_get (msg->response_headers, "Location");
     if (header) {
       e_webcal_open_cal_http (header, uri);
     }
@@ -154,9 +153,7 @@ static void e_webcal_read (SoupMessage *
     return;
   }
 
-  body = g_strndup (msg->response.body, msg->response.length);
-  e_webcal_load (body, uri);
-  g_free (body);
+  e_webcal_load (msg->response_body->data, uri);
 
   g_free (data);
 }
@@ -188,7 +185,7 @@ static void e_webcal_open_cal_http (cons
   soup_message_set_flags (message, SOUP_MESSAGE_NO_REDIRECT);
 
   soup_session_queue_message (session, message,
-			      (SoupMessageCallbackFn) e_webcal_read,
+			      (SoupSessionCallback) e_webcal_read,
 			      (gpointer) olduri);
 }
 


Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- evolution-webcal.spec	30 Jan 2008 11:39:00 -0000	1.37
+++ evolution-webcal.spec	30 Jan 2008 12:56:58 -0000	1.38
@@ -41,6 +41,8 @@
 BuildRequires: libsoup-devel >= %{libsoup_version}
 BuildRequires: perl(XML::Parser)
 
+Patch0: evolution-webcal-2.12.0-libsoup2.4.patch
+
 %description
 evolution-webcal is a small helper application that can be run when
 webcal URIs are clicked in web browsers.  It adds the calendar to your
@@ -49,10 +51,11 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .libsoup2.4
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -89,7 +92,7 @@
 
 %changelog
 * Wed Jan 30 2008 Adam Tkac <atkac redhat com> 2.12.0-2
-- rebuild against new libsoup
+- rebuild against new libsoup (libsoup2.4 patch is from trunk)
 
 * Tue Sep 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-1.fc8
 - Update to 2.12.0