[ffgtk] Corrected patch: we do not need evolution shell
Louis Lagendijk
llagendijk at fedoraproject.org
Mon Jul 30 23:32:23 UTC 2012
commit c5ad985ead02284810927fd4d21a5c762515f0da
Author: Louis Lagendijk <louis.lagendijk at gmail.com>
Date: Tue Jul 31 01:31:39 2012 +0200
Corrected patch: we do not need evolution shell
ffgtk-0.8.3-evolution-dataserver-sources.patch | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/ffgtk-0.8.3-evolution-dataserver-sources.patch b/ffgtk-0.8.3-evolution-dataserver-sources.patch
index 944dfe4..b344c96 100644
--- a/ffgtk-0.8.3-evolution-dataserver-sources.patch
+++ b/ffgtk-0.8.3-evolution-dataserver-sources.patch
@@ -39,7 +39,6 @@ diff -C 4 -N -r ffgtk-0.8.3/configure.ac ffgtk-0.8.3.new/configure.ac
+ pkg-config --atleast-version=3.5.4 libebook-1.2 && with_ebook_registry=yes
+ if test "x$with_ebook_registry" = xyes; then
+ AC_DEFINE([HAVE_EBOOK_SOURCE_REGISTRY], 1, [Have libebook >= 3.5.4])
-+ PKG_CHECK_MODULES([EVO_SHELL], evolution-shell-3.0 >= 2.5.4,, AC_MSG_ERROR([libebook >= 2.5.4 requires evolution-shell]))
+ fi
FFGTK_FEATURES_YES="\tebook\n$FFGTK_FEATURES_YES"
else
@@ -2492,8 +2491,8 @@ 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) $(EVO_SHELL_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -O2 -I$(top_srcdir)/ffgtk
-! lib_ab_ebook_la_LDFLAGS=$(plugin_LDFLAGS) $(EBOOK_LIBS) $(EVO_SHELL_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
More information about the scm-commits
mailing list