public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/
@ 2012-01-17 22:28 Priit Laes
  0 siblings, 0 replies; 3+ messages in thread
From: Priit Laes @ 2012-01-17 22:28 UTC (permalink / raw
  To: gentoo-commits

commit:     0ad4de0a863a5844b5171f40d46a2d102469ba85
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 17 22:25:32 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 17 22:25:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0ad4de0a

net-libs/libsoup: Revbump with to fix a crasher

---
 .../files/libsoup-2.37.4-thread-crash.patch        |   38 ++++++++++++++++++++
 ...soup-2.37.4.ebuild => libsoup-2.37.4-r1.ebuild} |    1 +
 2 files changed, 39 insertions(+), 0 deletions(-)

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 0000000..bc513b2
--- /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
similarity index 98%
rename from net-libs/libsoup/libsoup-2.37.4.ebuild
rename to net-libs/libsoup/libsoup-2.37.4-r1.ebuild
index 198fc6f..2ae7eef 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"
 }



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/
@ 2012-07-22  7:39 Priit Laes
  0 siblings, 0 replies; 3+ messages in thread
From: Priit Laes @ 2012-07-22  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b45696d699f5cbf174f42ec0d9e9a5f60a185a29
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Jul 22 07:36:12 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Jul 22 07:36:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b45696d6

net-libs/libsoup: Revbump with some "good" fixes from upstream

---
 net-libs/libsoup/files/chunked-loader-hang.patch   |   27 +++++
 net-libs/libsoup/files/compressed-data-error.patch |  106 ++++++++++++++++++++
 ...-2.39.4.1.ebuild => libsoup-2.39.4.1-r1.ebuild} |    2 +
 3 files changed, 135 insertions(+), 0 deletions(-)

diff --git a/net-libs/libsoup/files/chunked-loader-hang.patch b/net-libs/libsoup/files/chunked-loader-hang.patch
new file mode 100644
index 0000000..1459dcf
--- /dev/null
+++ b/net-libs/libsoup/files/chunked-loader-hang.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 0000000..63edf52
--- /dev/null
+++ b/net-libs/libsoup/files/compressed-data-error.patch
@@ -0,0 +1,106 @@
+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/libsoup-2.39.4.1.ebuild b/net-libs/libsoup/libsoup-2.39.4.1-r1.ebuild
similarity index 96%
rename from net-libs/libsoup/libsoup-2.39.4.1.ebuild
rename to net-libs/libsoup/libsoup-2.39.4.1-r1.ebuild
index 62d12c1..6878c3b 100644
--- a/net-libs/libsoup/libsoup-2.39.4.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.39.4.1-r1.ebuild
@@ -80,6 +80,8 @@ 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"
 
 	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/
@ 2013-03-29 18:08 Priit Laes
  0 siblings, 0 replies; 3+ messages in thread
From: Priit Laes @ 2013-03-29 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     29397680c55e18a133e3d9683e7317bd7aebde92
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar 29 18:06:31 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar 29 18:06:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=29397680

net-libs/libsoup: Moved to gx86, sync live version.

---
 ...p-2.34.2-fix-build-without-gnome-with-doc.patch |   58 -------------
 net-libs/libsoup/libsoup-2.41.91-r1.ebuild         |   89 --------------------
 net-libs/libsoup/libsoup-9999.ebuild               |   42 ++++------
 3 files changed, 17 insertions(+), 172 deletions(-)

