| 1 |
commit: 9d64729cfe28f212e3effb0e63688209cd91401b |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Tue Feb 7 10:58:32 2012 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Tue Feb 7 10:58:32 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9d64729c |
| 7 |
|
| 8 |
net-libs/libsoup{,-gnome}: 2.37.4 → 2.37.5 |
| 9 |
|
| 10 |
--- |
| 11 |
...e-2.37.4.ebuild => libsoup-gnome-2.37.5.ebuild} | 0 |
| 12 |
.../files/libsoup-2.37.4-thread-crash.patch | 38 -------------------- |
| 13 |
...soup-2.37.4-r1.ebuild => libsoup-2.37.5.ebuild} | 1 - |
| 14 |
3 files changed, 0 insertions(+), 39 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.37.5.ebuild |
| 17 |
similarity index 100% |
| 18 |
rename from net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild |
| 19 |
rename to net-libs/libsoup-gnome/libsoup-gnome-2.37.5.ebuild |
| 20 |
|
| 21 |
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 |
| 22 |
deleted file mode 100644 |
| 23 |
index bc513b2..0000000 |
| 24 |
--- a/net-libs/libsoup/files/libsoup-2.37.4-thread-crash.patch |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,38 +0,0 @@ |
| 27 |
-From b92be4347c981205ca2fb4362f8f03301d1ab905 Mon Sep 17 00:00:00 2001 |
| 28 |
-From: Dan Winship <danw@×××××.org> |
| 29 |
-Date: Tue, 17 Jan 2012 19:02:46 +0000 |
| 30 |
-Subject: soup-message-io: make soup_message_io_unpause() obey use-thread-context |
| 31 |
- |
| 32 |
---- |
| 33 |
-diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c |
| 34 |
-index b589ef2..16eea04 100644 |
| 35 |
---- a/libsoup/soup-message-io.c |
| 36 |
-+++ b/libsoup/soup-message-io.c |
| 37 |
-@@ -1221,15 +1221,23 @@ soup_message_io_unpause (SoupMessage *msg) |
| 38 |
- { |
| 39 |
- SoupMessagePrivate *priv = SOUP_MESSAGE_GET_PRIVATE (msg); |
| 40 |
- SoupMessageIOData *io = priv->io_data; |
| 41 |
-- gboolean non_blocking; |
| 42 |
-+ gboolean non_blocking, use_thread_context; |
| 43 |
- GMainContext *async_context; |
| 44 |
- |
| 45 |
- g_return_if_fail (io != NULL); |
| 46 |
- |
| 47 |
- g_object_get (io->sock, |
| 48 |
- SOUP_SOCKET_FLAG_NONBLOCKING, &non_blocking, |
| 49 |
-- SOUP_SOCKET_ASYNC_CONTEXT, &async_context, |
| 50 |
-+ SOUP_SOCKET_USE_THREAD_CONTEXT, &use_thread_context, |
| 51 |
- NULL); |
| 52 |
-+ if (use_thread_context) |
| 53 |
-+ async_context = g_main_context_ref_thread_default (); |
| 54 |
-+ else { |
| 55 |
-+ g_object_get (io->sock, |
| 56 |
-+ SOUP_SOCKET_ASYNC_CONTEXT, &async_context, |
| 57 |
-+ NULL); |
| 58 |
-+ } |
| 59 |
-+ |
| 60 |
- if (non_blocking) { |
| 61 |
- if (!io->unpause_source) { |
| 62 |
- io->unpause_source = soup_add_completion ( |
| 63 |
--- |
| 64 |
-cgit v0.9.0.2 |
| 65 |
|
| 66 |
diff --git a/net-libs/libsoup/libsoup-2.37.4-r1.ebuild b/net-libs/libsoup/libsoup-2.37.5.ebuild |
| 67 |
similarity index 98% |
| 68 |
rename from net-libs/libsoup/libsoup-2.37.4-r1.ebuild |
| 69 |
rename to net-libs/libsoup/libsoup-2.37.5.ebuild |
| 70 |
index 2ae7eef..198fc6f 100644 |
| 71 |
--- a/net-libs/libsoup/libsoup-2.37.4-r1.ebuild |
| 72 |
+++ b/net-libs/libsoup/libsoup-2.37.5.ebuild |
| 73 |
@@ -66,5 +66,4 @@ src_prepare() { |
| 74 |
epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch" |
| 75 |
eautoreconf |
| 76 |
fi |
| 77 |
- epatch "${FILESDIR}/${P}-thread-crash.patch" |
| 78 |
} |
Archives