kalev pushed to mingw-libsoup (f21). "Update to 2.48.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 12 15:07:40 UTC 2015


>From e8c6636da1ddb6c2624bf3bb548f97cbccc57431 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Sun, 12 Apr 2015 17:02:24 +0200
Subject: Update to 2.48.1


diff --git a/.gitignore b/.gitignore
index b5482ad..349b979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ libsoup-2.28.1.tar.bz2
 /libsoup-2.44.2.tar.xz
 /libsoup-2.46.0.tar.xz
 /libsoup-2.48.0.tar.xz
+/libsoup-2.48.1.tar.xz
diff --git a/0001-Fix-build-on-Windows.patch b/0001-Fix-build-on-Windows.patch
deleted file mode 100644
index f40849c..0000000
--- a/0001-Fix-build-on-Windows.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 7382e38..0000000
--- a/0001-libsoup-2.4.sym-remove-nonexistent-symbol.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 3ce47dc..d43cbf3 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.48.0
-Release:	2%{?dist}
+Version:	2.48.1
+Release:	1%{?dist}
 Summary:	MinGW library for HTTP and XML-RPC functionality
 
 License:	LGPLv2
@@ -13,11 +13,6 @@ 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
@@ -112,8 +107,6 @@ Static version of the MinGW Windows Libsoup library.
 
 %prep
 %setup -q -n libsoup-%{version}
-%patch0 -p1
-%patch1 -p1
 
 
 %build
@@ -189,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
 
 
 %changelog
+* Sun Apr 12 2015 Kalev Lember <kalevlember at gmail.com> - 2.48.1-1
+- Update to 2.48.1
+
 * Mon Dec 01 2014 Fabiano FidĂȘncio <fidencio at redhat.com> - 2.48.0-2
 - Add mingw-glib-networking as dep (#1169185)
 
diff --git a/sources b/sources
index 03f064d..324cbff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51ccb76f5262945e1f0316fdc46de567  libsoup-2.48.0.tar.xz
+0a8d96e317c29a1fd711687931f8c10c  libsoup-2.48.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mingw-libsoup.git/commit/?h=f21&id=e8c6636da1ddb6c2624bf3bb548f97cbccc57431


More information about the scm-commits mailing list