Attachment 939969 Details for Bug 1145071 – patch to not depend on evolution

[patch] patch to not depend on evolution

ffgtk-0.8.6-no-evo.patch (text/plain), 1.60 KB, created by Milan Crha on 2014-09-22 10:26:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2014-09-22 10:26:12 UTC

Size: 1.60 KB

patch

obsolete

>diff -up ffgtk-0.8.6/configure.ac.no-evo ffgtk-0.8.6/configure.ac
>--- ffgtk-0.8.6/configure.ac.no-evo	2014-09-22 12:13:37.414043889 +0200
>+++ ffgtk-0.8.6/configure.ac	2014-09-22 12:13:41.365043732 +0200
>@@ -277,7 +277,7 @@ AS_IF([test "x$with_ebook" != xno],
> 		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]))
>+			PKG_CHECK_MODULES([LIBEDATASERVER], libedataserver-1.2 >= 3.5.4,, AC_MSG_ERROR([libedataserver >= 3.5.4 not found]))
> 		fi
> 		FFGTK_FEATURES_YES="\tebook\n$FFGTK_FEATURES_YES"
> 	else
>diff -up ffgtk-0.8.6/plugins/Makefile.am.no-evo ffgtk-0.8.6/plugins/Makefile.am
>--- ffgtk-0.8.6/plugins/Makefile.am.no-evo	2014-09-22 12:13:57.070043110 +0200
>+++ ffgtk-0.8.6/plugins/Makefile.am	2014-09-22 12:14:04.149042830 +0200
>@@ -56,8 +56,8 @@ endif
> 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) $(LIBEDATASERVER_CFLAGS) -DLIBDIR=\"$(libdir)/ffgtk/\" -Wall -O2  -I$(top_srcdir)/ffgtk
>+lib_ab_ebook_la_LDFLAGS=$(plugin_LDFLAGS) $(EBOOK_LIBS) $(LIBEDATASERVER_LIBS) $(EXTRA_LIBS) $(GTK_LIBS)
> endif
> 
> if WITH_GNOME_KEYRING

Actions: View | Diff

Attachments on bug 1145071: 939968 | 939969