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

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 58 insertions, 12 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/Manifest b/app-text/stardict/Manifest
index 4983e73d0e7d..355338df1e0c 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -15,6 +15,7 @@ AUX stardict-3.0.3-correct-glib-include.patch 243 RMD160 ed5620fc734f824c0f00a35
 AUX stardict-3.0.3-entry.patch 741 RMD160 f6307339c3b0b328a92ed5a90aca7971d62395cb SHA1 4cf50f218c046a87c033d4f39296db1b41e9ff57 SHA256 af4d049ee98b2eef865372dbda604fb8f896a09470d55088d61dd66f478d2fd6
 AUX stardict-3.0.3-gcc46.patch 279 RMD160 9138aabe80bcfc584cec6b146a43e303ec5adcad SHA1 01463361f0680e05cdd12853baa5c6b6f9924499 SHA256 fd1a102cc87b4c5cdb0256d75584ff012fa7c731a523bb2d8225bc8d3c2a26f3
 AUX stardict-3.0.3-overflow.patch 942 RMD160 cf94150d92b3d82433f3424c9eb53573433f63a7 SHA1 b138cf6aef9c465325f612d8bf64869f34f9c7f1 SHA256 8d5a4831fa47f2a8862d36bc10bcca92356cb7f12e24e66351db2117f9f29f4b
+AUX stardict-3.0.3-zlib-1.2.5.2.patch 1175 RMD160 ec3d24606d0c1f50e3dff18fc45f97c7f1227eb7 SHA1 3400d6bbda75fa22741914f59f24377e247da2f9 SHA256 4cf70114cbdb2f149890af4fc353e871fee34f3ef0a6529636efc7b1a3db82ad
 DIST QQWry.Dat.bz2 4114875 RMD160 646916f7ac234a95526f9e43cfca674c2b4b7bd1 SHA1 de7ff7208da0f889ec08911119948780d7ee4738 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83
 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 RMD160 9c9bd37cf85aaed8d5b090b2014c3122e98ba8e4 SHA1 056609ec9743bda105ff6db956b321436ae50b90 SHA256 96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870
 DIST stardict-3.0.1.tar.bz2 1964195 RMD160 296d73bd9acdbb53c21a4fb17e608a25f01b76de SHA1 a0357e88105eaf7d6a4aa4803bf8617759bf0315 SHA256 504b3a7748933b9bd998cb85f37d4fa0a8575306643ffe6a9742450e66cd556f
@@ -22,17 +23,17 @@ DIST stardict-3.0.3.tar.bz2 9147947 RMD160 4c63f3cf439a7c34829b371e75c16db97fb35
 EBUILD stardict-3.0.1-r2.ebuild 3017 RMD160 168ab2d96d29c8ba885490df95979a9a2248448f SHA1 28e4b1c7dc1869417f73caa081e003d9aebc34df SHA256 8973818ddc44c55299a81689d9170f4e89391fed52fd6ec7d40d89de20a9cab3
 EBUILD stardict-3.0.1-r3.ebuild 3097 RMD160 66d440cd319ed8c18b25fa478a9226b3e4211d3e SHA1 ee1949068fe6958f62765f600f652cffbf8045d0 SHA256 0ed1034a63f2d10c97ccbc18d8521ffb001d54247b5d6696df976ad5af6c592e
 EBUILD stardict-3.0.3-r1.ebuild 3114 RMD160 249cb8b62f14484aa3f54655dac45bf101653151 SHA1 8d77d14bab03cf47a3236d03d8c5f5848cdade78 SHA256 47e16af4847aec4a630fa17430c4765b035caddcb3651a77711a3a647c526ec1
-EBUILD stardict-3.0.3-r2.ebuild 3944 RMD160 43b32f0a174a32abf9f7727511574cf4f301ff01 SHA1 3019efa29c8fc31d101ea3e897e0528dc703cf80 SHA256 c4051054d53d8c4b39deec09af71f86dbf07c63fba911dd7a334a5e4569ea04f
-MISC ChangeLog 13006 RMD160 484d6e48a72a1ab7941d0bbba8a56c4516bbeef3 SHA1 059ff965c5465ff3b6e5db3f8a0500032fd6b175 SHA256 8a219ba4f1f92287db9a035b4f30a9e6d1f4919f2062ed3e0273475d8ae7cbac
+EBUILD stardict-3.0.3-r2.ebuild 3986 RMD160 31f9c7392f3a7802e77913e9e86c8be3b461cd81 SHA1 fed78704988a10803b822152cecba88ce4950e19 SHA256 4c26df0a53cba0aa5d29f02764ccc870749d9b805c1eb2c48e10ddbde1c41c1b
+MISC ChangeLog 13254 RMD160 3538f003a53cfe97b597137b26686d84e45a480e SHA1 35bba9069da3416b3aadd74fd852766b0a847665 SHA256 c872111129182c0a5ffde94d61ec9a2f499b9e4dafd0ac316eedea75c2b5a6c8
 MISC metadata.xml 1190 RMD160 b4d56c5e446d4838bfb4e4fe73e0d88251d45dd6 SHA1 3d83b701d05eec2740805aa2c1755de37064d29f SHA256 3fb43ab67907ce481fc39ce8f16093cdaedf9010632057a3d7501c3e44cbb49f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPJBxGAAoJEEdUh39IaPFNpcQH/RlKE2jyqrp8z9SZGFc8mYAB
-EaLsMB4NIEO0K18f3PeqjE1qM9tKzNnoI8kAj2rYv5J7MXG7sBPU/RC8QWdZWeQ0
-IGQ11ORoNaPzHQhEOcHExbx3nbQ+HJpx4TeTRALPllYWUTbrMwFpJHEsZLYLC6Y+
-qYpDybZ06fZSgqYoWF8hlR/Q6EhxLXUbHF9GlXoHn8++1TZYEO4dK1bKr8SC4JNl
-RFajuRgSMECa/fe5yEn1u0/iHhdCkYqxSnyQ/3KTLTD/yMjMWh0zCqd/zJSg+mdu
-5ZWhDyZ1qYoKVSVHi6TaKcJLDFh6Aj+or3l0dsG9AjJ2RvDYmjqtmffd+IIIGyk=
-=1WNS
+iQEcBAEBAgAGBQJPW0p9AAoJEEdUh39IaPFN3XkH/2/0cYp561A/gB/O2/EwiY0u
+Ct1k0NcjaN2vD7kfo8k0UCMssEwzJ7MLcY4EFy58eJdQfollqiBFvexWU3QevJ2b
+wqFUKeBCbDqFquiwQNvp0gryMSNxsy4YhLoL+gO+7taa7VDYe6nBficmGPEy6wVm
+B+VVFhJTuF7IPNri+AipI9ZVDuJRXOxsXft7tdtvX2OJ9MgZFWIvLoAvtobWN+g2
+QdYisEqEspxyn5Pt4IFvR+HH/o6kZCtNQqUI1t758HJpAI6oTFuXl9RomQlW+5g4
+vkbBX9YPI1SPOgoIMuq9GbHYEg9/VGEsaCTJlOZlLDiFZURPCrN0sOUYmgrZd3g=
+=kNeL
 -----END PGP SIGNATURE-----
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
 }