[mingw-libsoup] Update to 2.48.0

[Kalev Lember]

commit 32cf9371814285044b3c75f19221f290671e449e
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Oct 14 21:09:25 2014 +0200

    Update to 2.48.0

 .gitignore                                         |    1 +
 0001-Fix-build-on-Windows.patch                    |   27 ++++++++++++++++++++
 ...libsoup-2.4.sym-remove-nonexistent-symbol.patch |   27 ++++++++++++++++++++
 mingw-libsoup.spec                                 |   14 +++++++++-
 sources                                            |    2 +-
 5 files changed, 68 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ad14a4..b5482ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ libsoup-2.28.1.tar.bz2
 /libsoup-2.43.90.tar.xz
 /libsoup-2.44.2.tar.xz
 /libsoup-2.46.0.tar.xz
+/libsoup-2.48.0.tar.xz
diff --git a/0001-Fix-build-on-Windows.patch b/0001-Fix-build-on-Windows.patch
new file mode 100644
index 0000000..f40849c
--- /dev/null
+++ b/0001-Fix-build-on-Windows.patch
@@ -0,0 +1,27 @@
+From ed5bad0c1fa180640b1e46f47d26f56953839d40 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Tue, 14 Oct 2014 22:45:18 +0200
+Subject: [PATCH] Fix build on Windows
+
+Avoid the use of 'interface' variable name in public headers to avoid
+conflicting with the "#define interface struct" that Windows headers do.
+---
+ libsoup/soup-server.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-server.h b/libsoup/soup-server.h
+index 79f6002..2cbd7d1 100644
+--- a/libsoup/soup-server.h
++++ b/libsoup/soup-server.h
+@@ -80,7 +80,7 @@ gboolean        soup_server_is_https           (SoupServer               *server
+ 
+ SOUP_AVAILABLE_IN_2_48
+ gboolean        soup_server_listen             (SoupServer               *server,
+-					        GSocketAddress           *interface,
++					        GSocketAddress           *address,
+ 					        SoupServerListenOptions   options,
+ 					        GError                  **error);
+ SOUP_AVAILABLE_IN_2_48
+-- 
+2.1.0
+
diff --git a/0001-libsoup-2.4.sym-remove-nonexistent-symbol.patch b/0001-libsoup-2.4.sym-remove-nonexistent-symbol.patch
new file mode 100644
index 0000000..7382e38
--- /dev/null
+++ b/0001-libsoup-2.4.sym-remove-nonexistent-symbol.patch
@@ -0,0 +1,27 @@
+From f26aa561909f976a946c98d7aaba98543e125499 Mon Sep 17 00:00:00 2001
+From: Kouhei Sutou <kou at clear-code.com>
+Date: Mon, 6 Oct 2014 21:32:13 +0900
+Subject: [PATCH] libsoup-2.4.sym: remove nonexistent symbol
+
+It was added accidentally at 1c71cb223b00eaa5c776229d9e0312ba852ef87a
+
+https://bugzilla.gnome.org/show_bug.cgi?id=738003
+---
+ libsoup/libsoup-2.4.sym | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libsoup/libsoup-2.4.sym b/libsoup/libsoup-2.4.sym
+index d1b8388..3dd92dd 100644
+--- a/libsoup/libsoup-2.4.sym
++++ b/libsoup/libsoup-2.4.sym
+@@ -348,7 +348,6 @@ soup_server_disconnect
+ soup_server_get_async_context
+ soup_server_get_listener
+ soup_server_get_listeners
+-soup_server_get_gsocket
+ soup_server_get_port
+ soup_server_get_type
+ soup_server_get_uris
+-- 
+2.1.0
+
diff --git a/mingw-libsoup.spec b/mingw-libsoup.spec
index ebcda0c..55815ef 100644
--- a/mingw-libsoup.spec
+++ b/mingw-libsoup.spec
@@ -4,8 +4,8 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:		mingw-libsoup
-Version:	2.46.0
-Release:	2%{?dist}
+Version:	2.48.0
+Release:	1%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
 License:	LGPLv2
@@ -13,6 +13,11 @@ Group:		Development/Libraries
 URL:		http://live.gnome.org/LibSoup
 Source0:	http://download.gnome.org/sources/libsoup/%{release_version}/libsoup-%{version}.tar.xz
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=738551
+Patch0:		0001-Fix-build-on-Windows.patch
+# Backported from upstream
+Patch1:		0001-libsoup-2.4.sym-remove-nonexistent-symbol.patch
+
 BuildArch:	noarch
 
 BuildRequires:	mingw32-filesystem >= 95
@@ -106,6 +111,8 @@ Static version of the MinGW Windows Libsoup library.
 
 %prep
 %setup -q -n libsoup-%{version}
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -181,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
 
 %changelog
+* Tue Oct 14 2014 Kalev Lember <kalevlember at gmail.com> - 2.48.0-1
+- Update to 2.48.0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.46.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 503a523..03f064d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86765c0093efaf3006fa2960d170d097  libsoup-2.46.0.tar.xz
+51ccb76f5262945e1f0316fdc46de567  libsoup-2.48.0.tar.xz