polynomial-c    14/10/30 20:48:35

  Added:                pidgin-2.10.10-eds-3.6-configure.ac.patch
  Log:
  Fixed detection of evolution data server with USE=eds (bug #526644)
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
0x981CA6FC)

Revision  Changes    Path
1.1                  
net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/files/pidgin-2.10.10-eds-3.6-configure.ac.patch?rev=1.1&content-type=text/plain

Index: pidgin-2.10.10-eds-3.6-configure.ac.patch
===================================================================
diff -urN pidgin-2.10.10.orig/configure.ac pidgin-2.10.10/configure.ac
--- pidgin-2.10.10.orig/configure.ac    2014-10-17 04:19:33.000000000 +0400
+++ pidgin-2.10.10/configure.ac 2014-10-28 15:56:27.853702740 +0300
@@ -569,18 +569,10 @@
        dnl # Check for stuff needed by the Evolution integration plugin.
        dnl 
#######################################################################
        if test "x$enable_gevolution" = "xyes"; then
-               evo_deps="libebook-1.2 libedata-book-1.2 
evolution-data-server-1.2 < 3.6"
+               evo_deps="libebook-1.2 libedata-book-1.2 
evolution-data-server-1.2 >= 3.6"
                PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, , [
                        enable_gevolution="no"
                ])
-               if test "x$enable_gevolution" = "xno"; then
-                       evo_deps="libebook-1.0 libedata-book-1.0"
-                       PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
-                               enable_gevolution="yes"
-                       ], [
-                               enable_gevolution="no"
-                       ])
-               fi
                if test "x$enable_gevolution" = "xyes"; then
                        AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if 
we're using evolution addressbook.])
                        AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)




Reply via email to