diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2008-03-26 01:31:12 +0000 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2008-03-26 01:31:12 +0000 |
| commit | da7274b61c50c4a330b2b6436fa41fcf88c122cf (patch) | |
| tree | 849ba4c5716eae288ff470fc1fa46312041c6c90 /gnome-extra | |
| parent | minor fixes to gimp (diff) | |
| download | gentoo-2-da7274b61c50c4a330b2b6436fa41fcf88c122cf.tar.gz gentoo-2-da7274b61c50c4a330b2b6436fa41fcf88c122cf.tar.bz2 gentoo-2-da7274b61c50c4a330b2b6436fa41fcf88c122cf.zip | |
Do not build against libsoup-2.4 if available in this older version - it does not work with the stable API of libsoup-2.4, bug 214488
(Portage version: 2.1.4.4)
Diffstat (limited to 'gnome-extra')
3 files changed, 58 insertions, 2 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index 822bd8f04168..e4663af62299 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.174 2008/03/24 23:07:41 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.175 2008/03/26 01:31:11 leio Exp $ + + 26 Mar 2008; Mart Raudsepp <leio@gentoo.org> + +files/evolution-data-server-1.12.3-no-libsoup24.patch, + evolution-data-server-1.12.3.ebuild: + Do not build against libsoup-2.4 if available in this older version - it + does not work with the stable API of libsoup-2.4, bug 214488 24 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> evolution-data-server-2.22.0.ebuild: diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild index 4a4d204fbee4..2e807ba45da0 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild,v 1.9 2008/02/04 04:34:35 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild,v 1.10 2008/03/26 01:31:11 leio Exp $ EAPI="1" inherit db-use eutils flag-o-matic gnome2 autotools @@ -84,6 +84,9 @@ src_unpack() { # Fix broken gtk-doc.make epatch "${FILESDIR}"/${PN}-1.12.3-gtk-doc.patch + # Don't check for libsoup-2.4 - is not adapted to further API changes in 2.3 development + epatch "${FILESDIR}/${P}-no-libsoup24.patch" + #-------------Upstream GNOME look here -----------------# # --as-needed fixes diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch new file mode 100644 index 000000000000..2f78ccdf7c73 --- /dev/null +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch @@ -0,0 +1,47 @@ +--- configure.in.orig 2008-03-26 02:45:26.000000000 +0200 ++++ configure.in 2008-03-26 02:46:03.000000000 +0200 +@@ -1407,14 +1407,8 @@ + AC_SUBST(E_FACTORY_LIBS) + + dnl --- Groupwise flags +-PKG_CHECK_EXISTS(libsoup-2.4, have_libsoup_24=yes, have_libsoup_24=no) +-if test $have_libsoup_24 = yes; then +- LIBSOUP_REQUIRED=2.3.0 +- LIBSOUP=libsoup-2.4 +-else +- LIBSOUP_REQUIRED=2.2.91 +- LIBSOUP=libsoup-2.2 +-fi ++LIBSOUP_REQUIRED=2.2.91 ++LIBSOUP=libsoup-2.2 + AC_SUBST(LIBSOUP_REQUIRED) + AC_SUBST(LIBSOUP) + EVO_SET_COMPILE_FLAGS(SOUP, $LIBSOUP >= $LIBSOUP_REQUIRED) +--- configure.orig 2008-03-26 02:45:29.000000000 +0200 ++++ configure 2008-03-26 02:46:18.000000000 +0200 +@@ -31479,23 +31479,8 @@ + + + +-if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- have_libsoup_24=yes +-else +- have_libsoup_24=no +-fi +-if test $have_libsoup_24 = yes; then +- LIBSOUP_REQUIRED=2.3.0 +- LIBSOUP=libsoup-2.4 +-else +- LIBSOUP_REQUIRED=2.2.91 +- LIBSOUP=libsoup-2.2 +-fi ++LIBSOUP_REQUIRED=2.2.91 ++LIBSOUP=libsoup-2.2 + + + |