diff --git a/libsoup-gir-repository-build.patch b/libsoup-gir-repository-build.patch new file mode 100644 index 0000000..65d8855 --- /dev/null +++ b/libsoup-gir-repository-build.patch @@ -0,0 +1,42 @@ +commit b304a99ddebbb14b231c4b288e303b3088d7041e +Author: Vincent Untz +Date: Thu Dec 3 15:35:58 2009 +0100 + + Make connection-created and tunneling of SoupSession use a GObject + + The connection-created and tunneling signals added to SoupSession in commit + 6ff7ecdd were using SoupConnection, and this made SoupConnection + semi-public (gir-repository failed to build because it didn't know about + it, for example). + + Since SoupConnection is intended to be private, use a GObject for the + signal parameter. + + https://bugzilla.gnome.org/show_bug.cgi?id=603696 + +diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c +index c4d3044..547db9f 100644 +--- a/libsoup/soup-session.c ++++ b/libsoup/soup-session.c +@@ -390,7 +390,9 @@ soup_session_class_init (SoupSessionClass *session_class) + NULL, NULL, + soup_marshal_NONE__OBJECT, + G_TYPE_NONE, 1, +- SOUP_TYPE_CONNECTION); ++ /* SoupConnection is public, so we can't use ++ * SOUP_TYPE_CONNECTION here */ ++ G_TYPE_OBJECT); + + signals[TUNNELING] = + g_signal_new ("tunneling", +@@ -400,7 +402,9 @@ soup_session_class_init (SoupSessionClass *session_class) + NULL, NULL, + soup_marshal_NONE__OBJECT, + G_TYPE_NONE, 1, +- SOUP_TYPE_CONNECTION); ++ /* SoupConnection is public, so we can't use ++ * SOUP_TYPE_CONNECTION here */ ++ G_TYPE_OBJECT); + + + /* properties */ diff --git a/libsoup.changes b/libsoup.changes index 8a616e7..67ac470 100644 --- a/libsoup.changes +++ b/libsoup.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 3 14:23:03 CET 2009 - vuntz@opensuse.org + +- Add libsoup-gir-repository-build.patch to fix the gir-repository + build. + ------------------------------------------------------------------- Wed Dec 2 01:27:54 CET 2009 - vuntz@opensuse.org diff --git a/libsoup.spec b/libsoup.spec index 5668c6d..876223e 100644 --- a/libsoup.spec +++ b/libsoup.spec @@ -36,42 +36,32 @@ Group: Development/Libraries/GNOME Obsoletes: libsoup-64bit %endif # -Summary: Simple Object Access Protocol (SOAP) +Summary: HTTP client/server library for GNOME Version: 2.29.3 Release: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM libsoup-gir-repository-build.patch bgo603696 vuntz@opensuse.org -- Needed to fix gir-repository build +Patch0: libsoup-gir-repository-build.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-2_4-1 = %{version} %description -Soup is a SOAP (Simple Object Access Protocol) implementation in C. +Libsoup is an HTTP client/server library for GNOME. It uses GObjects +and the glib main loop, to integrate well with GNOME applications. -It provides a queued asynchronous callback-based mechanism for sending -and servicing SOAP requests and a WSDL (Web Service Definition -Language) to C compiler that generates client stubs and server -skeletons for easily calling and implementing SOAP methods. - -It uses the Glib main loop and is designed to work well with GTK+ -applications. This enables GNOME applications to access SOAP servers -on the network in a completely asynchronous fashion, very similar to -the GTK+ programming model (a synchronous operation mode is also -supported for those who want it). - -The WSDL compiler helps you make your applications interoperate with -services that expose their descriptions through WSDL. - - - -Authors: --------- - Alex Graveley - Dick Porter - Miguel De Icaza +Features: + * Both asynchronous (GMainLoop and callback-based) and synchronous APIs + * Automatically caches connections + * SSL Support using GnuTLS + * Proxy support, including authentication and SSL tunneling + * Client support for Digest, NTLM, and Basic authentication + * Server support for Digest and Basic authentication + * XML-RPC support %package 2_4-1 License: LGPL v2.1 or later -Summary: Simple Object Access Protocol (SOAP) +Summary: HTTP client/server library for GNOME Group: Development/Libraries/GNOME Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -82,33 +72,21 @@ Obsoletes: libsoup-64bit # %description 2_4-1 -Soup is a SOAP (Simple Object Access Protocol) implementation in C. +Libsoup is an HTTP client/server library for GNOME. It uses GObjects +and the glib main loop, to integrate well with GNOME applications. -It provides a queued asynchronous callback-based mechanism for sending -and servicing SOAP requests and a WSDL (Web Service Definition -Language) to C compiler that generates client stubs and server -skeletons for easily calling and implementing SOAP methods. - -It uses the Glib main loop and is designed to work well with GTK+ -applications. This enables GNOME applications to access SOAP servers -on the network in a completely asynchronous fashion, very similar to -the GTK+ programming model (a synchronous operation mode is also -supported for those who want it). - -The WSDL compiler helps you make your applications interoperate with -services that expose their descriptions through WSDL. - - - -Authors: --------- - Alex Graveley - Dick Porter - Miguel De Icaza +Features: + * Both asynchronous (GMainLoop and callback-based) and synchronous APIs + * Automatically caches connections + * SSL Support using GnuTLS + * Proxy support, including authentication and SSL tunneling + * Client support for Digest, NTLM, and Basic authentication + * Server support for Digest and Basic authentication + * XML-RPC support %package devel License: LGPL v2.1 or later -Summary: Include Files and Libraries mandatory for Development. +Summary: HTTP client/server library for GNOME - Development Files Group: Development/Libraries/GNOME Requires: %{name} = %{version} glib2-devel libgnutls-devel libgcrypt-devel libgpg-error-devel libxml2-devel Provides: %{name}-doc = %{version} @@ -120,21 +98,21 @@ Obsoletes: libsoup-devel-64bit # %description devel -Soup is a SOAP (Simple Object Access Protocol) implementation in C. It -provides a queued, asynchronous callback-based mechanism for sending -SOAP requests. This package allows you to develop applications that use -the Soup library. +Libsoup is an HTTP client/server library for GNOME. It uses GObjects +and the glib main loop, to integrate well with GNOME applications. - - -Authors: --------- - Alex Graveley - Dick Porter - Miguel De Icaza +Features: + * Both asynchronous (GMainLoop and callback-based) and synchronous APIs + * Automatically caches connections + * SSL Support using GnuTLS + * Proxy support, including authentication and SSL tunneling + * Client support for Digest, NTLM, and Basic authentication + * Server support for Digest and Basic authentication + * XML-RPC support %prep %setup -q +%patch0 -p1 %build %configure\