-From 6ff741f0302bc0eddba20ed4445e68b6e71af594 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 23 Feb 2010 08:16:49 +0200
+From 97871504515f029f004d032572b9ded0da2d948e Mon Sep 17 00:00:00 2001
+From: Arun Raghavan <ford_prefect@gentoo.org>
+Date: Sun, 20 Jun 2010 18:15:01 +0530
Subject: [PATCH] Split support for libgnome-soup.
Original patch by Romain Perier.
---
Makefile.am | 13 ++++++++++---
configure.ac | 49 ++++++++++++++++++++++++++++++++-----------------
- libsoup/Makefile.am | 36 +++++++++++++++++++++++++++---------
- 3 files changed, 69 insertions(+), 29 deletions(-)
+ libsoup/Makefile.am | 49 +++++++++++++++++++++++++++++++++++++++----------
+ 3 files changed, 81 insertions(+), 30 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index b845e29..21529dd 100644
+index 861daff..039fb80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,12 @@
EXTRA_DIST = \
libsoup-2.4.pc.in \
-@@ -13,8 +18,10 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+@@ -14,8 +19,10 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA += libsoup-gnome-2.4.pc
endif
diff --git a/configure.ac b/configure.ac
-index eb45cfc..a8cd7ed 100644
+index 275620d..d25875e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,14 @@ dnl ***********************
+ [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)
[Could not find libproxy:
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index 284d85f..cfb89b4 100644
+index 2e7c1fb..306ee8f 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
-@@ -4,17 +4,17 @@ if OS_WIN32
+@@ -4,17 +4,18 @@ if OS_WIN32
LIBWS2_32 = -lws2_32
endif
-INCLUDES = \
+INCLUDES =
-+lib_LTLIBRARIES =
++lib_LTLIBRARIES =
++CLEANFILES =
+
+if BUILD_LIBSOUP
+INCLUDES += \
$(LIBGCRYPT_CFLAGS) \
$(LIBGNUTLS_CFLAGS)
-@@ -91,7 +91,7 @@ libsoupinclude_HEADERS = \
+@@ -45,7 +46,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS)
+
+ BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
+
+-CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
++CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
+
+ libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
+
+@@ -91,7 +92,7 @@ libsoupinclude_HEADERS = \
$(soup_headers) \
soup-enum-types.h
libsoup_2_4_la_LDFLAGS = \
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -171,10 +171,18 @@ libsoup_2_4_la_SOURCES = \
+@@ -171,10 +172,18 @@ libsoup_2_4_la_SOURCES = \
soup-value-utils.c \
soup-xmlrpc.c
libsoupgnomeinclude_HEADERS = \
soup-cookie-jar-sqlite.h\
soup-gnome.h \
-@@ -182,16 +190,26 @@ libsoupgnomeinclude_HEADERS = \
+@@ -182,16 +191,26 @@ libsoupgnomeinclude_HEADERS = \
lib_LTLIBRARIES += libsoup-gnome-2.4.la
libsoup_gnome_2_4_la_SOURCES = \
soup-cookie-jar-sqlite.c \
soup-gnome-features.c \
-@@ -205,4 +223,4 @@ endif
- EXTRA_DIST= \
- soup-marshal.list \
- soup-enum-types.h.tmpl \
-- soup-enum-types.c.tmpl
-\ No newline at end of file
-+ soup-enum-types.c.tmpl
+@@ -212,6 +231,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+
+ if HAVE_INTROSPECTION
+
++if BUILD_LIBSOUP
++
+ # Core library
+ gi_soup_files = \
+ $(filter-out soup.h soup-enum-types.% soup-marshal.%,\
+@@ -231,13 +252,21 @@ Soup_2_4_gir_FILES = \
+
+ INTROSPECTION_GIRS += Soup-2.4.gir
+
++endif
++
+ if BUILD_LIBSOUP_GNOME
+
++if BUILD_LIBSOUP
++SOUP_GIR = Soup-2.4.gir
++else
++SOUP_GIR =
++endif
++
+ # GNOME extensions
+ gi_soup_gnome_files = $(filter-out soup-gnome.h,\
+ $(libsoupgnomeinclude_HEADERS) \
+ $(libsoup_gnome_2_4_la_SOURCES))
+-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
++SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
+ SoupGNOME_2_4_gir_SCANNERFLAGS = --strip-prefix=soup
+ SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
+ SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
--
-1.7.0
+1.7.1
# Copyright 1999-2010 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.30.1.ebuild,v 1.3 2010/06/16 18:18:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild,v 1.4 2010/06/20 14:07:24 ford_prefect Exp $
EAPI="2"
DESCRIPTION="GNOME plugin for libsoup"
HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI//-gnome}"
+SRC_URI="${SRC_URI//-gnome}
+ mirror://gentoo/${MY_P}-build-gir-patches.tar.bz2"
LICENSE="LGPL-2"
SLOT="2.4"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
# Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that
-IUSE="debug doc"
+IUSE="debug doc +introspection"
RDEPEND="~net-libs/libsoup-${PV}
|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
net-libs/libproxy
>=gnome-base/gconf-2
- dev-db/sqlite:3"
+ dev-db/sqlite:3
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9
dev-util/gtk-doc-am
pkg_setup() {
G2CONF="${G2CONF}
--disable-static
+ $(use_enable introspection)
--with-libsoup-system
--with-gnome"
}
# No patch to prevent having to eautoreconf
sed -e 's/\(test.*\)==/\1=/g' -i configure.ac configure || die "sed failed"
+ if use introspection; then
+ epatch "${WORKDIR}/${MY_P}-build-gir-1.patch"
+ epatch "${WORKDIR}/${MY_P}-build-gir-2.patch"
+ fi
+
# Use lib present on the system
epatch "${FILESDIR}"/${PN}-2.30.1-system-lib.patch
eautoreconf
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.30.1.ebuild,v 1.2 2010/06/14 23:03:41 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.30.1.ebuild,v 1.3 2010/06/20 14:05:16 ford_prefect Exp $
EAPI="2"
DESCRIPTION="An HTTP library implementation in C"
HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+ mirror://gentoo/${P}-build-gir-patches.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 gnome ssl"
+IUSE="debug doc +introspection gnome ssl"
RDEPEND=">=dev-libs/glib-2.21.3
>=dev-libs/libxml2-2
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
ssl? ( >=net-libs/gnutls-2.1.7 )"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9
G2CONF="${G2CONF}
--disable-static
--without-gnome
+ $(use_enable introspection)
$(use_enable ssl)"
}
# Fix bug 268592 (build fails !gnome && doc)
epatch "${FILESDIR}/${P}-fix-build-without-gnome-with-doc.patch"
fi
+
+ if use introspection; then
+ epatch "${WORKDIR}/${P}-build-gir-1.patch"
+ epatch "${WORKDIR}/${P}-build-gir-2.patch"
+ fi
+
eautoreconf
}
projects / gentoo.git / commitdiff