New version for GNOME 2.28.

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

1 files changed, 207 insertions, 0 deletions

diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.28.1-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.28.1-system-lib.patch
new file mode 100644
index 000000000000..1d3ff5d40be9
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.28.1-system-lib.patch
@@ -0,0 +1,207 @@
+From 4367b1c2801a4158f53f910a89255737a1c23b73 Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Tue, 29 Sep 2009 11:19:43 +0200
+Subject: [PATCH] Add --with-libsoup-system option in order to be able to build libsoup-gnome library without libsoup library
+
+---
+ Makefile.am         |   13 +++++++---
+ configure.in        |   59 ++++++++++++++++++++++++++++----------------------
+ libsoup/Makefile.am |   35 +++++++++++++++++++----------
+ 3 files changed, 65 insertions(+), 42 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 686e2e6..a919d8d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,11 @@
+ AUTOMAKE_OPTIONS = 1.6
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = libsoup tests docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += tests docs
++endif
+ 
+ EXTRA_DIST =			\
+ 	libsoup-2.4.pc.in	\
+@@ -13,9 +17,10 @@ EXTRA_DIST =			\
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+-
+-pkgconfig_DATA = libsoup-2.4.pc
+-
++pkgconfig_DATA=
++if BUILD_LIBSOUP
++pkgconfig_DATA += libsoup-2.4.pc
++endif
+ if BUILD_LIBSOUP_GNOME
+ pkgconfig_DATA += libsoup-gnome-2.4.pc
+ endif
+diff --git a/configure.in b/configure.in
+index 24e0390..3f375d4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -81,7 +81,13 @@ AC_FUNC_ALLOCA
+ dnl ***********************
+ dnl *** Checks for glib ***
+ dnl ***********************
+-
++PKG_PROG_PKG_CONFIG
++enable_ssl=no
++AC_ARG_WITH(libsoup-system,
++	AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
++	[with_libsoup_system=$withval], [with_libsoup_system=no])
++  
++if test "$with_libsoup_system" = "no"; then
+ AM_PATH_GLIB_2_0(2.21.3,,,gobject gthread gio)
+ if test "$GLIB_LIBS" = ""; then
+    AC_MSG_ERROR(GLIB 2.21.3 or later is required to build libsoup)
+@@ -92,22 +98,6 @@ PKG_CHECK_MODULES(XML, libxml-2.0)
+ AC_SUBST(XML_CFLAGS)
+ AC_SUBST(XML_LIBS)
+ 
+-dnl ***********************
+-dnl *** Check for Win32 ***
+-dnl ***********************
+-
+-AC_MSG_CHECKING([for Win32])
+-case "$host" in
+-  *-*-mingw*)
+-    os_win32=yes
+-    ;;
+-  *)
+-    os_win32=no
+-    ;;
+-esac
+-AC_MSG_RESULT([$os_win32])
+-AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+-
+ dnl *******************
+ dnl *** Misc checks ***
+ dnl *******************
+@@ -169,10 +152,25 @@ fi
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(SSL_REQUIREMENT)
+-
++fi
+ dnl This is not supposed to be conditional, but...
+ AM_CONDITIONAL(HAVE_SSL, test $enable_ssl != no)
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) 
++dnl ***********************
++dnl *** Check for Win32 ***
++dnl ***********************
+ 
++AC_MSG_CHECKING([for Win32])
++case "$host" in
++  *-*-mingw*)
++    os_win32=yes
++    ;;
++  *)
++    os_win32=no
++    ;;
++esac
++AC_MSG_RESULT([$os_win32])
++AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+ 
+ dnl *********************
+ dnl *** GNOME support ***
+@@ -197,7 +202,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 c25b534..396c5f6 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -3,18 +3,16 @@
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+-
+-INCLUDES = 				\
++INCLUDES =
++lib_LTLIBRARIES = 
++if BUILD_LIBSOUP
++INCLUDES += 				\
+ 	-DG_LOG_DOMAIN=\"libsoup\" 	\
+ 	-I$(top_srcdir)			\
+ 	$(SOUP_DEBUG_FLAGS)		\
+ 	$(SOUP_MAINTAINER_FLAGS)	\
+ 	$(GLIB_CFLAGS)			\
+ 	$(XML_CFLAGS)			\
+-	$(GCONF_CFLAGS)			\
+-	$(LIBPROXY_CFLAGS)		\
+-	$(SQLITE_CFLAGS)		\
+-	$(GNOME_KEYRING_CFLAGS)		\
+ 	$(LIBGCRYPT_CFLAGS)		\
+ 	$(LIBGNUTLS_CFLAGS)
+ 
+@@ -90,7 +88,7 @@ libsoupinclude_HEADERS =	\
+ 	$(soup_headers)		\
+ 	soup-enum-types.h
+ 
+-lib_LTLIBRARIES = libsoup-2.4.la
++lib_LTLIBRARIES += libsoup-2.4.la
+ 
+ libsoup_2_4_la_LDFLAGS =	\
+ 	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
+@@ -163,9 +161,16 @@ libsoup_2_4_la_SOURCES =		\
+ 	soup-uri.c			\
+ 	soup-value-utils.c		\
+ 	soup-xmlrpc.c
++endif
+ 
+ if BUILD_LIBSOUP_GNOME
+ 
++INCLUDES += $(LIBSOUP_CFLAGS)	\
++	$(GCONF_CFLAGS)		\
++	$(LIBPROXY_CFLAGS)	\
++	$(SQLITE_CFLAGS)	\
++	$(GNOME_KEYRING_CFLAGS)
++
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+ 
+ libsoupgnomeinclude_HEADERS =	\
+@@ -174,17 +179,23 @@ libsoupgnomeinclude_HEADERS =	\
+ 	soup-gnome-features.h
+ 
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la
+-
+-libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
+-
++if BUILD_LIBSOUP
++ libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++else
++ libsoup_gnome_2_4_la_LDFLAGS =		\
++	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
++endif
+ libsoup_gnome_2_4_la_LIBADD =		\
+-	libsoup-2.4.la			\
+ 	$(GLIB_LIBS)			\
+ 	$(GCONF_LIBS)			\
+ 	$(LIBPROXY_LIBS)		\
+ 	$(SQLITE_LIBS)			\
+ 	$(GNOME_KEYRING_LIBS)
+-
++if BUILD_LIBSOUP
++ libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
++else
++ libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
++endif
+ libsoup_gnome_2_4_la_SOURCES =		\
+ 	soup-cookie-jar-sqlite.c	\
+ 	soup-gnome-features.c		\
+-- 
+1.6.5.rc1
+