[gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/, net-libs/libsoup-gnome/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

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
 }