diff options
| author |   Romain Perier <mrpouet@gentoo.org> | 2009-09-13 14:35:59 +0000 |
|---|---|---|
| committer | Romain Perier <mrpouet@gentoo.org> | 2009-09-13 14:35:59 +0000 |
| commit | 842e77cd6f3622a3a20cde4f1a860c8de3d530ef (patch) | |
| tree | 4dd1f73b6ef8ceb639780265c8dd7cd81ceedbeb /net-libs/libsoup-gnome | |
| parent | Delete description of unused "web" USE flag. (diff) | |
| download | gentoo-2-842e77cd6f3622a3a20cde4f1a860c8de3d530ef.tar.gz gentoo-2-842e77cd6f3622a3a20cde4f1a860c8de3d530ef.tar.bz2 gentoo-2-842e77cd6f3622a3a20cde4f1a860c8de3d530ef.zip | |
Fix bug #284760 and #284755 by adding docs subdirectory conditionnally only when libsoup embedded lib is built (API docs was exactly the same, and already installed by libsoup, even for gnome)
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libsoup-gnome')
| -rw-r--r-- | net-libs/libsoup-gnome/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-2.26.3-system-lib.patch | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog index bd863b11e33d..d81df9f3088a 100644 --- a/net-libs/libsoup-gnome/ChangeLog +++ b/net-libs/libsoup-gnome/ChangeLog @@ -1,6 +1,12 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.2 2009/09/13 14:35:59 mrpouet Exp $ + + 13 Sep 2009; Romain Perier <mrpouet@gentoo.org> + files/libsoup-gnome-2.26.3-system-lib.patch: + Fix bug #284760 and #284755 by adding docs subdirectory conditionnally + only when libsoup embedded lib is built (API docs was exactly the + same, and already installed by libsoup). *libsoup-gnome-2.26.3 (13 Sep 2009) 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 7f7e76a6f0e1..d65945093c7c 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,6 +1,6 @@ -From d69e946ce40477f2a3627bd3043ba31657b36342 Mon Sep 17 00:00:00 2001 +From d760a92ed2ab93e64aca889cd6bbc8b1ffecc63b Mon Sep 17 00:00:00 2001 From: Romain Perier <mrpouet@gentoo.org> -Date: Sat, 12 Sep 2009 15:55:02 +0200 +Date: Sun, 13 Sep 2009 16:20:10 +0200 Subject: [PATCH] Add --with-libsoup-system option in order to be able to build gnome plugin without libsoup library --- @@ -10,7 +10,7 @@ Subject: [PATCH] Add --with-libsoup-system option in order to be able to build g 3 files changed, 62 insertions(+), 34 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 6c7dc3c..7c45a64 100644 +index 6c7dc3c..7c95031 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,11 @@ @@ -18,10 +18,10 @@ index 6c7dc3c..7c45a64 100644 AUTOMAKE_OPTIONS = 1.6 -SUBDIRS = libsoup tests docs -+SUBDIRS = libsoup docs ++SUBDIRS = libsoup + +if BUILD_LIBSOUP -+SUBDIRS += tests ++SUBDIRS += tests docs +endif EXTRA_DIST = \ |