Fix patch which skipped link relationship to libsoup-2.4.so (found using --no-undefined LDFLAG), remove old revision.

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 28 insertions, 9 deletions

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index d81df9f3088a..16530f500c19 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.2 2009/09/13 14:35:59 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.3 2009/09/21 12:17:43 mrpouet Exp $
+
+*libsoup-gnome-2.26.3-r1 (21 Sep 2009)
+
+  21 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+  -libsoup-gnome-2.26.3.ebuild, +libsoup-gnome-2.26.3-r1.ebuild,
+  files/libsoup-gnome-2.26.3-system-lib.patch:
+  Fix patch which skipped link relationship to libsoup-2.4.so (found using
+  --no-undefined LDFLAG), remove old revision.
 
   13 Sep 2009; Romain Perier <mrpouet@gentoo.org>
   files/libsoup-gnome-2.26.3-system-lib.patch:
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.26.3-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.26.3-system-lib.patch
index d65945093c7c..3e256c96de0d 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.26.3-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.26.3-system-lib.patch
@@ -1,13 +1,13 @@
-From d760a92ed2ab93e64aca889cd6bbc8b1ffecc63b Mon Sep 17 00:00:00 2001
+From fb722121885312ad49ed70a247287f26d045e54a Mon Sep 17 00:00:00 2001
 From: Romain Perier <mrpouet@gentoo.org>
-Date: Sun, 13 Sep 2009 16:20:10 +0200
+Date: Sun, 20 Sep 2009 14:36:00 +0200
 Subject: [PATCH] Add --with-libsoup-system option in order to be able to build gnome plugin without libsoup library
 
 ---
  Makefile.am         |   13 ++++++++---
- configure.in        |   53 +++++++++++++++++++++++++++-----------------------
- libsoup/Makefile.am |   30 +++++++++++++++++++++++-----
- 3 files changed, 62 insertions(+), 34 deletions(-)
+ configure.in        |   57 ++++++++++++++++++++++++++++----------------------
+ libsoup/Makefile.am |   30 +++++++++++++++++++++-----
+ 3 files changed, 65 insertions(+), 35 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index 6c7dc3c..7c95031 100644
@@ -41,7 +41,7 @@ index 6c7dc3c..7c95031 100644
  pkgconfig_DATA += libsoup-gnome-2.4.pc
  endif
 diff --git a/configure.in b/configure.in
-index 902eae6..04b088d 100644
+index 902eae6..76c6a1f 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -78,7 +78,13 @@ AC_FUNC_ALLOCA
@@ -122,6 +122,17 @@ index 902eae6..04b088d 100644
  
  dnl *********************
  dnl *** GNOME support ***
+@@ -183,7 +188,9 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+ 
+ if test $with_gnome != no; then
+ 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
+-
++	if test $with_libsoup_system != no; then
++	   PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++	fi
+ 	PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl
+ [Could not find libproxy:
+ 
 diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
 index 949f243..a599c40 100644
 --- a/libsoup/Makefile.am
@@ -202,5 +213,5 @@ index 949f243..a599c40 100644
  	soup-cookie-jar-sqlite.c	\
  	soup-gnome-features.c		\
 -- 
-1.6.4.2
+1.6.5.rc1
 
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.26.3.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.26.3-r1.ebuild
index ca390279c2af..f0b55bcd5795 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.26.3.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.26.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.26.3.ebuild,v 1.1 2009/09/13 10:25:55 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.26.3-r1.ebuild,v 1.1 2009/09/21 12:17:43 mrpouet Exp $
 
 EAPI="2"