[evolution-mapi] Add build-fail patch
Milan Crha
mcrha at fedoraproject.org
Mon Nov 28 08:30:28 UTC 2011
commit 45d35dc78d6ea30c7e9789b3efb8b1e8ce05d359
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Nov 28 09:30:11 2011 +0100
Add build-fail patch
evolution-mapi-3.3.2-build-fail.patch | 41 +++++++++++++++++++++++++++++++++
evolution-mapi.spec | 2 +
2 files changed, 43 insertions(+), 0 deletions(-)
---
diff --git a/evolution-mapi-3.3.2-build-fail.patch b/evolution-mapi-3.3.2-build-fail.patch
new file mode 100644
index 0000000..287cff1
--- /dev/null
+++ b/evolution-mapi-3.3.2-build-fail.patch
@@ -0,0 +1,41 @@
+diff --git a/configure.ac b/configure.ac
+index b960aef..67fc987 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -159,6 +159,23 @@ LIBS=$save_libs
+ AC_MSG_RESULT([$ac_cv_have_saw])
+
+ dnl ****************************
++dnl Check for struct mapi_SLPSTRArrayW function
++dnl ****************************
++AC_MSG_CHECKING([libmapi struct mapi_SLPSTRArrayW])
++save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
++save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM(
++ [[#include <libmapi/libmapi.h>]],
++ [[struct mapi_SLPSTRArrayW str;]])],
++ [ac_cv_have_msaw=yes],
++ [ac_cv_have_msaw=no
++ save_cflags="$save_cflags -Dmapi_SLPSTRArrayW=mapi_SPLSTRArrayW"
++ ])
++CFLAGS=$save_cflags
++LIBS=$save_libs
++AC_MSG_RESULT([$ac_cv_have_msaw])
++
++dnl ****************************
+ dnl Expose version information
+ dnl ****************************
+ API_VERSION=$EDS_PACKAGE
+diff --git a/src/libexchangemapi/e-mapi-cal-utils.c b/src/libexchangemapi/e-mapi-cal-utils.c
+index c231075..bb9cf6d 100644
+--- a/src/libexchangemapi/e-mapi-cal-utils.c
++++ b/src/libexchangemapi/e-mapi-cal-utils.c
+@@ -2590,7 +2590,7 @@ e_mapi_cal_util_object_to_comp (EMapiConnection *conn,
+ ECalComponent *comp = NULL;
+ struct timeval t;
+ const gchar *str;
+- const struct mapi_SPLSTRArrayW *categories_array;
++ const struct mapi_SLPSTRArrayW *categories_array;
+ const struct SBinary_short *bin;
+ const uint32_t *ui32;
+ const bool *b;
diff --git a/evolution-mapi.spec b/evolution-mapi.spec
index 2d3a353..2dee6a1 100644
--- a/evolution-mapi.spec
+++ b/evolution-mapi.spec
@@ -24,6 +24,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Patch01: evolution-mapi-3.0.0-add-rpath.patch
Patch02: evolution-mapi-3.3.2-no-deprecated.patch
+Patch03: evolution-mapi-3.3.2-build-fail.patch
### Dependencies ###
@@ -64,6 +65,7 @@ Development files needed for building things which link against %{name}.
%setup -q
%patch01 -p1 -b .add-rpath
%patch02 -p1 -b .no-deprecated
+%patch03 -p1 -b .build-fail
%build
More information about the scm-commits
mailing list