[gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-exchange/files: evolution-exchange-2.12.3-no-libsoup24.patch

[Mart Raudsepp (leio)]

leio        08/04/01 22:51:27

  Added:                evolution-exchange-2.12.3-no-libsoup24.patch
  Log:
  Fix broken build with libsoup-2.4 present on the system
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-no-libsoup24.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-no-libsoup24.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-no-libsoup24.patch?rev=1.1&content-type=text/plain

Index: evolution-exchange-2.12.3-no-libsoup24.patch
===================================================================
--- configure.in.orig	2008-04-01 23:56:17.000000000 +0300
+++ configure.in	2008-04-01 23:59:32.000000000 +0300
@@ -182,15 +182,9 @@
 PKG_CHECK_MODULES(MAIL, libecal-$EDS_API_VERSION)
 AC_SUBST(MAIL_CFLAGS)
 
-dnl Adding a manual detection check for libsoup, since evolution still has not 
-dnl yet decided to use which version of libsoup it would be using. This check
-dnl needs to be removed once evolution is fixed to use one version of libsoup
-PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_libsoup_24="yes", have_libsoup_24="no")
-if test $have_libsoup_24 = yes; then
-	LIBSOUP_VERSION=2.4
-else
-	LIBSOUP_VERSION=2.2
-fi
+AC_ARG_VAR(SOUP_CFLAGS, dummy)
+AC_ARG_VAR(SOUP_LIBS, dummy)
+LIBSOUP_VERSION=2.2
 
 PKG_CHECK_MODULES(EXCHANGE_STORAGE, evolution-shell evolution-plugin libedataserverui-$EDS_API_VERSION libedata-book-$EDS_API_VERSION libedata-cal-$EDS_API_VERSION libsoup-$LIBSOUP_VERSION libglade-2.0 camel-provider-$EDS_API_VERSION)
 AC_SUBST(EXCHANGE_STORAGE_CFLAGS)
--- configure.orig	2008-04-01 23:56:14.000000000 +0300
+++ configure	2008-04-01 23:59:37.000000000 +0300
@@ -1659,8 +1659,8 @@
   CAMEL_LIBS  linker flags for CAMEL, overriding pkg-config
   MAIL_CFLAGS C compiler flags for MAIL, overriding pkg-config
   MAIL_LIBS   linker flags for MAIL, overriding pkg-config
-  SOUP_CFLAGS C compiler flags for SOUP, overriding pkg-config
-  SOUP_LIBS   linker flags for SOUP, overriding pkg-config
+  SOUP_CFLAGS dummy
+  SOUP_LIBS   dummy
   EXCHANGE_STORAGE_CFLAGS
               C compiler flags for EXCHANGE_STORAGE, overriding pkg-config
   EXCHANGE_STORAGE_LIBS
@@ -24306,79 +24306,8 @@
 
 
 
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for SOUP" >&5
-echo $ECHO_N "checking for SOUP... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SOUP_CFLAGS"; then
-        pkg_cv_SOUP_CFLAGS="$SOUP_CFLAGS"
-    else
-        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
-  pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$SOUP_LIBS"; then
-        pkg_cv_SOUP_LIBS="$SOUP_LIBS"
-    else
-        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
-  pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
-        else
-	        SOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SOUP_PKG_ERRORS" >&5
-
-	have_libsoup_24="no"
-elif test $pkg_failed = untried; then
-	have_libsoup_24="no"
-else
-	SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS
-	SOUP_LIBS=$pkg_cv_SOUP_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	have_libsoup_24="yes"
-fi
-if test $have_libsoup_24 = yes; then
-	LIBSOUP_VERSION=2.4
-else
-	LIBSOUP_VERSION=2.2
-fi
+LIBSOUP_VERSION=2.2
 
 
 pkg_failed=no



-- 
gentoo-commits@l.g.o mailing list