diff options
Diffstat (limited to 'net-libs/libsoup-gnome')
| -rw-r--r-- | net-libs/libsoup-gnome/ChangeLog | 13 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-2.26.3-system-lib.patch | 206 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/libsoup-gnome-2.26.3.ebuild | 50 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/metadata.xml | 5 |
4 files changed, 274 insertions, 0 deletions
diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog new file mode 100644 index 000000000000..bd863b11e33d --- /dev/null +++ b/net-libs/libsoup-gnome/ChangeLog @@ -0,0 +1,13 @@ +# 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.1 2009/09/13 10:25:55 mrpouet Exp $ + +*libsoup-gnome-2.26.3 (13 Sep 2009) + + 13 Sep 2009; Romain Perier <mrpouet@gentoo.org> + +libsoup-gnome-2.26.3.ebuild, + +metadata.xml, + +files/libsoup-gnome-2.26.3-system-lib.patch: + New ebuild per bug #269747, libsoup-gnome is a plugin for libsoup, this is + a solution to avoid circurlar deps by moving it into libsoup PDEPEND. + 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 new file mode 100644 index 000000000000..7f7e76a6f0e1 --- /dev/null +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.26.3-system-lib.patch @@ -0,0 +1,206 @@ +From d69e946ce40477f2a3627bd3043ba31657b36342 Mon Sep 17 00:00:00 2001 +From: Romain Perier <mrpouet@gentoo.org> +Date: Sat, 12 Sep 2009 15:55:02 +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(-) + +diff --git a/Makefile.am b/Makefile.am +index 6c7dc3c..7c45a64 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,11 @@ + ## Process this file with automake to produce Makefile.in + AUTOMAKE_OPTIONS = 1.6 + +-SUBDIRS = libsoup tests docs ++SUBDIRS = libsoup docs ++ ++if BUILD_LIBSOUP ++SUBDIRS += tests ++endif + + EXTRA_DIST = \ + libsoup-2.4.pc.in \ +@@ -12,9 +16,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 902eae6..04b088d 100644 +--- a/configure.in ++++ b/configure.in +@@ -78,7 +78,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.15.3,,,gobject gthread gio) + if test "$GLIB_LIBS" = ""; then + AC_MSG_ERROR(GLIB 2.15.3 or later is required to build libsoup) +@@ -89,29 +95,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 +- # Don't do this yet, as we want to support Windows 2000 which +- # doesn't have these. +- # AC_CACHE_VAL(ac_cv_func_getaddrinfo, [ac_cv_func_getaddrinfo=yes]) +- # AC_CACHE_VAL(ac_cv_func_getnameinfo, [ac_cv_func_getnameinfo=yes]) +- # AC_CACHE_VAL(ac_cv_func_inet_pton, [ac_cv_func_inet_pton=yes]) +- # AC_CACHE_VAL(ac_cv_func_inet_ntop, [ac_cv_func_inet_ntop=yes]) +- # AC_CACHE_VAL(soup_cv_ipv6, [soup_cv_ipv6=yes]) +- ;; +- *) +- os_win32=no +- ;; +-esac +-AC_MSG_RESULT([$os_win32]) +-AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) +- + dnl ******************* + dnl *** Misc checks *** + dnl ******************* +@@ -165,10 +148,32 @@ 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 ++ # Don't do this yet, as we want to support Windows 2000 which ++ # doesn't have these. ++ # AC_CACHE_VAL(ac_cv_func_getaddrinfo, [ac_cv_func_getaddrinfo=yes]) ++ # AC_CACHE_VAL(ac_cv_func_getnameinfo, [ac_cv_func_getnameinfo=yes]) ++ # AC_CACHE_VAL(ac_cv_func_inet_pton, [ac_cv_func_inet_pton=yes]) ++ # AC_CACHE_VAL(ac_cv_func_inet_ntop, [ac_cv_func_inet_ntop=yes]) ++ # AC_CACHE_VAL(soup_cv_ipv6, [soup_cv_ipv6=yes]) ++ ;; ++ *) ++ os_win32=no ++ ;; ++esac ++AC_MSG_RESULT([$os_win32]) ++AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) + + dnl ********************* + dnl *** GNOME support *** +diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am +index 949f243..a599c40 100644 +--- a/libsoup/Makefile.am ++++ b/libsoup/Makefile.am +@@ -4,16 +4,18 @@ 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) \ + $(LIBGCRYPT_CFLAGS) \ + $(LIBGNUTLS_CFLAGS) + +@@ -87,7 +89,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 +@@ -160,9 +162,15 @@ 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) ++ + libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup + + libsoupgnomeinclude_HEADERS = \ +@@ -172,15 +180,25 @@ libsoupgnomeinclude_HEADERS = \ + + lib_LTLIBRARIES += libsoup-gnome-2.4.la + ++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) + ++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.4.2 + diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.26.3.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.26.3.ebuild new file mode 100644 index 000000000000..ca390279c2af --- /dev/null +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.26.3.ebuild @@ -0,0 +1,50 @@ +# 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 $ + +EAPI="2" + +inherit autotools eutils gnome2 + +MY_PN=${PN/-gnome} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="GNOME plugin for libsoup" +HOMEPAGE="http://www.gnome.org/" +SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="2.4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +# Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that +IUSE="debug doc" + +RDEPEND="!<net-libs/libsoup-2.26.3-r3[gnome] + ~net-libs/libsoup-${PV} + net-libs/libproxy + >=gnome-base/gconf-2 + dev-db/sqlite:3" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + doc? ( >=dev-util/gtk-doc-1 )" + +S=${WORKDIR}/${MY_P} + +DOCS="AUTHORS NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + --with-libsoup-system + --with-gnome" +} +src_prepare() { + gnome2_src_prepare + + # Fix test to follow POSIX (for x86-fbsd) + # No patch to prevent having to eautoreconf + sed -e 's/\(test.*\)==/\1=/g' -i configure.in configure || die "sed failed" + + epatch "${FILESDIR}"/${P}-system-lib.patch + eautoreconf +} diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml new file mode 100644 index 000000000000..dad9001338dc --- /dev/null +++ b/net-libs/libsoup-gnome/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>gnome</herd> +</pkgmetadata> |