[zarafa] Added patch to compile with Boost 1.49 on Rawhide
Robert Scheck
robert at fedoraproject.org
Sat Dec 17 14:07:25 UTC 2011
commit 48446669ef956099c5acded37f3b854b9343bd57
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sat Dec 17 15:07:14 2011 +0100
Added patch to compile with Boost 1.49 on Rawhide
zarafa-7.0.3-boost149.patch | 28 ++++++++++++++++++++++++++++
zarafa.spec | 3 +++
2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/zarafa-7.0.3-boost149.patch b/zarafa-7.0.3-boost149.patch
new file mode 100644
index 0000000..6f50c8d
--- /dev/null
+++ b/zarafa-7.0.3-boost149.patch
@@ -0,0 +1,28 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for zarafa >= 7.0.3, which allows
+to compile Zarafa 7.0.3 using Boost 1.49. This is neccessary, because Zarafa uses
+Boost filesystem version 2 while it got deprecated with Boost 1.48. However, Boost
+1.49 is still shipping filesystem version 2. For the time being, this allows us to
+compile Zarafa still with newer Boost versions.
+
+--- zarafa-7.0.3/configure 2011-12-17 14:47:32.000000000 +0100
++++ zarafa-7.0.3/configure.boost149 2011-12-17 14:48:34.000000000 +0100
+@@ -30975,7 +30975,7 @@
+ { echo "$as_me:$LINENO: checking boost version compatibility" >&5
+ echo $ECHO_N "checking boost version compatibility... $ECHO_C" >&6; }
+ if test -n "$boost_major_version" -a $boost_major_version -ge 146; then
+- if test $boost_major_version -ge 148; then
++ if test $boost_major_version -ge 149; then
+ { { echo "$as_me:$LINENO: error: boost version is too new" >&5
+ echo "$as_me: error: boost version is too new" >&2;}
+ { (exit 1); exit 1; }; }
+--- zarafa-7.0.3/configure.ac 2011-11-16 23:00:21.000000000 +0100
++++ zarafa-7.0.3/configure.ac.boost149 2011-12-17 14:48:20.000000000 +0100
+@@ -657,7 +657,7 @@
+ BOOST_DATE_TIME([mt])
+ AC_MSG_CHECKING([boost version compatibility])
+ if test -n "$boost_major_version" -a $boost_major_version -ge 146; then
+- if test $boost_major_version -ge 148; then
++ if test $boost_major_version -ge 149; then
+ AC_MSG_ERROR([boost version is too new])
+ fi
+ AC_MSG_RESULT([adding backward compatible flags])
diff --git a/zarafa.spec b/zarafa.spec
index da829f6..2b838d5 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -42,6 +42,7 @@ Source2: %{name}.logrotate
Source3: %{name}-webaccess.conf
Patch0: zarafa-6.40.5-rpath.patch
+Patch1: zarafa-7.0.3-boost149.patch
BuildRequires: bison
BuildRequires: gcc-c++
@@ -366,6 +367,8 @@ to interact with Zarafa.
%setup -q
%patch0 -p1 -b .rpath
touch -c -r aclocal.m4.rpath aclocal.m4
+%patch1 -p1 -b .boost149
+touch -c -r configure.ac.boost149 configure.ac
%build
%if 0%{?rhel}%{?fedora} < 6
More information about the scm-commits
mailing list