- Add patch from git to fix gir-repository build

This commit is contained in:
Dan Winship 2009-12-09 16:23:12 +00:00
parent ca23bf5cc4
commit e4de5772ef
2 changed files with 54 additions and 1 deletions

View File

@ -0,0 +1,47 @@
From b304a99ddebbb14b231c4b288e303b3088d7041e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Thu, 3 Dec 2009 15:35:58 +0100
Subject: [PATCH] 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
---
libsoup/soup-session.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
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 */
--
1.6.5.2

View File

@ -4,7 +4,7 @@
Name: libsoup
Version: 2.29.3
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2
Group: Development/Libraries
Summary: Soup, an HTTP library implementation
@ -12,6 +12,8 @@ URL: http://live.gnome.org/LibSoup
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source: http://download.gnome.org/sources/libsoup/2.28/libsoup-%{version}.tar.bz2
Patch0: libsoup-2.29.3-introspectability.patch
### Build Dependencies ###
BuildRequires: glib2-devel >= %{glib2_version}
@ -48,6 +50,7 @@ you to develop applications that use the libsoup library.
%prep
%setup -q
%patch0 -p1 -b .introspectability
%build
%configure
@ -85,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/%{name}-2.4
%changelog
* Wed Dec 9 2009 Dan Winship <danw@redhat.com> - 2.29.3-2
- Add patch from git to fix gir-repository build
* Tue Dec 01 2009 Bastien Nocera <bnocera@redhat.com> 2.29.3-1
- Update to 2.29.3