diff --git a/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch
deleted file mode 100644
index 574b8be..0000000
--- a/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4be4806401133389b2413267bc3f8ac58c1eeaf3 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 25 Feb 2010 20:59:51 +0200
-Subject: [PATCH] Split docs into libsoup and libsoup-gnome.
-
-Fixes Gentoo Bug 268592, patch adapted from upstream patch.
-
-Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in)
-Hence, to be applied ONLY when !gnome && doc
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: adapted patch for libsoup-2.34.2]
----
- docs/reference/Makefile.am           |    4 +++-
- docs/reference/libsoup-2.4-docs.sgml |    2 ++
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
-index 765d27c..07c92e9 100644
---- a/docs/reference/Makefile.am
-+++ b/docs/reference/Makefile.am
-@@ -38,6 +38,9 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
- 	soup-proxy-resolver.h soup-proxy-resolver-gnome.h \
- 	soup-proxy-resolver-static.h
- 
-+IGNORE_HFILES += soup-cookie-jar-sqlite.h \
-+	soup-gnome.h soup-gnome-features.h
-+
- # Images to copy into HTML directory.
- HTML_IMAGES = 
- 
-@@ -63,7 +66,6 @@ GTKDOC_CFLAGS =				\
- 
- GTKDOC_LIBS =						\
- 	$(top_builddir)/libsoup/libsoup-2.4.la		\
--	$(top_builddir)/libsoup/libsoup-gnome-2.4.la	\
- 	$(GLIB_LIBS)
- 
- # include common portion ...
-diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
-index c52208f..7117849 100644
---- a/docs/reference/libsoup-2.4-docs.sgml
-+++ b/docs/reference/libsoup-2.4-docs.sgml
-@@ -52,11 +52,13 @@
-     <xi:include href="xml/soup-value-utils.xml"/>
-   </chapter>
- 
-+<!--
-   <chapter>
-     <title>GNOME integration</title>
-     <xi:include href="xml/soup-gnome-features.xml"/>
-     <xi:include href="xml/soup-cookie-jar-sqlite.xml"/>
-   </chapter>
-+-->
- 
-   <chapter>
-     <title>Low-level Networking API</title>
--- 
-1.7.5.3
\ No newline at end of file

diff --git a/net-libs/libsoup/libsoup-2.41.91-r1.ebuild b/net-libs/libsoup/libsoup-2.41.91-r1.ebuild
deleted file mode 100644
index 6490704..0000000
--- a/net-libs/libsoup/libsoup-2.41.91-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit eutils gnome2-live
-fi
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-IUSE="debug +introspection samba ssl test"
-[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
-
-RDEPEND="
-	dev-db/sqlite:3=
-    >=dev-libs/glib-2.35.0:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.35.3[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.10 )"
-fi
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} = 9999 ]]; then
-		# prevent SOUP_MAINTAINER_FLAGS from getting set
-		mv .git .git-bck || die
-
-		# Patch *must* be applied conditionally (see patch for details)
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		use doc && epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-	fi
-
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(use_enable introspection) \
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
-}

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 6490704..423756e 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit gnome2 python
+inherit gnome2 python-any-r1
 if [[ ${PV} = 9999 ]]; then
 	inherit eutils gnome2-live
 fi
@@ -21,24 +22,22 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
-IUSE="debug +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test gnome"
 [[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
 
-RDEPEND="
-	dev-db/sqlite:3=
-    >=dev-libs/glib-2.35.0:2
+RDEPEND=">=dev-libs/glib-2.35.0:2
 	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.35.3[ssl?]
+	dev-db/sqlite:3
+	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )
-"
+	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
-	=dev-lang/python-2*
+	${PYTHON_DEPS}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
+
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
 		doc? ( >=dev-util/gtk-doc-1.10 )"
@@ -50,19 +49,10 @@ fi
 #		net-misc/curl
 #		net-libs/glib-networking[ssl])"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	if [[ ${PV} = 9999 ]]; then
 		# prevent SOUP_MAINTAINER_FLAGS from getting set
 		mv .git .git-bck || die
-
-		# Patch *must* be applied conditionally (see patch for details)
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		use doc && epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
 	fi
 
 	if ! use test; then
@@ -76,14 +66,16 @@ src_prepare() {
 
 src_configure() {
 	# Disable apache tests until they are usable on Gentoo, bug #326957
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tls-check \
-		--without-gnome \
+		$(use_with gnome) \
 		--without-apache-httpd \
 		$(use_enable introspection) \
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
+
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+	gnome2_src_configure
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-03-29 18:08 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-17 22:28 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/ Priit Laes
  -- strict thread matches above, loose matches on Subject: below --
2012-07-22  7:39 Priit Laes
2013-03-29 18:08 Priit Laes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox