Fix minizip related build issue, bug #384681. Thank Paul Volkov for report and rion for fix.

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

4 files changed, 306 insertions, 8 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 767ba5df429a..0ff9f89d2de1 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.212 2011/07/31 19:59:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.213 2011/10/04 07:11:35 pva Exp $
+
+  04 Oct 2011; Peter Volkov <pva@gentoo.org> psi-0.14-r2.ebuild,
+  +files/psi-0.14-minizip-detection.patch:
+  Fix minizip related build issue, bug #384681. Thank Paul Volkov for report
+  and rion for fix.
 
   31 Jul 2011; Jeroen Roovers <jer@gentoo.org> psi-0.14-r2.ebuild:
   Stable for HPPA (bug #372591).
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index ad88ebe7b2b4..b5d143729a37 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,20 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX psi-0.14-minizip-detection.patch 6539 RMD160 4fa6e4991e338ee8a69c766675798655e7827153 SHA1 4052c6f01380a5fcf0879266b76e0bfaeae9d33a SHA256 04ac9f7b908c60a1288e1446625038a45637fabf387848cd135f20a4b71529c3
 AUX psi-0.14-qt-compat.patch 1492 RMD160 eafdbe9391496bfd2198eaf6aa0637b569331c4a SHA1 5639a2078b1cbe318a4ba7d930fead6101766b59 SHA256 1af6ebbe01094519fcdbbe442a3c5798d499da134a08787648e71783e7b0ba60
 DIST psi-0.14.tar.bz2 2168801 RMD160 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f SHA1 f5f8e1a427339a4e9113b5fa513b01a42ae1be4b SHA256 aa014a20d59beb23ce2e853fac3d1d70b4b029591627ae0f0a6a3b9f7150a4c0
 DIST psi-0.14_langpack_for_packagers_2009-12-02.zip 2553616 RMD160 4c3ea59043b91d607a3e30f3cec574e5787a0553 SHA1 6c9ce5717bd3a46a0d1f5eabb3b4756099590435 SHA256 27e5cec1847454c9ac3726122b204d923e87c11e1e37e8960c49c17fd4d74dc2
 DIST psi-extra-iconsets-r1428.tar.bz2 3214991 RMD160 5aba49e65ca39209a4791c6e5eb400a54c4a9341 SHA1 969d55207eb89a5000442b57819e98b0a44f37c0 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c
 DIST psi-extra-patches-r1428.tar.bz2 131700 RMD160 071eadf3a174f392cfb7202a85d2082b3256c76e SHA1 78cfe1f6b8a15852b9ed72c0dd569c9b4e6d9fac SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48
 EBUILD psi-0.14-r1.ebuild 4668 RMD160 7e3aed2859dc2880471640af3a1c6296df848889 SHA1 37c58876124c1696b1111d8c11ee140ba93ee86d SHA256 7e7bf643317bc775d0e0e9d747e307edd6cba96a8f2a1162e62565fd383334bb
-EBUILD psi-0.14-r2.ebuild 4712 RMD160 6a2bb461272cf337890a79d7f79e3f592852f96e SHA1 6a87df81de2c607cbde8805869b5d3e4d10d9041 SHA256 fd906ccb32c163fd951a8d8a8927c9cf29d5ff77f80fb7ed8184419e4d0aaca0
+EBUILD psi-0.14-r2.ebuild 4767 RMD160 8577968b92ca9e9c23222b2caaa8b70c86b41ce4 SHA1 4282e29358296d6f44e99d1fb88618dc107a82e9 SHA256 0933ae51870de2849f0b3543c1826a7784016ed40d21fd3e46db4a192f4c235b
 EBUILD psi-9999.ebuild 6274 RMD160 4990e95378f6436e54381205ada5a12c7cb5a028 SHA1 f585c22d9434ea63cb6e2355f736a0ab5dcfd175 SHA256 ce57eabc0adf28ef23d2cf77b2e0c6efa8fb9ffe84a97918611954e561cdfedd
-MISC ChangeLog 31109 RMD160 7a523f7c5ee915300cb615483dd2ad12930426c9 SHA1 fd6dc2c28106a993733c00fe50427eaa5a62e2cc SHA256 98c1772528b1f311db272661c704e9e0c9b5e6682442e0a4c6c77d68e42d92bd
+MISC ChangeLog 31315 RMD160 2dec81cff9dd8d50b3e64bf9e3bd3149f3a1bbcc SHA1 77e53f2dabdbb9d791e92898cd7ae300315cc188 SHA256 92d9f26e3b604b621cb4dd343f135b44f5a846a2a26cef55d7b70de1b26297cf
 MISC metadata.xml 1045 RMD160 41a67d4b456737917e90945bfd1ca1798603b7dd SHA1 38066b4c6e461321d33471202cc212d56aa8f463 SHA256 2d2db4b3989de29ab27080da8e7d4301b4b6a85a1f55a405a17de10d93a92be2
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk6KsVEACgkQGrk+8vGYmwd9OgD+PJQswc/+aMfQawF+tp5Z8sk0
+PNkqBHzfGwpt0z4ZTo8A/16SmyjmFYbcI6Yn1SlGzeMVdwjJ1HoTghsy5OPXKp4J
+=Hxrq
+- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk41tCkACgkQVWmRsqeSphPTbgCfZQnfR9Y7JbmnDpd+vZaojdEF
-4/4An0mZnYy7tVZT4hiRqVHg/UHKlzvj
-=10dz
+iF4EAREIAAYFAk6KsX0ACgkQGrk+8vGYmwfIVQD/RzDHdyB6P92mhBRud+W7qxuE
+z/AHzqT5IxlHCWErXpsA/1n6WeP89PY4qyoCqtD51M3uQ2K7OLwqtOysIR/qn9MP
+=d8+/
 -----END PGP SIGNATURE-----
diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch
new file mode 100644
index 000000000000..61ad4114f308
--- /dev/null
+++ b/net-im/psi/files/psi-0.14-minizip-detection.patch
@@ -0,0 +1,281 @@
+=== modified file 'conf_windows.pri'
+--- conf_windows.pri	2011-10-04 06:27:15 +0000
++++ conf_windows.pri	2011-10-04 06:27:28 +0000
+@@ -5,7 +5,7 @@
+ #CONFIG += qca-static
+ 
+ # tell iris to use our internal libz
+-CONFIG += psi-zip
++CONFIG += psi-winzlib
+ 
+ # OpenSSL
+ qca-static {
+
+=== modified file 'configure'
+--- configure	2011-10-04 06:27:15 +0000
++++ configure	2011-10-04 06:27:38 +0000
+@@ -955,41 +955,68 @@
+ 	{
+ #ifdef Q_OS_WIN
+ 		// HACK: on windows, always use psi's bundled zlib
+-		conf->addExtra("CONFIG += psi-zip");
++		conf->addExtra("CONFIG += psi-winzlib psi-minizip");
+ 		return true;
+ #else
+-		QString inc, lib;
++		QStringList incs;
++		QString version, libs, other;
+ 		QString s;
+ 
+-		s = conf->getenv("QC_WITH_ZLIB_INC");
+-		if(!s.isEmpty()) {
+-			if(!conf->checkHeader(s, "zlib.h"))
+-				return false;
+-			inc = s;
+-		}
+-		else {
+-			if(!conf->findHeader("zlib.h", QStringList(), &s))
+-				return false;
+-			inc = s;
+-		}
+-
+-		s = conf->getenv("QC_WITH_ZLIB_LIB");
+-		if(!s.isEmpty()) {
+-			if(!conf->checkLibrary(s, "z"))
+-				return false;
+-			lib = s;
+-		}
+-		else {
+-			if(!conf->findLibrary("z", &s))
+-				return false;
+-			lib = s;
+-		}
+-
+-		if(!inc.isEmpty())
++		if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
++
++			s = conf->getenv("QC_WITH_ZLIB_INC");
++			if(!s.isEmpty()) {
++				if(!conf->checkHeader(s, "zlib.h"))
++					return false;
++			}
++			else {
++				if(!conf->findHeader("zlib.h", QStringList(), &s))
++					return false;
++			}
++			incs.append(s);
++
++			s = conf->getenv("QC_WITH_ZLIB_LIB");
++			if(!s.isEmpty()) {
++				if(!conf->checkLibrary(s, "z"))
++					return false;
++			}
++			else {
++				if(!conf->findLibrary("z", &s))
++					return false;
++			}
++			libs = QString("-L%1 -lz").arg(s);
++		}
++
++		foreach(const QString &inc, incs) {
+ 			conf->addIncludePath(inc);
+-		if(!lib.isEmpty())
+-			conf->addLib(QString("-L") + s);
+-		conf->addLib("-lz");
++		}
++		conf->addLib(libs);
++
++		incs.clear();
++		libs.clear();
++		if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
++
++			s = conf->getenv("QC_WITH_MINIZIP_INC");
++			if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
++			    (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
++				incs.append(s);
++			}
++
++			s = conf->getenv("QC_WITH_MINIZIP_LIB");
++			if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
++			   (s.isEmpty() && conf->findLibrary("minizip", &s))) {
++				libs = QString("-L%1 -lminizip").arg(s);
++			}
++		}
++
++		if (!incs.isEmpty() && !libs.isEmpty()) {
++			foreach(const QString &inc, incs) {
++				conf->addIncludePath(inc);
++			}
++			conf->addLib(libs);
++		} else {
++			conf->addExtra("CONFIG += psi-minizip");
++		}
+ 
+ 		return true;
+ #endif
+
+=== modified file 'qcm/zlib.qcm'
+--- qcm/zlib.qcm	2011-10-04 06:27:15 +0000
++++ qcm/zlib.qcm	2011-10-04 06:27:38 +0000
+@@ -26,41 +26,68 @@
+ 	{
+ #ifdef Q_OS_WIN
+ 		// HACK: on windows, always use psi's bundled zlib
+-		conf->addExtra("CONFIG += psi-zip");
++		conf->addExtra("CONFIG += psi-winzlib psi-minizip");
+ 		return true;
+ #else
+-		QString inc, lib;
++		QStringList incs;
++		QString version, libs, other;
+ 		QString s;
+ 
+-		s = conf->getenv("QC_WITH_ZLIB_INC");
+-		if(!s.isEmpty()) {
+-			if(!conf->checkHeader(s, "zlib.h"))
+-				return false;
+-			inc = s;
+-		}
+-		else {
+-			if(!conf->findHeader("zlib.h", QStringList(), &s))
+-				return false;
+-			inc = s;
+-		}
+-
+-		s = conf->getenv("QC_WITH_ZLIB_LIB");
+-		if(!s.isEmpty()) {
+-			if(!conf->checkLibrary(s, "z"))
+-				return false;
+-			lib = s;
+-		}
+-		else {
+-			if(!conf->findLibrary("z", &s))
+-				return false;
+-			lib = s;
+-		}
+-
+-		if(!inc.isEmpty())
++		if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
++
++			s = conf->getenv("QC_WITH_ZLIB_INC");
++			if(!s.isEmpty()) {
++				if(!conf->checkHeader(s, "zlib.h"))
++					return false;
++			}
++			else {
++				if(!conf->findHeader("zlib.h", QStringList(), &s))
++					return false;
++			}
++			incs.append(s);
++
++			s = conf->getenv("QC_WITH_ZLIB_LIB");
++			if(!s.isEmpty()) {
++				if(!conf->checkLibrary(s, "z"))
++					return false;
++			}
++			else {
++				if(!conf->findLibrary("z", &s))
++					return false;
++			}
++			libs = QString("-L%1 -lz").arg(s);
++		}
++
++		foreach(const QString &inc, incs) {
+ 			conf->addIncludePath(inc);
+-		if(!lib.isEmpty())
+-			conf->addLib(QString("-L") + s);
+-		conf->addLib("-lz");
++		}
++		conf->addLib(libs);
++
++		incs.clear();
++		libs.clear();
++		if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
++
++			s = conf->getenv("QC_WITH_MINIZIP_INC");
++			if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) ||
++			    (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) {
++				incs.append(s);
++			}
++
++			s = conf->getenv("QC_WITH_MINIZIP_LIB");
++			if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) ||
++			   (s.isEmpty() && conf->findLibrary("minizip", &s))) {
++				libs = QString("-L%1 -lminizip").arg(s);
++			}
++		}
++
++		if (!incs.isEmpty() && !libs.isEmpty()) {
++			foreach(const QString &inc, incs) {
++				conf->addIncludePath(inc);
++			}
++			conf->addLib(libs);
++		} else {
++			conf->addExtra("CONFIG += psi-minizip");
++		}
+ 
+ 		return true;
+ #endif
+
+=== modified file 'src/conf_iris.pri'
+--- src/conf_iris.pri	2011-10-04 06:27:15 +0000
++++ src/conf_iris.pri	2011-10-04 06:27:28 +0000
+@@ -13,11 +13,6 @@
+ 	CONFIG += crypto
+ }
+ 
+-# use zlib from psi if necessary
+-psi-zip {
+-	INCLUDEPATH += $$PWD/libpsi/tools/zip/minizip/win32
+-}
+-
+ mac {
+ 	# Universal binaries
+ 	qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {
+
+=== modified file 'src/libpsi/tools/zip/zip.cpp'
+--- src/libpsi/tools/zip/zip.cpp	2011-10-04 06:27:15 +0000
++++ src/libpsi/tools/zip/zip.cpp	2011-10-04 06:27:43 +0000
+@@ -22,7 +22,11 @@
+ #include <QStringList>
+ #include <QFile>
+ 
++#ifdef PSIMINIZIP
+ #include "minizip/unzip.h"
++#else
++#include <minizip/unzip.h>
++#endif
+ #include "zip.h"
+ 
+ class UnZipPrivate
+
+=== modified file 'src/libpsi/tools/zip/zip.pri'
+--- src/libpsi/tools/zip/zip.pri	2011-10-04 06:27:15 +0000
++++ src/libpsi/tools/zip/zip.pri	2011-10-04 06:29:25 +0000
+@@ -2,17 +2,21 @@
+ 	$$PWD/zip.h
+ 
+ SOURCES += \
+-	$$PWD/zip.cpp \
+-	$$PWD/minizip/unzip.c
++ 	$$PWD/zip.cpp
++ 
++psi-minizip {
++	SOURCES += $$PWD/minizip/unzip.c
++	DEFINES += PSIMINIZIP
++}
+ 
+ INCLUDEPATH += $$PWD
+ DEPENDPATH  += $$PWD
+ 
+-win32: {
++psi-winzlib {
+ 	INCLUDEPATH += $$PWD/minizip/win32
+ 	DEPENDPATH  += $$PWD/minizip/win32
+ 	LIBS += $$PWD/minizip/win32/libz.a
+ }
+-mac: {
++mac {
+ 	QMAKE_LFLAGS += -lz
+ }
+
diff --git a/net-im/psi/psi-0.14-r2.ebuild b/net-im/psi/psi-0.14-r2.ebuild
index 94508c706fa0..2e7b12ea9117 100644
--- a/net-im/psi/psi-0.14-r2.ebuild
+++ b/net-im/psi/psi-0.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r2.ebuild,v 1.6 2011/07/31 19:59:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r2.ebuild,v 1.7 2011/10/04 07:11:35 pva Exp $
 
 EAPI="2"
 
@@ -51,6 +51,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}/psi-0.14-qt-compat.patch"
+	epatch "${FILESDIR}/psi-0.14-minizip-detection.patch"
 
 	if use extras; then
 		# some patches from psi+ project http://code.google.com/p/psi-dev