[esteid] r3996 committed - Gentoo: dev-libs/libdigidoc: Fix compile issue with new zlib

[est...@googlecode.com]

Revision: 3996
Author: plaes800
Date: Sat Jun 16 22:26:32 2012
Log: Gentoo: dev-libs/libdigidoc: Fix compile issue with new zlib
http://code.google.com/p/esteid/source/detail?r=3996

Added:
/packages/gentoo/trunk/dev-libs/libdigidoc/files

/packages/gentoo/trunk/dev-libs/libdigidoc/files/libdigidoc-2.7.0-fix-compilation.patch
Modified:
/packages/gentoo/trunk/dev-libs/libdigidoc/Manifest
/packages/gentoo/trunk/dev-libs/libdigidoc/libdigidoc-2.7.0.ebuild
/packages/gentoo/trunk/dev-libs/libdigidoc/libdigidoc-9999.ebuild

=======================================
--- /dev/null
+++
/packages/gentoo/trunk/dev-libs/libdigidoc/files/libdigidoc-2.7.0-fix-compilation.patch
Sat Jun 16 22:26:32 2012
@@ -0,0 +1,20 @@
+--- libdigidoc/DigiDocEnc.c.orig 2011-12-22 21:37:20.000000000 +0200
++++ libdigidoc/DigiDocEnc.c 2011-12-22 21:38:01.000000000 +0200
+@@ -1569,7 +1569,7 @@
+ outData.pMem = malloc(outData.nLen);
+ if(!outData.pMem)
+ SET_LAST_ERROR_RETURN(ERR_BAD_ALLOC, ERR_BAD_ALLOC)
+- err = compress OF(( (Bytef *)outData.pMem, (uLongf *)&outData.nLen,
++ err = compress _Z_OF(( (Bytef *)outData.pMem, (uLongf *)&outData.nLen,
+ (const Bytef *)pEncData->mbufEncryptedData.pMem,
(uLong)pEncData->mbufEncryptedData.nLen));
+ ddocDebug(3, "dencEncryptedData_compressData", "Orig len: %d,
compressed: %d, RC: %d",
+ pEncData->mbufEncryptedData.nLen, outData.nLen, err);
+@@ -1629,7 +1629,7 @@
+ outData.pMem = malloc(outData.nLen);
+ if(!outData.pMem)
+ SET_LAST_ERROR_RETURN(ERR_BAD_ALLOC, ERR_BAD_ALLOC)
+- err = uncompress OF(( (Bytef *)outData.pMem, (uLongf *)&outData.nLen,
++ err = uncompress _Z_OF(( (Bytef *)outData.pMem, (uLongf *)&outData.nLen,
+ (const Bytef *)pEncData->mbufEncryptedData.pMem,
(uLong)pEncData->mbufEncryptedData.nLen));
+ ddocDebug(3, "dencEncryptedData_decompressData", "Compressed len: %d,
orig-len: %ld, uncompressed: %d, RC: %d",
+ pEncData->mbufEncryptedData.nLen, origLen, outData.nLen, err);
=======================================
--- /packages/gentoo/trunk/dev-libs/libdigidoc/Manifest Mon Oct 11 07:53:54
2010
+++ /packages/gentoo/trunk/dev-libs/libdigidoc/Manifest Sat Jun 16 22:26:32
2012
@@ -1,5 +1,4 @@
+AUX libdigidoc-2.7.0-fix-compilation.patch 1239 RMD160
d4e5e383701203a62267cc01e389c94e3ddc06cc SHA1
6e2e7ea3d07502a19bce647c468cec58f5e0771f SHA256
5bde7af5546e14cba8e3349238dd3744c723a93bd837243a6665469bb91492c3
DIST libdigidoc-2.7.0.tar.bz2 1758937 RMD160
770b5ca76b30b1146c91083a025b8c1c70defa70 SHA1
d61fc0bc2d0ddc54e5811df591c5de62f3f9faf6 SHA256
0a1ae1f1ef88e4fc26a83529a7d4ea5b9eda5df137fd6ff72e6da63308926aff
-EBUILD libdigidoc-2.7.0.ebuild 691 RMD160
83c2179b1a6b74cd11c53bc1de996e1edfb1250c SHA1
a4765ded52f82491497f461bc70ce7dfa079536d SHA256
42960b24509e138558a7fbb5eaae73b3ed68c6ee0647e006df85ab86c9e54952
-EBUILD libdigidoc-9999.ebuild 711 RMD160
61fb1eab1d4a36f76e47188e6554dd9e5e5e4265 SHA1
47d94a7f033eca591929367ac201dc7f7aa34367 SHA256
007fa280308940bcbde5582ca63e318d221bc5127a2c37c8cf2af3e4d5e0153f
-MISC libdigidoc-9999.ebuild.orig 784 RMD160
6c94aa6cc27c4d43653c855fbc1052ba4f1a3bf9 SHA1
da40d4d05757a9052764e5da0060e0205a1cceea SHA256
bde2ec3e2b6befa7eb02f89957f8ed5727373f8b1f540f2b32f68d682e8a7157
-MISC libdigidoc-9999.ebuild.rej 633 RMD160
5e774a1a260b4c55e2ecedb60b47cc85403a93b9 SHA1
c9ea819b96ef9640cea88ff2c815ddb40ca44f0f SHA256
c890d15919eb64e101972fb93c2905de836fca771fd2f6c01426a966b46cabc0
+EBUILD libdigidoc-2.7.0.ebuild 766 RMD160
ddbbf0939c442c88f698cd0fca660d52bf41b78f SHA1
663e8fe5826a1c3ad427aed2e7f08388590e0a4d SHA256
fcc581df872f11be0c05d59e345207b4664eaa4fd798e58eb126c38699111b00
+EBUILD libdigidoc-9999.ebuild 786 RMD160
4ba93a3a20ae0c3be3de4c8d7af34a59597357b7 SHA1
8eea149e3b235cea9b1fbe355a857f086f5c549e SHA256
e1d36d330681bcda81e62691ec22131dfba7635f6cd9230a05f2a146c687e952
=======================================
--- /packages/gentoo/trunk/dev-libs/libdigidoc/libdigidoc-2.7.0.ebuild Mon
Oct 11 07:53:54 2010
+++ /packages/gentoo/trunk/dev-libs/libdigidoc/libdigidoc-2.7.0.ebuild Sat
Jun 16 22:26:32 2012
@@ -3,7 +3,7 @@
# $Header: $

EAPI=3
-inherit cmake-utils
+inherit cmake-utils eutils

DESCRIPTION="Library for handling digitally signed documents"
HOMEPAGE="http://code.google.com/p/esteid/"
@@ -22,6 +22,10 @@

DOCS="AUTHORS ChangeLog NEWS README"

+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix-compilation.patch"
+}
+
src_configure() {
# If prefix is /usr, sysconf needs to be /etc, not /usr/etc
local mycmakeargs="${mycmakeargs}
=======================================
--- /packages/gentoo/trunk/dev-libs/libdigidoc/libdigidoc-9999.ebuild Mon
Oct 11 07:53:54 2010
+++ /packages/gentoo/trunk/dev-libs/libdigidoc/libdigidoc-9999.ebuild Sat
Jun 16 22:26:32 2012
@@ -5,7 +5,7 @@
ESVN_REPO_URI="https://esteid.googlecode.com/svn/libdigidoc/trunk"

EAPI=3
-inherit cmake-utils subversion
+inherit cmake-utils eutils subversion

DESCRIPTION="Library for handling digitally signed documents"
HOMEPAGE="http://code.google.com/p/esteid/"
@@ -22,6 +22,10 @@

DOCS="AUTHORS ChangeLog NEWS README"

+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix-compilation.patch"
+}
+
src_configure() {
# If prefix is /usr, sysconf needs to be /etc, not /usr/etc
local mycmakeargs="${mycmakeargs}