[mingw-libsoup] Update to 2.41.92
Erik van Pienbroek
epienbro at fedoraproject.org
Sun Mar 24 18:57:35 UTC 2013
commit 89e5324a1842e0959fc568bca9ed8ca708b510f5
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Mar 24 19:57:28 2013 +0100
Update to 2.41.92
.gitignore | 1 +
libsoup-dont-use-interface-keyword.patch | 58 +++++++++++++++++++++++++++++
libsoup-gcc48-compatibility.patch | 11 +++++
libsoup-link-against-ws2_32.patch | 14 +++++++
libsoup-workaround-gnome-bug-595176.patch | 11 -----
mingw-libsoup.spec | 20 ++++++++-
sources | 2 +-
7 files changed, 102 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8edab58..3f98a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ libsoup-2.28.1.tar.bz2
/libsoup-2.38.1.tar.xz
/libsoup-2.40.1.tar.xz
/libsoup-2.40.2.tar.xz
+/libsoup-2.41.92.tar.xz
diff --git a/libsoup-dont-use-interface-keyword.patch b/libsoup-dont-use-interface-keyword.patch
new file mode 100644
index 0000000..f1ec9a1
--- /dev/null
+++ b/libsoup-dont-use-interface-keyword.patch
@@ -0,0 +1,58 @@
+--- libsoup/soup-cache.c.orig 2013-03-24 19:07:43.370365294 +0100
++++ libsoup/soup-cache.c 2013-03-24 19:08:22.421031662 +0100
+@@ -50,7 +50,7 @@
+ static void soup_cache_session_feature_init (SoupSessionFeatureInterface *feature_interface, gpointer interface_data);
+
+ static SoupContentProcessorInterface *soup_cache_default_content_processor_interface;
+-static void soup_cache_content_processor_init (SoupContentProcessorInterface *interface, gpointer interface_data);
++static void soup_cache_content_processor_init (SoupContentProcessorInterface *processor_interface, gpointer interface_data);
+
+ #define DEFAULT_MAX_SIZE 50 * 1024 * 1024
+ #define MAX_ENTRY_DATA_PERCENTAGE 10 /* Percentage of the total size
+--- libsoup/soup-content-decoder.c.orig 2013-03-24 19:10:47.889514005 +0100
++++ libsoup/soup-content-decoder.c 2013-03-24 19:11:09.036874846 +0100
+@@ -59,7 +59,7 @@
+ static void soup_content_decoder_session_feature_init (SoupSessionFeatureInterface *feature_interface, gpointer interface_data);
+
+ static SoupContentProcessorInterface *soup_content_decoder_default_content_processor_interface;
+-static void soup_content_decoder_content_processor_init (SoupContentProcessorInterface *interface, gpointer interface_data);
++static void soup_content_decoder_content_processor_init (SoupContentProcessorInterface *processor_interface, gpointer interface_data);
+
+
+ G_DEFINE_TYPE_WITH_CODE (SoupContentDecoder, soup_content_decoder, G_TYPE_OBJECT,
+--- libsoup/soup-content-sniffer.c.orig 2013-03-24 19:11:58.046711169 +0100
++++ libsoup/soup-content-sniffer.c 2013-03-24 19:12:15.989017341 +0100
+@@ -34,7 +34,7 @@
+ static void soup_content_sniffer_session_feature_init (SoupSessionFeatureInterface *feature_interface, gpointer interface_data);
+
+ static SoupContentProcessorInterface *soup_content_sniffer_default_content_processor_interface;
+-static void soup_content_sniffer_content_processor_init (SoupContentProcessorInterface *interface, gpointer interface_data);
++static void soup_content_sniffer_content_processor_init (SoupContentProcessorInterface *processor_interface, gpointer interface_data);
+
+
+ G_DEFINE_TYPE_WITH_CODE (SoupContentSniffer, soup_content_sniffer, G_TYPE_OBJECT,
+--- libsoup/soup-content-processor.c.orig 2013-03-24 19:13:00.575778184 +0100
++++ libsoup/soup-content-processor.c 2013-03-24 19:13:31.630307998 +0100
+@@ -11,7 +11,7 @@
+ #include "soup-content-processor.h"
+ #include "soup.h"
+
+-static void soup_content_processor_default_init (SoupContentProcessorInterface *interface);
++static void soup_content_processor_default_init (SoupContentProcessorInterface *processor_interface);
+
+ G_DEFINE_INTERFACE (SoupContentProcessor, soup_content_processor, G_TYPE_OBJECT)
+
+@@ -25,10 +25,10 @@
+ }
+
+ static void
+-soup_content_processor_default_init (SoupContentProcessorInterface *interface)
++soup_content_processor_default_init (SoupContentProcessorInterface *processor_interface)
+ {
+- interface->processing_stage = SOUP_STAGE_INVALID;
+- interface->wrap_input = soup_content_processor_real_wrap_input;
++ processor_interface->processing_stage = SOUP_STAGE_INVALID;
++ processor_interface->wrap_input = soup_content_processor_real_wrap_input;
+ }
+
+ GInputStream *
diff --git a/libsoup-gcc48-compatibility.patch b/libsoup-gcc48-compatibility.patch
new file mode 100644
index 0000000..6480a6b
--- /dev/null
+++ b/libsoup-gcc48-compatibility.patch
@@ -0,0 +1,11 @@
+--- tests/requester-test.c.orig 2013-03-24 19:14:23.173187636 +0100
++++ tests/requester-test.c 2013-03-24 19:14:50.776658691 +0100
+@@ -691,7 +691,7 @@
+ }
+
+ if (nread != expected_len) {
+- debug_printf (1, " response length mismatch: expected %d, got %lu\n", expected_len, nread);
++ debug_printf (1, " response length mismatch: expected %d, got %lu\n", expected_len, (gulong) nread);
+ errors++;
+ } else if (memcmp (buf, expected_data, nread) != 0) {
+ debug_printf (1, " response data mismatch\n");
diff --git a/libsoup-link-against-ws2_32.patch b/libsoup-link-against-ws2_32.patch
new file mode 100644
index 0000000..44e3c5d
--- /dev/null
+++ b/libsoup-link-against-ws2_32.patch
@@ -0,0 +1,14 @@
+--- libsoup/Makefile.am.orig 2013-03-24 19:21:22.412316257 +0100
++++ libsoup/Makefile.am 2013-03-24 19:22:11.988158496 +0100
+@@ -86,6 +86,11 @@
+ $(XML_LIBS) \
+ $(SQLITE_LIBS)
+
++if OS_WIN32
++# soup-address.c uses the winsock2 function htons
++libsoup_2_4_la_LIBADD += -lws2_32
++endif
++
+ libsoup_2_4_la_SOURCES = \
+ soup-address.c \
+ soup-auth.c \
diff --git a/mingw-libsoup.spec b/mingw-libsoup.spec
index 20bc4ac..294e87b 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.40.2
-Release: 2%{?dist}
+Version: 2.41.92
+Release: 1%{?dist}
Summary: MinGW library for HTTP and XML-RPC functionality
License: LGPLv2
@@ -33,7 +33,16 @@ BuildRequires: mingw64-sqlite
BuildRequires: glib2-devel
BuildRequires: intltool
-Patch0: libsoup-workaround-gnome-bug-595176.patch
+# The keyword 'interface' is a registered keyword in the Win32 api
+# and therefore shouldn't be used as variable name
+Patch0: libsoup-dont-use-interface-keyword.patch
+
+# Fix gcc 4.8 compatibility
+Patch1: libsoup-gcc48-compatibility.patch
+
+# Upstream commit 4e97133 removed the linkage against ws2_32, but
+# this is still needed as soup-address.c uses the winsock2 function htons
+Patch2: libsoup-link-against-ws2_32.patch
%description
@@ -109,6 +118,8 @@ Static version of the MinGW Windows Libsoup library.
%prep
%setup -q -n libsoup-%{version}
%patch0 -p0
+%patch1 -p0
+%patch2 -p0
%build
@@ -180,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%changelog
+* Sun Mar 24 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.41.92-1
+- Update to 2.41.92
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.40.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index bbcad60..9fdcb38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-211ec6b733d4de33056b56838c88436e libsoup-2.40.2.tar.xz
+a0788e6233c7e4f692a5849ac844fd0d libsoup-2.41.92.tar.xz
More information about the scm-commits
mailing list