[zarafa] Added patch to solve invalid conversion conflicting with zlib >= 1.2.8
Robert Scheck
robert at fedoraproject.org
Tue Jun 19 21:42:58 UTC 2012
commit 77009649489505e9c3cf54b154cf7e3f094947d0
Author: Robert Scheck <robert at fedoraproject.org>
Date: Tue Jun 19 23:42:39 2012 +0200
Added patch to solve invalid conversion conflicting with zlib >= 1.2.8
zarafa-7.0.8-zlib127.patch | 27 +++++++++++++++++++++++++++
zarafa.spec | 2 ++
2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/zarafa-7.0.8-zlib127.patch b/zarafa-7.0.8-zlib127.patch
new file mode 100644
index 0000000..49f1e16
--- /dev/null
+++ b/zarafa-7.0.8-zlib127.patch
@@ -0,0 +1,27 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for zarafa >= 7.0.8, which solves
+the invalid conversion that causes since zlib >= 1.2.8 a build failure like this:
+
+ECLogger.cpp:169:14: error: invalid conversion from 'gzFile_s* (*)(const char*,
+ const char*)' to 'ECLogger_File::open_func {aka void* (*)(const char*, const
+ char*)}' [-fpermissive]
+ECLogger.cpp:170:15: error: invalid conversion from 'int (*)(gzFile) {aka int (*)
+ (gzFile_s*)}' to 'ECLogger_File::close_func {aka int (*)(void*)}' [-fpermissive]
+ECLogger.cpp:171:16: error: invalid conversion from 'int (*)(gzFile, const char*,
+ ...) {aka int (*)(gzFile_s*, const char*, ...)}' to 'ECLogger_File::printf_func
+ {aka int (*)(void*, const char*, ...)}' [-fpermissive]
+
+--- zarafa-7.0.8/common/ECLogger.cpp 2012-06-18 18:55:28.000000000 +0200
++++ zarafa-7.0.8/common/ECLogger.cpp.zlib127 2012-06-19 23:23:06.000000000 +0200
+@@ -166,9 +166,9 @@
+ szMode = NULL;
+ } else {
+ if (compress) {
+- fnOpen = &gzopen;
+- fnClose = &gzclose;
+- fnPrintf = &gzprintf;
++ fnOpen = (open_func)&gzopen;
++ fnClose = (close_func)&gzclose;
++ fnPrintf = (printf_func)&gzprintf;
+ fnFileno = NULL;
+ fnFlush = NULL; // gzflush does exist, but degrades performance
+ szMode = "wb";
diff --git a/zarafa.spec b/zarafa.spec
index 3d5cdbc..1eb63c9 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -43,6 +43,7 @@ Source2: %{name}.logrotate
Source3: %{name}-webaccess.conf
Patch0: zarafa-6.40.5-rpath.patch
+Patch1: zarafa-7.0.8-zlib127.patch
BuildRequires: bison
BuildRequires: gcc-c++
@@ -370,6 +371,7 @@ to interact with Zarafa.
%setup -q
%patch0 -p1 -b .rpath
touch -c -r aclocal.m4.rpath aclocal.m4
+%patch1 -p1 -b .zlib127
%build
%if 0%{?rhel}%{?fedora} < 6
More information about the scm-commits
mailing list