Attachment #294791 for bug #387837

View | Details | Raw Unified | Return to bug 387837
Collapse All | Expand All




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





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

Lines 1-6 Link Here

(-)/usr/portage/net-im/vacuum/vacuum-1.1.1.ebuild (-1 / +10 lines)
1	# Copyright 1999-2011 Gentoo Foundation	1	# Copyright 1999-2011 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-1.1.1.ebuild,v 1.1 2011/09/03 14:49:57 maksbotan Exp $	3	# $Header: $
4		4
5	EAPI="4"	5	EAPI="4"
6	LANGS="de pl ru uk"	6	LANGS="de pl ru uk"
Lines 47-52 Link Here
47		47
48	DOCS="AUTHORS CHANGELOG README TRANSLATORS"	48	DOCS="AUTHORS CHANGELOG README TRANSLATORS"
49		49
		50
		51	src_prepare() {
		52	default
		53
		54	epatch "${FILESDIR}"/${P}-minizip.patch
		55	epatch "${FILESDIR}"/${P}-zlib.patch
		56	}
		57
50	src_configure() {	58	src_configure() {
51	# linguas	59	# linguas
52	local langs="none;"	60	local langs="none;"
Lines 59-64 Link Here
59	-DINSTALL_SDK=ON	67	-DINSTALL_SDK=ON
60	-DLANGS="${langs}"	68	-DLANGS="${langs}"
61	-DINSTALL_DOCS=OFF	69	-DINSTALL_DOCS=OFF
		70	-DFORCE_BUNDLED_MINIZIP=ON
62	)	71	)
63		72
64	for x in ${PLUGINS}; do	73	for x in ${PLUGINS}; do

Lines 1-6 Link Here

(-)/usr/portage/net-im/vacuum/vacuum-9999.ebuild (-1 / +2 lines)
1	# Copyright 1999-2011 Gentoo Foundation	1	# Copyright 1999-2011 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-9999.ebuild,v 1.2 2011/09/03 14:49:57 maksbotan Exp $	3	# $Header: $
4		4
5	EAPI="4"	5	EAPI="4"
6	LANGS="de pl ru uk"	6	LANGS="de pl ru uk"
Lines 65-70 Link Here
65	-DINSTALL_SDK=ON	65	-DINSTALL_SDK=ON
66	-DLANGS="${langs}"	66	-DLANGS="${langs}"
67	-DINSTALL_DOCS=OFF	67	-DINSTALL_DOCS=OFF
		68	-DFORCE_BUNDLED_MINIZIP=ON
68	)	69	)
69		70
70	for x in ${PLUGINS}; do	71	for x in ${PLUGINS}; do

Return to bug 387837

Line 0 Link Here

(-)/usr/portage/net-im/vacuum/files/vacuum-1.1.1-minizip.patch (+38 lines)
	1	From 433b646f92e629fae235f23ebbfbec6ea5ff72a5 Mon Sep 17 00:00:00 2001
	2	From: Maxim Ignatenko <gelraen.ua@gmail.com>
	3	Date: Sun, 4 Dec 2011 20:00:14 +0000
	4	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.?=
	5	MIME-Version: 1.0
	6	Content-Type: text/plain; charset=UTF-8
	7	Content-Transfer-Encoding: 8bit
	8
	9	git-svn-id: http://vacuum-im.googlecode.com/svn/trunk@1670 8ee3b2d0-dc07-11de-995a-ab19b33c1a40
	10	---
	11	CMakeLists.txt \| 6 ++++++
	12	1 files changed, 6 insertions(+), 0 deletions(-)
	13
	14	diff --git a/CMakeLists.txt b/CMakeLists.txt
	15	index 06da875..bfb33ca 100644
	16	--- a/CMakeLists.txt
	17	+++ b/CMakeLists.txt
	18	@@ -20,11 +20,17 @@ set(LANGS "" CACHE STRING "List of languages to build localization for (this var
	19	set(USED_LANGS "" CACHE INTERNAL "List of languages actually used for generating targets")
	20	add_lang_options()
	21
	22	+set(FORCE_BUNDLED_MINIZIP NO CACHE BOOL "Use bundled minizip even if local system have one")
	23	+
	24	find_library(SYSTEM_ZLIB_FOUND z)
	25	find_library(SYSTEM_IDN_FOUND idn)
	26	find_library(SYSTEM_MINIZIP_FOUND minizip)
	27	find_library(SYSTEM_QTLOCKEDFILE_FOUND QtSolutions_LockedFile-2.4)
	28
	29	+if (FORCE_BUNDLED_MINIZIP)
	30	+ set(SYSTEM_MINIZIP_FOUND NO)
	31	+endif (FORCE_BUNDLED_MINIZIP)
	32	+
	33	if (SYSTEM_ZLIB_FOUND)
	34	add_definitions(-DUSE_SYSTEM_ZLIB)
	35	endif (SYSTEM_ZLIB_FOUND)
	36	--
	37	1.7.3.4
	38

Line 0 Link Here

(-)/usr/portage/net-im/vacuum/files/vacuum-1.1.1-zlib.patch (+49 lines)
	1	From 88360d515a06ef08fd3e16f462fe0a869b55ca1d Mon Sep 17 00:00:00 2001
	2	From: Sergey Potapov <potapov.s.a@gmail.com>
	3	Date: Mon, 17 Oct 2011 11:54:39 +0000
	4	Subject: Плагин Compress не собирался в Gentoo после обновления системного ZLib.
	5
	6	git-svn-id: http://vacuum-im.googlecode.com/svn/trunk@1636 8ee3b2d0-dc07-11de-995a-ab19b33c1a40
	7	---
	8	diff --git a/src/plugins/compress/compression.cpp b/src/plugins/compress/compression.cpp
	9	index b59b95d..3ca6bd4 100644
	10	--- a/src/plugins/compress/compression.cpp
	11	+++ b/src/plugins/compress/compression.cpp
	12	@@ -138,30 +138,20 @@ void Compression::stopZlib()
	13
	14	void Compression::processData(QByteArray &AData, bool ADataOut)
	15	{
	16	- if (AData.size()>0)
	17	+ if (AData.size() > 0)
	18	{
	19	- z_streamp zstream;
	20	- int (*zfunc) OF((z_streamp strm, int flush));
	21	- if (ADataOut)
	22	- {
	23	- zstream = &FDefStruc;
	24	- zfunc = deflate;
	25	- }
	26	- else
	27	- {
	28	- zstream = &FInfStruc;
	29	- zfunc = inflate;
	30	- }
	31	-
	32	int ret;
	33	int dataPosOut = 0;
	34	+
	35	+ z_streamp zstream = ADataOut ? &FDefStruc : &FInfStruc;
	36	zstream->avail_in = AData.size();
	37	zstream->next_in = (Bytef *)(AData.constData());
	38	+
	39	do
	40	{
	41	zstream->avail_out = FOutBuffer.capacity() - dataPosOut;
	42	zstream->next_out = (Bytef *)(FOutBuffer.data() + dataPosOut);
	43	- ret = zfunc(zstream,Z_SYNC_FLUSH);
	44	+ ret = ADataOut ? deflate(zstream,Z_SYNC_FLUSH) : inflate(zstream,Z_SYNC_FLUSH);
	45	switch (ret)
	46	{
	47	case Z_OK:
	48	--
	49	cgit v0.9.0.2