r2072 - /unstable/evolution-exchange/debian/patches/03_link_libical.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Dec  1 21:18:28 2011
New Revision: 2072

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2072
Log:
Actually commit the patch.

Added:
    unstable/evolution-exchange/debian/patches/03_link_libical.patch

Added: unstable/evolution-exchange/debian/patches/03_link_libical.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-exchange/debian/patches/03_link_libical.patch?rev=2072&op=file
==============================================================================
--- unstable/evolution-exchange/debian/patches/03_link_libical.patch (added)
+++ unstable/evolution-exchange/debian/patches/03_link_libical.patch Thu Dec  1 21:18:28 2011
@@ -1,0 +1,57 @@
+Index: evolution-exchange-3.0.2/calendar/Makefile.am
+===================================================================
+--- evolution-exchange-3.0.2.orig/calendar/Makefile.am	2011-12-01 21:50:10.702201880 +0100
++++ evolution-exchange-3.0.2/calendar/Makefile.am	2011-12-01 22:17:19.430164318 +0100
+@@ -9,6 +9,7 @@ libecalbackendexchange_la_CPPFLAGS = \
+ 	-DG_LOG_DOMAIN=\"e-cal-backend-exchange\" \
+ 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
+ 	$(EVOLUTION_PLUGIN_CFLAGS) \
++	$(LIBICAL_CFLAGS) \
+ 	$(LDAP_CFLAGS)
+ 
+ libecalbackendexchange_la_SOURCES = \
+@@ -34,6 +35,7 @@ libecalbackendexchange_la_LIBADD = \
+ 	$(top_builddir)/tools/libevolution-exchange-shared.la \
+ 	$(EVOLUTION_DATA_SERVER_LIBS) \
+ 	$(EVOLUTION_PLUGIN_LIBS) \
++	$(LIBICAL_LIBS) \
+ 	$(LDAP_LIBS) \
+ 	$(DNS_LIBS)
+ 
+Index: evolution-exchange-3.0.2/camel/Makefile.am
+===================================================================
+--- evolution-exchange-3.0.2.orig/camel/Makefile.am	2011-12-01 21:50:10.702201880 +0100
++++ evolution-exchange-3.0.2/camel/Makefile.am	2011-12-01 22:16:40.609974526 +0100
+@@ -6,6 +6,7 @@ CAMEL_provider_DATA = libcamelexchange.u
+ libcamelexchange_la_CPPFLAGS = \
+ 	$(AM_CPPFLAGS) \
+ 	$(EVOLUTION_PLUGIN_CFLAGS) \
++	$(LIBICAL_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/tools \
+ 	-I$(top_srcdir)/server/lib \
+@@ -44,6 +45,7 @@ libcamelexchange_la_LIBADD = \
+ 	$(top_builddir)/server/storage/libexchange-storage.la \
+ 	$(top_builddir)/tools/libevolution-exchange-shared.la \
+ 	$(EVOLUTION_PLUGIN_LIBS) \
++	$(LIBICAL_LIBS) \
+ 	$(LDAP_LIBS) \
+ 	$(SOCKET_LIBS) \
+ 	$(DNS_LIBS)
+Index: evolution-exchange-3.0.2/configure.ac
+===================================================================
+--- evolution-exchange-3.0.2.orig/configure.ac	2011-12-01 22:11:03.500326487 +0100
++++ evolution-exchange-3.0.2/configure.ac	2011-12-01 22:15:58.317767782 +0100
+@@ -279,6 +279,12 @@ case $abt in
+ esac
+ AC_DEFINE_UNQUOTED([E2K_APPROX_BUILD_TIME],[$abt],[Used to prevent clock-setting attacks against pilot licenses])
+ 
++dnl *****************
++dnl Check for libical
++dnl *****************
++PKG_CHECK_MODULES(LIBICAL, libical >= 0.43)
++AC_SUBST(LIBICAL_CFLAGS)
++AC_SUBST(LIBICAL_LIBS)
+ AC_DEFINE([HANDLE_LIBICAL_MEMORY],[1],[Define it once memory returned by libical is free'ed properly])
+ 
+ dnl **************