diff options
| author |   Priit Laes <plaes@plaes.org> | 2012-01-18 00:25:32 +0200 |
|---|---|---|
| committer | Priit Laes <plaes@plaes.org> | 2012-01-18 00:25:32 +0200 |
| commit | 0ad4de0a863a5844b5171f40d46a2d102469ba85 (patch) | |
| tree | ff7d78962cbb8b1e5edb106b32a41f7d57df3d65 /net-libs/libsoup | |
| parent | net-libs/libsoup{,-gnome}: 2.37.3 -> 2.37.4 (diff) | |
| download | gnome-0ad4de0a863a5844b5171f40d46a2d102469ba85.tar.gz gnome-0ad4de0a863a5844b5171f40d46a2d102469ba85.tar.bz2 gnome-0ad4de0a863a5844b5171f40d46a2d102469ba85.zip | |
net-libs/libsoup: Revbump with to fix a crasher
Diffstat (limited to 'net-libs/libsoup')
| -rw-r--r-- | net-libs/libsoup/Manifest | 3 | ||||
| -rw-r--r-- | net-libs/libsoup/files/libsoup-2.37.4-thread-crash.patch | 38 | ||||
| -rw-r--r-- | net-libs/libsoup/libsoup-2.37.4-r1.ebuild (renamed from net-libs/libsoup/libsoup-2.37.4.ebuild) | 1 |
3 files changed, 41 insertions, 1 deletions
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest index e52d32c3..fcebe9ee 100644 --- a/net-libs/libsoup/Manifest +++ b/net-libs/libsoup/Manifest @@ -1,4 +1,5 @@ AUX libsoup-2.34.2-fix-build-without-gnome-with-doc.patch 1834 RMD160 d29d75b83b7203caf551c487074f24428dd062de SHA1 56a9e82576fb492b95b964d6879db15c3d6c1309 SHA256 d4c1e1a36eebb9264a2d33b4b6efcc5076c62d9669eed67151b5d777e6112986 +AUX libsoup-2.37.4-thread-crash.patch 1222 RMD160 b4f836ed50a341ed53e2e1504c6985431cf99bfe SHA1 14edae3ead925fbd5458f931fa7ec1a59b131094 SHA256 a86452eefd4ee53f5e5789c0ac2322b8477cd1a0179c53d7a90c6e0e4d1fe6a9 DIST libsoup-2.37.4.tar.xz 618056 RMD160 f4f3cfb82efc240161d57fa928ca584b91dcec56 SHA1 00415ee86bfa3fc632c1d046bce2c26328c551cd SHA256 e99e7c7a13f45a108adcf5562473b46bc6e2115458460467a2d89683a38f7d86 -EBUILD libsoup-2.37.4.ebuild 2320 RMD160 0b04c35c7d879dba44a60c9c07af6e780ac35d3c SHA1 c884e6cd191d72d2bbc9f316fd4988059835d47c SHA256 4b3e2622a18c1d07292fd9ec17a15fdc6425e1f789c40b96ffdd9b0aa00ac92a +EBUILD libsoup-2.37.4-r1.ebuild 2366 RMD160 25a7d2757326acbefef00b39c1f4b555f900e57d SHA1 64a3c68916df544169d8ffa412b1f85b99794c36 SHA256 bd9c90e06e458cb398482fe855d28f94aa1d6e1d525428e08f3c412456ec464d EBUILD libsoup-9999.ebuild 2601 RMD160 ffc6a2fa3c210553a90cb1db43af64b506bd7cd0 SHA1 c243c577d3e6018f127b75c8a3d743b83d67eddb SHA256 6d54954396805134707531a731cd12f5bca42815b74f305aba7866f626fb929a diff --git a/net-libs/libsoup/files/libsoup-2.37.4-thread-crash.patch b/net-libs/libsoup/files/libsoup-2.37.4-thread-crash.patch new file mode 100644 index 00000000..bc513b2e --- /dev/null +++ b/net-libs/libsoup/files/libsoup-2.37.4-thread-crash.patch @@ -0,0 +1,38 @@ +From b92be4347c981205ca2fb4362f8f03301d1ab905 Mon Sep 17 00:00:00 2001 +From: Dan Winship <danw@gnome.org> +Date: Tue, 17 Jan 2012 19:02:46 +0000 +Subject: soup-message-io: make soup_message_io_unpause() obey use-thread-context + +--- +diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c +index b589ef2..16eea04 100644 +--- a/libsoup/soup-message-io.c ++++ b/libsoup/soup-message-io.c +@@ -1221,15 +1221,23 @@ soup_message_io_unpause (SoupMessage *msg) + { + SoupMessagePrivate *priv = SOUP_MESSAGE_GET_PRIVATE (msg); + SoupMessageIOData *io = priv->io_data; +- gboolean non_blocking; ++ gboolean non_blocking, use_thread_context; + GMainContext *async_context; + + g_return_if_fail (io != NULL); + + g_object_get (io->sock, + SOUP_SOCKET_FLAG_NONBLOCKING, &non_blocking, +- SOUP_SOCKET_ASYNC_CONTEXT, &async_context, ++ SOUP_SOCKET_USE_THREAD_CONTEXT, &use_thread_context, + NULL); ++ if (use_thread_context) ++ async_context = g_main_context_ref_thread_default (); ++ else { ++ g_object_get (io->sock, ++ SOUP_SOCKET_ASYNC_CONTEXT, &async_context, ++ NULL); ++ } ++ + if (non_blocking) { + if (!io->unpause_source) { + io->unpause_source = soup_add_completion ( +-- +cgit v0.9.0.2 diff --git a/net-libs/libsoup/libsoup-2.37.4.ebuild b/net-libs/libsoup/libsoup-2.37.4-r1.ebuild index 198fc6f3..2ae7eefd 100644 --- a/net-libs/libsoup/libsoup-2.37.4.ebuild +++ b/net-libs/libsoup/libsoup-2.37.4-r1.ebuild @@ -66,4 +66,5 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch" eautoreconf fi + epatch "${FILESDIR}/${P}-thread-crash.patch" } |