* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/
@ 2012-02-08 7:52 Priit Laes
0 siblings, 0 replies; 3+ messages in thread
From: Priit Laes @ 2012-02-08 7:52 UTC (permalink / raw
To: gentoo-commits
commit: 9d64729cfe28f212e3effb0e63688209cd91401b
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Feb 7 10:58:32 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Feb 7 10:58:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9d64729c
net-libs/libsoup{,-gnome}: 2.37.4 → 2.37.5
---
...e-2.37.4.ebuild => libsoup-gnome-2.37.5.ebuild} | 0
.../files/libsoup-2.37.4-thread-crash.patch | 38 --------------------
...soup-2.37.4-r1.ebuild => libsoup-2.37.5.ebuild} | 1 -
3 files changed, 0 insertions(+), 39 deletions(-)
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.37.5.ebuild
similarity index 100%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.37.5.ebuild
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
deleted file mode 100644
index bc513b2..0000000
--- a/net-libs/libsoup/files/libsoup-2.37.4-thread-crash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-r1.ebuild b/net-libs/libsoup/libsoup-2.37.5.ebuild
similarity index 98%
rename from net-libs/libsoup/libsoup-2.37.4-r1.ebuild
rename to net-libs/libsoup/libsoup-2.37.5.ebuild
index 2ae7eef..198fc6f 100644
--- a/net-libs/libsoup/libsoup-2.37.4-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.37.5.ebuild
@@ -66,5 +66,4 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
eautoreconf
fi
- epatch "${FILESDIR}/${P}-thread-crash.patch"
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/
@ 2012-08-08 6:42 Priit Laes
0 siblings, 0 replies; 3+ messages in thread
From: Priit Laes @ 2012-08-08 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 3d5f60bd0d55358a74077527af63809d3608b5c1
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Aug 8 06:40:29 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Aug 8 06:40:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3d5f60bd
net-libs/libsoup{,-gnome}: 2.39.4.1 → 2.39.5
---
...2.39.4.1.ebuild => libsoup-gnome-2.39.5.ebuild} | 0
net-libs/libsoup/files/chunked-loader-hang.patch | 27 ---
net-libs/libsoup/files/compressed-data-error.patch | 106 ------------
.../files/libsoup-2.39.5-fix-public-tlds.patch | 168 ++++++++++++++++++++
...up-2.39.4.1-r1.ebuild => libsoup-2.39.5.ebuild} | 3 +-
5 files changed, 169 insertions(+), 135 deletions(-)
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.39.4.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.39.5.ebuild
similarity index 100%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.39.4.1.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.39.5.ebuild
diff --git a/net-libs/libsoup/files/chunked-loader-hang.patch b/net-libs/libsoup/files/chunked-loader-hang.patch
deleted file mode 100644
index 1459dcf..0000000
--- a/net-libs/libsoup/files/chunked-loader-hang.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit a5c449b83a401bcd509f858fd5a6caaf0acad089
-Author: Dan Winship <danw@gnome.org>
-Date: Tue Jul 17 16:58:55 2012 -0400
-
- SoupBodyInputStream: fix hang reading empty chunked response
-
- Set the eof flag immediately after reading the last chunk, rather than
- waiting for the next read, since if the caller calls is_readable() or
- create_source() instead, we need to know to not wait for the
- base_stream to become readable.
-
-diff --git a/libsoup/soup-body-input-stream.c b/libsoup/soup-body-input-stream.c
-index a38955f..ba4ce6a 100644
---- a/libsoup/soup-body-input-stream.c
-+++ b/libsoup/soup-body-input-stream.c
-@@ -211,8 +211,10 @@ again:
- if (nread <= 0)
- return nread;
-
-- if (strncmp (buffer, "\r\n", nread) || strncmp (buffer, "\n", nread))
-+ if (strncmp (buffer, "\r\n", nread) || strncmp (buffer, "\n", nread)) {
- bistream->priv->chunked_state = SOUP_BODY_INPUT_STREAM_STATE_DONE;
-+ bistream->priv->eof = TRUE;
-+ }
- break;
-
- case SOUP_BODY_INPUT_STREAM_STATE_DONE:
diff --git a/net-libs/libsoup/files/compressed-data-error.patch b/net-libs/libsoup/files/compressed-data-error.patch
deleted file mode 100644
index 63edf52..0000000
--- a/net-libs/libsoup/files/compressed-data-error.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit 97d2b4dc9cbf4f0098bd21e71beabfeba9f62f81
-Author: Dan Winship <danw@gnome.org>
-Date: Tue Jul 17 17:00:07 2012 -0400
-
- SoupConverterWrapper: handle empty "compressed" responses
-
- If a server sends an empty response but includes a Content-Encoding
- header (in particular, in a HEAD or 304 response), suppress the
- PARTIAL_INPUT error from the GZlibDecompressor and just return 0.
-
- https://bugzilla.gnome.org/show_bug.cgi?id=679527 (?)
-
-diff --git a/libsoup/soup-converter-wrapper.c b/libsoup/soup-converter-wrapper.c
-index 45d34a3..8aa000b 100644
---- a/libsoup/soup-converter-wrapper.c
-+++ b/libsoup/soup-converter-wrapper.c
-@@ -270,6 +270,15 @@ soup_converter_wrapper_real_convert (GConverter *converter,
- return result;
- }
-
-+ if (g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_PARTIAL_INPUT) &&
-+ !priv->started && inbuf_size == 0 &&
-+ (flags & G_CONVERTER_INPUT_AT_END)) {
-+ /* Server claimed compression but there was no message body. */
-+ g_error_free (my_error);
-+ *bytes_written = 0;
-+ return G_CONVERTER_FINISHED;
-+ }
-+
- if (!g_error_matches (my_error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA) ||
- priv->started) {
- g_propagate_error (error, my_error);
-diff --git a/tests/coding-test.c b/tests/coding-test.c
-index 8c68a35..cda4b89 100644
---- a/tests/coding-test.c
-+++ b/tests/coding-test.c
-@@ -106,8 +106,10 @@ server_callback (SoupServer *server, SoupMessage *msg,
- soup_message_set_status (msg, SOUP_STATUS_OK);
- soup_message_headers_set_encoding (msg->response_headers, SOUP_ENCODING_CHUNKED);
-
-- soup_message_body_append (msg->response_body,
-- SOUP_MEMORY_TAKE, contents, length);
-+ if (!soup_header_contains (options, "empty")) {
-+ soup_message_body_append (msg->response_body,
-+ SOUP_MEMORY_TAKE, contents, length);
-+ }
-
- if (soup_header_contains (options, "trailing-junk")) {
- soup_message_body_append (msg->response_body, SOUP_MEMORY_COPY,
-@@ -511,6 +513,48 @@ do_coding_req_test (void)
- soup_test_session_abort_unref (session);
- }
-
-+static void
-+do_coding_empty_test (void)
-+{
-+ SoupSession *session;
-+ SoupMessage *msg;
-+ SoupURI *uri;
-+ SoupRequester *requester;
-+ SoupRequest *req;
-+ GByteArray *body;
-+
-+ debug_printf (1, "\nEmpty allegedly-encoded body test\n");
-+
-+ session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC,
-+ SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_CONTENT_DECODER,
-+ SOUP_SESSION_USE_THREAD_CONTEXT, TRUE,
-+ SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_REQUESTER,
-+ NULL);
-+ requester = (SoupRequester *)soup_session_get_feature (session, SOUP_TYPE_REQUESTER);
-+ uri = soup_uri_new_with_base (base_uri, "/mbox");
-+
-+ debug_printf (1, " SoupMessage\n");
-+ msg = soup_message_new_from_uri ("GET", uri);
-+ soup_message_headers_append (msg->request_headers,
-+ "X-Test-Options", "empty");
-+ soup_session_send_message (session, msg);
-+ check_response (msg, "gzip", "text/plain", EXPECT_NOT_DECODED);
-+ g_object_unref (msg);
-+
-+ debug_printf (1, " SoupRequest\n");
-+ req = soup_requester_request_uri (requester, uri, NULL);
-+ msg = soup_request_http_get_message (SOUP_REQUEST_HTTP (req));
-+ soup_message_headers_append (msg->request_headers,
-+ "X-Test-Options", "empty");
-+ g_object_unref (msg);
-+ body = do_single_coding_req_test (req, "gzip", "text/plain", EXPECT_NOT_DECODED);
-+ g_byte_array_free (body, TRUE);
-+ g_object_unref (req);
-+
-+ soup_test_session_abort_unref (session);
-+}
-+
-+
- int
- main (int argc, char **argv)
- {
-@@ -523,6 +567,7 @@ main (int argc, char **argv)
-
- do_coding_test ();
- do_coding_req_test ();
-+ do_coding_empty_test ();
-
- soup_uri_free (base_uri);
- soup_test_server_quit_unref (server);
diff --git a/net-libs/libsoup/files/libsoup-2.39.5-fix-public-tlds.patch b/net-libs/libsoup/files/libsoup-2.39.5-fix-public-tlds.patch
new file mode 100644
index 0000000..81fe7cf
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.39.5-fix-public-tlds.patch
@@ -0,0 +1,168 @@
+commit 82084a0c02c958a8d5bff4f847fc1507b10db9ed
+Author: Sergio Villar Senin <svillar@igalia.com>
+Date: Thu Aug 2 16:50:54 2012 +0200
+
+ SoupTLD: fix a regression in soup_tld_is_public_suffix()
+
+ soup_tld_is_public_suffix() was not returning TRUE for well known TLDs as
+ ".com" after cbae89f4. Also added some extra documentation to
+ soup_tld_get_base_domain() in order to make explicit that it returns NULL
+ for private URLs.
+
+ Reworked unit tests in order to allow them detect these regressions.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=681085
+
+diff --git a/libsoup/soup-tld.c b/libsoup/soup-tld.c
+index 0c40b67..fc7c992 100644
+--- a/libsoup/soup-tld.c
++++ b/libsoup/soup-tld.c
+@@ -59,6 +59,10 @@ soup_tld_ensure_rules_hash_table (void)
+ * plus the second level domain, for example for myhost.mydomain.com
+ * it will return mydomain.com.
+ *
++ * Note that %NULL will be returned for private URLs (those not ending
++ * with any well known TLD) because choosing a base domain for them
++ * would be totally arbitrary.
++ *
+ * This method only works for valid UTF-8 hostnames in their canonical
+ * representation form, so you should use g_hostname_to_unicode() to
+ * get the canonical representation if that is not the case.
+@@ -106,7 +110,7 @@ soup_tld_domain_is_public_suffix (const char *domain)
+ g_return_val_if_reached (FALSE);
+
+ base_domain = soup_tld_get_base_domain_internal (domain, 0, &error);
+- if (base_domain)
++ if (g_strcmp0 (domain, base_domain))
+ return FALSE;
+
+ if (g_error_matches (error, SOUP_TLD_ERROR, SOUP_TLD_ERROR_NO_BASE_DOMAIN)) {
+@@ -178,15 +182,9 @@ soup_tld_get_base_domain_internal (const char *hostname, guint additional_domain
+ /* If we match a *. rule and there were no previous exceptions
+ * nor previous domains then treat it as an exact match.
+ */
+- if (!prev_domain) {
+- g_set_error_literal (error, SOUP_TLD_ERROR,
+- SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS,
+- _("Not enough domains"));
+- return NULL;
+- }
+- tld = prev_domain;
++ tld = prev_domain ? prev_domain : cur_domain;
+ break;
+- } else if (*flags == SOUP_TLD_RULE_NORMAL || !next_dot) {
++ } else if (*flags == SOUP_TLD_RULE_NORMAL) {
+ tld = cur_domain;
+ break;
+ } else if (*flags & SOUP_TLD_RULE_EXCEPTION) {
+diff --git a/tests/tld-test.c b/tests/tld-test.c
+index 25d2da2..d0c73a8 100644
+--- a/tests/tld-test.c
++++ b/tests/tld-test.c
+@@ -21,16 +21,6 @@ static struct {
+ { ".example", NULL },
+ { ".example.com", NULL },
+ { ".example.example", NULL },
+- /* Unlisted TLD.*/
+- { "example", NULL },
+- { "example.example", NULL },
+- { "b.example.example", NULL },
+- { "a.b.example.example", NULL },
+- /* Listed, but non-Internet, TLD. */
+- { "local", NULL },
+- { "example.local", NULL },
+- { "b.example.local", NULL },
+- { "a.b.example.local", NULL },
+ /* TLD with only 1 rule. */
+ { "biz", NULL },
+ { "domain.biz", "domain.biz" },
+@@ -88,6 +78,20 @@ static struct {
+ /* The original list does not include non-ASCII tests. Let's add a couple. */
+ { "公司.cn", NULL },
+ { "a.b.åfjord.no", "b.åfjord.no" }
++},
++/* Non Internet TLDs have NULL as expected result
++ */
++non_inet_tld_tests[] = {
++ /* Unlisted TLD.*/
++ { "example", NULL },
++ { "example.example", NULL },
++ { "b.example.example", NULL },
++ { "a.b.example.example", NULL },
++ /* Listed, but non-Internet, TLD. */
++ { "local", NULL },
++ { "example.local", NULL },
++ { "b.example.local", NULL },
++ { "a.b.example.local", NULL }
+ };
+
+ int
+@@ -99,29 +103,46 @@ main (int argc, char **argv)
+
+ errors = 0;
+ for (i = 0; i < G_N_ELEMENTS (tld_tests); ++i) {
+- gboolean is_public = soup_tld_domain_is_public_suffix (tld_tests[i].hostname);
+- const char *base_domain = soup_tld_get_base_domain (tld_tests[i].hostname, NULL);
++ GError *error = NULL;
++ gboolean is_public = soup_tld_domain_is_public_suffix (tld_tests[i].hostname);
++ const char *base_domain = soup_tld_get_base_domain (tld_tests[i].hostname, &error);
++
++ debug_printf (1, "Testing %s: ", tld_tests[i].hostname);
++
++ if (is_public && tld_tests[i].result) {
++ debug_printf (1, "ERROR: domain is public but base_domain is not NULL (%s)\n",
++ base_domain);
++ ++errors;
++ } else if (g_strcmp0 (tld_tests[i].result, base_domain)) {
++ debug_printf (1, "ERROR: %s expected as base domain but got %s\n",
++ tld_tests[i].result, base_domain);
++ ++errors;
++
++ } else if (!tld_tests[i].result && !is_public &&
++ !g_error_matches (error, SOUP_TLD_ERROR, SOUP_TLD_ERROR_INVALID_HOSTNAME)) {
++ debug_printf (1, "ERROR: not public domain with NULL expected result\n");
++ ++errors;
++ } else
++ debug_printf (1, "OK\n");
++
++ g_clear_error(&error);
++ }
++
++ for (i = 0; i < G_N_ELEMENTS (non_inet_tld_tests); ++i) {
++ gboolean is_public = soup_tld_domain_is_public_suffix (non_inet_tld_tests[i].hostname);
++ const char *base_domain = soup_tld_get_base_domain (non_inet_tld_tests[i].hostname, NULL);
++
++ debug_printf (1, "Testing %s: ", non_inet_tld_tests[i].hostname);
+
+- debug_printf (1, "Testing %s: ", tld_tests[i].hostname);
+- if (tld_tests[i].result) {
+- /* Public domains have NULL expected results. */
+- if (is_public || g_strcmp0 (tld_tests[i].result, base_domain)) {
+- debug_printf (1, "ERROR: %s got %s (%s expected)\n",
+- tld_tests[i].hostname, base_domain, tld_tests[i].result);
+- ++errors;
+- } else
+- debug_printf (1, "OK\n");
+- } else {
+- /* If there is no expected result then either the domain is public or
+- * the hostname invalid (for example starts with a leading dot).
+- */
+- if (!is_public && base_domain) {
+- debug_printf (1, "ERROR: public domain %s got %s (none expected)\n",
+- tld_tests[i].hostname, base_domain);
+- ++errors;
+- } else
+- debug_printf (1, "OK\n");
+- }
++ if (is_public) {
++ debug_printf (1, "ERROR: domain incorrectly clasified as public\n");
++ ++errors;
++ } else if (base_domain) {
++ debug_printf (1, "ERROR: non NULL base domain (%s) for local url\n",
++ base_domain);
++ ++errors;
++ } else
++ debug_printf (1, "OK\n");
+ }
+
+ test_cleanup ();
diff --git a/net-libs/libsoup/libsoup-2.39.4.1-r1.ebuild b/net-libs/libsoup/libsoup-2.39.5.ebuild
similarity index 96%
rename from net-libs/libsoup/libsoup-2.39.4.1-r1.ebuild
rename to net-libs/libsoup/libsoup-2.39.5.ebuild
index 6878c3b..17826ee 100644
--- a/net-libs/libsoup/libsoup-2.39.4.1-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.39.5.ebuild
@@ -80,8 +80,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
[[ ${PV} != 9999 ]] && eautoreconf
fi
- epatch "${FILESDIR}/chunked-loader-hang.patch"
- epatch "${FILESDIR}/compressed-data-error.patch"
+ epatch "${FILESDIR}/${P}-fix-public-tlds.patch"
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/
@ 2012-09-05 15:49 Nirbheek Chauhan
0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 15:49 UTC (permalink / raw
To: gentoo-commits
commit: c1c867072a3ce34cc3d55c5e7f53f5fddebd6cc0
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 4 23:16:27 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 15:48:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c1c86707
net-libs/libsoup{,-gnome}: 2.39.90 → 2.39.91
---
...2.39.90.ebuild => libsoup-gnome-2.39.91.ebuild} | 3 +-
net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 3 +-
.../files/libsoup-2.39.90-avoid-double-free.patch | 30 --------------------
...bsoup-2.39.90.ebuild => libsoup-2.39.91.ebuild} | 2 +-
net-libs/libsoup/libsoup-9999.ebuild | 2 +
5 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.39.90.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.39.91.ebuild
similarity index 98%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.39.90.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.39.91.ebuild
index 0409b17..6c8fb86 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.39.90.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.39.91.ebuild
@@ -21,18 +21,19 @@ SRC_URI="${SRC_URI//-gnome}"
LICENSE="LGPL-2"
SLOT="2.4"
+IUSE="debug doc +introspection"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
fi
-IUSE="debug doc +introspection"
RDEPEND="~net-libs/libsoup-${PV}
|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
dev-db/sqlite:3
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
DEPEND="${RDEPEND}
+ sys-devel/gettext
virtual/pkgconfig
>=dev-util/intltool-0.35
>=dev-util/gtk-doc-am-1.10
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
index 0409b17..6c8fb86 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
@@ -21,18 +21,19 @@ SRC_URI="${SRC_URI//-gnome}"
LICENSE="LGPL-2"
SLOT="2.4"
+IUSE="debug doc +introspection"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
fi
-IUSE="debug doc +introspection"
RDEPEND="~net-libs/libsoup-${PV}
|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
dev-db/sqlite:3
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
DEPEND="${RDEPEND}
+ sys-devel/gettext
virtual/pkgconfig
>=dev-util/intltool-0.35
>=dev-util/gtk-doc-am-1.10
diff --git a/net-libs/libsoup/files/libsoup-2.39.90-avoid-double-free.patch b/net-libs/libsoup/files/libsoup-2.39.90-avoid-double-free.patch
deleted file mode 100644
index 8ab5021..0000000
--- a/net-libs/libsoup/files/libsoup-2.39.90-avoid-double-free.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2e70097a13289f6e665e7bbe327d12d5b0d3cddb Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@redhat.com>
-Date: Fri, 24 Aug 2012 13:20:15 +0200
-Subject: [PATCH 1/2] Avoid double free of hash key
-
-When soup_message_headers_get_content_disposition re-inserts the
-new filename we need to g_strdup the key or otherwise it will
-be freed by the hashtable key destroy func.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=682569
----
- libsoup/soup-message-headers.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
-index b9bab23..1dd53dd 100644
---- a/libsoup/soup-message-headers.c
-+++ b/libsoup/soup-message-headers.c
-@@ -1303,7 +1303,7 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders *hdrs,
- char *filename = strrchr (orig_value, '/');
-
- if (filename)
-- g_hash_table_insert (*params, orig_key, filename + 1);
-+ g_hash_table_insert (*params, g_strdup (orig_key), filename + 1);
- }
- return TRUE;
- }
---
-1.7.12
-
diff --git a/net-libs/libsoup/libsoup-2.39.90.ebuild b/net-libs/libsoup/libsoup-2.39.91.ebuild
similarity index 98%
rename from net-libs/libsoup/libsoup-2.39.90.ebuild
rename to net-libs/libsoup/libsoup-2.39.91.ebuild
index 7f50d15..f6075a2 100644
--- a/net-libs/libsoup/libsoup-2.39.90.ebuild
+++ b/net-libs/libsoup/libsoup-2.39.91.ebuild
@@ -30,6 +30,7 @@ RDEPEND=">=dev-libs/glib-2.33.1:2
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
samba? ( net-fs/samba )"
DEPEND="${RDEPEND}
+ sys-devel/gettext
virtual/pkgconfig
dev-lang/python
>=dev-util/intltool-0.35
@@ -80,7 +81,6 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
[[ ${PV} != 9999 ]] && eautoreconf
fi
- epatch "${FILESDIR}/${P}-avoid-double-free.patch"
gnome2_src_prepare
}
diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 62d12c1..d25d35d 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -30,6 +30,7 @@ RDEPEND=">=dev-libs/glib-2.33.1:2
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
samba? ( net-fs/samba )"
DEPEND="${RDEPEND}
+ sys-devel/gettext
virtual/pkgconfig
dev-lang/python
>=dev-util/intltool-0.35
@@ -80,6 +81,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
[[ ${PV} != 9999 ]] && eautoreconf
fi
+ epatch "${FILESDIR}/${P}-avoid-double-free.patch"
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-05 15:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-05 15:49 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/ Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2012-08-08 6:42 Priit Laes
2012-02-08 7:52 Priit Laes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox