[ffgtk] Redo evo dataserver patch as it was faulty

[Louis Lagendijk]

commit dc737c229f39777854b5736d248c998b5125e9f2
Author: Louis Lagendijk <louis.lagendijk at gmail.com>
Date:   Tue Jul 31 01:48:37 2012 +0200

    Redo evo dataserver patch as it was faulty

 ffgtk-0.8.3-evolution-dataserver-sources.patch |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/ffgtk-0.8.3-evolution-dataserver-sources.patch b/ffgtk-0.8.3-evolution-dataserver-sources.patch
index b344c96..b65ed43 100644
--- a/ffgtk-0.8.3-evolution-dataserver-sources.patch
+++ b/ffgtk-0.8.3-evolution-dataserver-sources.patch
@@ -1,6 +1,6 @@
 diff -C 4 -N -r ffgtk-0.8.3/configure.ac ffgtk-0.8.3.new/configure.ac
 *** ffgtk-0.8.3/configure.ac	2012-07-01 22:44:11.000000000 +0200
---- ffgtk-0.8.3.new/configure.ac	2012-07-31 00:11:41.581053336 +0200
+--- ffgtk-0.8.3.new/configure.ac	2012-07-31 01:43:49.539054142 +0200
 ***************
 *** 257,280 ****
   	if test "x$with_ebook" = xyes; then
@@ -27,7 +27,7 @@ diff -C 4 -N -r ffgtk-0.8.3/configure.ac ffgtk-0.8.3.new/configure.ac
   	[with_gdata=check])
   
   AC_MSG_CHECKING(for libgdata)
---- 257,288 ----
+--- 257,287 ----
   	if test "x$with_ebook" = xyes; then
   		AC_SUBST([EBOOK_CFLAGS], ["`pkg-config --cflags libebook-1.2`"])
   		AC_SUBST([EBOOK_LIBS], ["`pkg-config --libs libebook-1.2`"])
@@ -2462,21 +2462,19 @@ diff -C 4 -N -r ffgtk-0.8.3/plugins/ab_ebook.c ffgtk-0.8.3.new/plugins/ab_ebook.
 --- 0 ----
 diff -C 4 -N -r ffgtk-0.8.3/plugins/Makefile.am ffgtk-0.8.3.new/plugins/Makefile.am
 *** ffgtk-0.8.3/plugins/Makefile.am	2012-07-01 22:44:09.000000000 +0200
---- ffgtk-0.8.3.new/plugins/Makefile.am	2012-07-31 00:11:41.504070629 +0200
+--- ffgtk-0.8.3.new/plugins/Makefile.am	2012-07-31 01:44:22.924053425 +0200
 ***************
-*** 43,53 ****
+*** 43,51 ****
   lib_ab_vcard_la_LDFLAGS=$(plugin_LDFLAGS) $(EXTRA_LIBS) $(GTK_LIBS)
   
   if WITH_EBOOK
   plugin_LTLIBRARIES += lib_ab_ebook.la
 ! lib_ab_ebook_la_SOURCES = ab_ebook.c
-! lib_ab_ebook_la_CFLAGS=$(EXTRA_CFLAGS) $(GTK_CFLAGS) $(EBOOK_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -O2  -I$(top_srcdir)/ffgtk
-! lib_ab_ebook_la_LDFLAGS=$(plugin_LDFLAGS) $(EBOOK_LIBS) $(EXTRA_LIBS) $(GTK_LIBS)
+  lib_ab_ebook_la_CFLAGS=$(EXTRA_CFLAGS) $(GTK_CFLAGS) $(EBOOK_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -O2  -I$(top_srcdir)/ffgtk
+  lib_ab_ebook_la_LDFLAGS=$(plugin_LDFLAGS) $(EBOOK_LIBS) $(EXTRA_LIBS) $(GTK_LIBS)
   endif
   
-  if WITH_GNOME_KEYRING
-  plugin_LTLIBRARIES += lib_pwd_gnome.la
---- 43,62 ----
+--- 43,60 ----
   lib_ab_vcard_la_LDFLAGS=$(plugin_LDFLAGS) $(EXTRA_LIBS) $(GTK_LIBS)
   
   if WITH_EBOOK
@@ -2491,9 +2489,7 @@ diff -C 4 -N -r ffgtk-0.8.3/plugins/Makefile.am ffgtk-0.8.3.new/plugins/Makefile
 ! else
 ! lib_ab_ebook_la_SOURCES = ab_ebook/ebook-v1.c
 ! endif
-! lib_ab_ebook_la_CFLAGS=$(EXTRA_CFLAGS) $(GTK_CFLAGS) $(EBOOK_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -O2  -I$(top_srcdir)/ffgtk
-! lib_ab_ebook_la_LDFLAGS=$(plugin_LDFLAGS) $(EBOOK_LIBS) $(EXTRA_LIBS) $(GTK_LIBS)
+  lib_ab_ebook_la_CFLAGS=$(EXTRA_CFLAGS) $(GTK_CFLAGS) $(EBOOK_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -O2  -I$(top_srcdir)/ffgtk
+  lib_ab_ebook_la_LDFLAGS=$(plugin_LDFLAGS) $(EBOOK_LIBS) $(EXTRA_LIBS) $(GTK_LIBS)
   endif
   
-  if WITH_GNOME_KEYRING
-  plugin_LTLIBRARIES += lib_pwd_gnome.la