summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2012-08-25 07:30:28 +0000
committerAlfredo Tupone <tupone@gentoo.org>2012-08-25 07:30:28 +0000
commit496e06e8f4803205e36d829fdc3e42cc830642aa (patch)
treed131fade159ddc0fae7d51d58196757a6cfc8fad /dev-games
parentppc stable (bug 427224) (diff)
downloadgentoo-2-496e06e8f4803205e36d829fdc3e42cc830642aa.tar.gz
gentoo-2-496e06e8f4803205e36d829fdc3e42cc830642aa.tar.bz2
gentoo-2-496e06e8f4803205e36d829fdc3e42cc830642aa.zip
Fix build with gnutls-3. Bug #421455
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/libggz/ChangeLog6
-rw-r--r--dev-games/libggz/files/libggz-0.0.14.1-gnutls3.patch11
-rw-r--r--dev-games/libggz/libggz-0.0.14.1.ebuild4
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-games/libggz/ChangeLog b/dev-games/libggz/ChangeLog
index f6bc80b8d0dd..a1f5698ba3f7 100644
--- a/dev-games/libggz/ChangeLog
+++ b/dev-games/libggz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/libggz
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/ChangeLog,v 1.32 2012/02/19 13:37:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/ChangeLog,v 1.33 2012/08/25 07:30:28 tupone Exp $
+
+ 25 Aug 2012; Alfredo Tupone <tupone@gentoo.org> libggz-0.0.14.1.ebuild,
+ +files/libggz-0.0.14.1-gnutls3.patch:
+ Fix build with gnutls-3. Bug #421455 by Diego Elio Pettenò
19 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> libggz-0.0.14.1.ebuild:
Do not install static-libs unless requested and remove not-required .la
diff --git a/dev-games/libggz/files/libggz-0.0.14.1-gnutls3.patch b/dev-games/libggz/files/libggz-0.0.14.1-gnutls3.patch
new file mode 100644
index 000000000000..221ef59c8b29
--- /dev/null
+++ b/dev-games/libggz/files/libggz-0.0.14.1-gnutls3.patch
@@ -0,0 +1,11 @@
+--- src/security/ggz_tls_gnutls.c.old 2012-08-25 09:16:59.000000000 +0200
++++ src/security/ggz_tls_gnutls.c 2012-08-25 09:17:20.000000000 +0200
+@@ -56,7 +56,7 @@
+ const int mac_priority[] = {GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA, 0};
+ const int kx_priority[] = {GNUTLS_KX_ANON_DH, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0};
+ const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
+-const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, GNUTLS_COMP_LZO, 0};
++const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, 0};
+
+ void ggz_tls_init(const char *certfile, const char *keyfile, const char *password)
+ {
diff --git a/dev-games/libggz/libggz-0.0.14.1.ebuild b/dev-games/libggz/libggz-0.0.14.1.ebuild
index d4edc6aad4b6..7fd56e946658 100644
--- a/dev-games/libggz/libggz-0.0.14.1.ebuild
+++ b/dev-games/libggz/libggz-0.0.14.1.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/dev-games/libggz/libggz-0.0.14.1.ebuild,v 1.14 2012/02/19 13:37:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/libggz-0.0.14.1.ebuild,v 1.15 2012/08/25 07:30:28 tupone Exp $
EAPI=4
@@ -18,6 +18,8 @@ DEPEND="dev-libs/libgcrypt
!gnutls? ( dev-libs/openssl )"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-gnutls3.patch )
+
src_configure() {
games-ggz_src_configure \
--with-gcrypt \