Fix compability with sys-libs/zlib >= 1.2.5.2 wrt #401887 by Sergei Trofimovich. Thanks to Attila Stehr for reporting.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 48 insertions, 3 deletions

diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index 4120356a2324..6944f3fd6f92 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/stardict
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.21 2012/01/28 16:05:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.22 2012/03/10 12:35:07 ssuominen Exp $
+
+  10 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> stardict-3.0.3-r2.ebuild,
+  +files/stardict-3.0.3-zlib-1.2.5.2.patch:
+  Fix compability with sys-libs/zlib >= 1.2.5.2 wrt #401887 by Sergei
+  Trofimovich. Thanks to Attila Stehr for reporting.
 
   28 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> stardict-3.0.3-r1.ebuild:
   ppc/ppc64 stable wrt #399783
diff --git a/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch
new file mode 100644
index 000000000000..6a320bd4a9f2
--- /dev/null
+++ b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/401887
+
+diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp
+index 16770a3..a4299e7 100644
+--- a/lib/src/libcommon.cpp
++++ b/lib/src/libcommon.cpp
+@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* out_file_name)
+ 		return EXIT_FAILURE;
+ 	}
+ 	while(true) {
+-		len = gzread(get_impl(in), buf, buffer_size);
++		len = gzread((gzFile)get_impl(in), buf, buffer_size);
+ 		if(len < 0) {
+ 			g_critical(read_file_err, arch_file_name, "");
+ 			return EXIT_FAILURE;
+@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path)
+ 		return res;
+ 	}
+ }
++
++int gzclose_compat(void * file)
++{
++    return gzclose ((gzFile)file);
++}
+diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h
+index 10f13b4..bdcbf2f 100644
+--- a/lib/src/libcommon.h
++++ b/lib/src/libcommon.h
+@@ -187,8 +187,9 @@ namespace clib {
+ 	typedef ResourceWrapper<FILE, FILE*, int, fclose> File;
+ }
+ 
++extern int gzclose_compat(void * file);
+ namespace zip {
+-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile;
+ }
+ 
+ /* Create a new temporary file. Return file name in file name encoding.
diff --git a/app-text/stardict/stardict-3.0.3-r2.ebuild b/app-text/stardict/stardict-3.0.3-r2.ebuild
index c97fc5c40ebb..6e659b380e51 100644
--- a/app-text/stardict/stardict-3.0.3-r2.ebuild
+++ b/app-text/stardict/stardict-3.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3-r2.ebuild,v 1.1 2012/01/22 22:50:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.3-r2.ebuild,v 1.2 2012/03/10 12:35:07 ssuominen Exp $
 
 # NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
 #       their indexes seem to be in a different format. So we'll keep them
@@ -76,7 +76,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-entry.patch \
 		"${FILESDIR}"/${P}-gcc46.patch \
 		"${FILESDIR}"/${P}-compositelookup_cpp.patch \
-		"${FILESDIR}"/${P}-overflow.patch
+		"${FILESDIR}"/${P}-overflow.patch \
+		"${FILESDIR}"/${P}-zlib-1.2.5.2.patch
 
 	gnome2_src_prepare
 }