Fix bug with zlib, #387837. Thanks to Nikoli

(Portage version: 2.1.10.39/cvs/Linux x86_64)

5 files changed, 104 insertions, 3 deletions

diff --git a/net-im/vacuum/ChangeLog b/net-im/vacuum/ChangeLog
index 69498c3c1151..c3dd08fd2677 100644
--- a/net-im/vacuum/ChangeLog
+++ b/net-im/vacuum/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/vacuum
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/ChangeLog,v 1.3 2011/09/18 12:20:09 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/ChangeLog,v 1.4 2011/12/04 22:09:03 maksbotan Exp $
+
+  04 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> vacuum-1.1.1.ebuild,
+  +files/vacuum-1.1.1-minizip.patch, +files/vacuum-1.1.1-zlib.patch,
+  vacuum-9999.ebuild:
+  Fix bug with zlib, #387837. Thanks to Nikoli
 
   18 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> metadata.xml:
   Fix herd to be proxy-maintainers
diff --git a/net-im/vacuum/files/vacuum-1.1.1-minizip.patch b/net-im/vacuum/files/vacuum-1.1.1-minizip.patch
new file mode 100644
index 000000000000..9e71038fd3d0
--- /dev/null
+++ b/net-im/vacuum/files/vacuum-1.1.1-minizip.patch
@@ -0,0 +1,38 @@
+From 433b646f92e629fae235f23ebbfbec6ea5ff72a5 Mon Sep 17 00:00:00 2001
+From: Maxim Ignatenko <gelraen.ua@gmail.com>
+Date: Sun, 4 Dec 2011 20:00:14 +0000
+Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20FORCE=5FBUNDLED=5FMINIZIP=20=D0=B4=D0=BB=D1=8F=20cmake,=20=D0=BF=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D1=8E=D1=89=D0=B0=D1=8F=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D0=B5=20=D0=B2=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B5=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8=20minizip.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: http://vacuum-im.googlecode.com/svn/trunk@1670 8ee3b2d0-dc07-11de-995a-ab19b33c1a40
+---
+ CMakeLists.txt |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 06da875..bfb33ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,11 +20,17 @@ set(LANGS "" CACHE STRING "List of languages to build localization for (this var
+ set(USED_LANGS "" CACHE INTERNAL "List of languages actually used for generating targets")
+ add_lang_options()
+ 
++set(FORCE_BUNDLED_MINIZIP NO CACHE BOOL "Use bundled minizip even if local system have one")
++
+ find_library(SYSTEM_ZLIB_FOUND z)
+ find_library(SYSTEM_IDN_FOUND idn)
+ find_library(SYSTEM_MINIZIP_FOUND minizip)
+ find_library(SYSTEM_QTLOCKEDFILE_FOUND QtSolutions_LockedFile-2.4)
+ 
++if (FORCE_BUNDLED_MINIZIP)
++	set(SYSTEM_MINIZIP_FOUND NO)
++endif (FORCE_BUNDLED_MINIZIP)
++
+ if (SYSTEM_ZLIB_FOUND)
+ 	add_definitions(-DUSE_SYSTEM_ZLIB)
+ endif (SYSTEM_ZLIB_FOUND)
+-- 
+1.7.3.4
+
diff --git a/net-im/vacuum/files/vacuum-1.1.1-zlib.patch b/net-im/vacuum/files/vacuum-1.1.1-zlib.patch
new file mode 100644
index 000000000000..46df1062e0e4
--- /dev/null
+++ b/net-im/vacuum/files/vacuum-1.1.1-zlib.patch
@@ -0,0 +1,49 @@
+From 88360d515a06ef08fd3e16f462fe0a869b55ca1d Mon Sep 17 00:00:00 2001
+From: Sergey Potapov <potapov.s.a@gmail.com>
+Date: Mon, 17 Oct 2011 11:54:39 +0000
+Subject: Плагин Compress не собирался в Gentoo после обновления системного ZLib.
+
+git-svn-id: http://vacuum-im.googlecode.com/svn/trunk@1636 8ee3b2d0-dc07-11de-995a-ab19b33c1a40
+---
+diff --git a/src/plugins/compress/compression.cpp b/src/plugins/compress/compression.cpp
+index b59b95d..3ca6bd4 100644
+--- a/src/plugins/compress/compression.cpp
++++ b/src/plugins/compress/compression.cpp
+@@ -138,30 +138,20 @@ void Compression::stopZlib()
+ 

+ void Compression::processData(QByteArray &AData, bool ADataOut)

+ {

+-	if (AData.size()>0)

++	if (AData.size() > 0)

+ 	{

+-		z_streamp zstream;

+-		int (*zfunc) OF((z_streamp strm, int flush));

+-		if (ADataOut)

+-		{

+-			zstream = &FDefStruc;

+-			zfunc = deflate;

+-		}

+-		else

+-		{

+-			zstream = &FInfStruc;

+-			zfunc = inflate;

+-		}

+-

+ 		int ret;

+ 		int dataPosOut = 0;

++

++		z_streamp zstream = ADataOut ? &FDefStruc : &FInfStruc;

+ 		zstream->avail_in = AData.size();

+ 		zstream->next_in = (Bytef *)(AData.constData());

++

+ 		do

+ 		{

+ 			zstream->avail_out = FOutBuffer.capacity() - dataPosOut;

+ 			zstream->next_out = (Bytef *)(FOutBuffer.data() + dataPosOut);

+-			ret = zfunc(zstream,Z_SYNC_FLUSH);

++			ret = ADataOut ? deflate(zstream,Z_SYNC_FLUSH) : inflate(zstream,Z_SYNC_FLUSH);

+ 			switch (ret)

+ 			{

+ 			case Z_OK:

+--
+cgit v0.9.0.2
diff --git a/net-im/vacuum/vacuum-1.1.1.ebuild b/net-im/vacuum/vacuum-1.1.1.ebuild
index 2f3a2534576c..9066edce10c5 100644
--- a/net-im/vacuum/vacuum-1.1.1.ebuild
+++ b/net-im/vacuum/vacuum-1.1.1.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/vacuum/vacuum-1.1.1.ebuild,v 1.1 2011/09/03 14:49:57 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-1.1.1.ebuild,v 1.2 2011/12/04 22:09:03 maksbotan Exp $
 
 EAPI="4"
 LANGS="de pl ru uk"
@@ -47,6 +47,13 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS CHANGELOG README TRANSLATORS"
 
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}"/${P}-minizip.patch
+	epatch "${FILESDIR}"/${P}-zlib.patch
+}
+
 src_configure() {
 	# linguas
 	local langs="none;"
@@ -59,6 +66,7 @@ src_configure() {
 		-DINSTALL_SDK=ON
 		-DLANGS="${langs}"
 		-DINSTALL_DOCS=OFF
+		-DFORCE_BUNDLED_MINIZIP=ON
 	)
 
 	for x in ${PLUGINS}; do
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index e1e0ad7da1f6..d6e54bf3126c 100644
--- a/net-im/vacuum/vacuum-9999.ebuild
+++ b/net-im/vacuum/vacuum-9999.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/vacuum/vacuum-9999.ebuild,v 1.2 2011/09/03 14:49:57 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-9999.ebuild,v 1.3 2011/12/04 22:09:03 maksbotan Exp $
 
 EAPI="4"
 LANGS="de pl ru uk"
@@ -65,6 +65,7 @@ src_configure() {
 		-DINSTALL_SDK=ON
 		-DLANGS="${langs}"
 		-DINSTALL_DOCS=OFF
+		-DFORCE_BUNDLED_MINIZIP=ON
 	)
 
 	for x in ${PLUGINS}; do