Fix building with recent sys-libs/glibc and sys-libs/zlib wrt #421547 Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 61 insertions, 6 deletions

diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index eb4ceca4f7f6..d33732d36ce5 100644
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/quakeforge
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.27 2011/05/03 21:15:11 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.28 2012/06/17 11:28:36 ssuominen Exp $
+
+  17 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  quakeforge-0.5.5-r2.ebuild, +files/quakeforge-0.5.5-libc.patch,
+  +files/quakeforge-0.5.5-zlib-1.2.6.patch:
+  Fix building with recent sys-libs/glibc and sys-libs/zlib wrt #421547 Diego
+  Elio Pettenò
 
   03 May 2011; Michael Sterrett <mr_bones_@gentoo.org>
   quakeforge-0.5.5-r2.ebuild:
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index 109d7d676289..7e3ab4ac3f84 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,12 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5.5-ipv6.patch 302 RMD160 7e1255c42df1c6c6ee59e87fa034324bfe2a83b5 SHA1 d24595bf4feb9e51c69bae9d716370f0262d15bf SHA256 8b473c335e6dc191e4aae7e7ada09ea5fc6d649e1132bb6230c1427fa0692e7a
 AUX quakeforge-0.5.5-amd64.patch 617 RMD160 1a0f3fedc34dfdecb2a3d07d235a7e2a25e0a2f2 SHA1 9b61c7f8f7230b6af083a0d10da7292e92148226 SHA256 75b8e2d329a620f131fbf01ff81211a4985c65e0a1166ccecd618e59b0bfba2a
 AUX quakeforge-0.5.5-gcc41.patch 11887 RMD160 927ccee1af7ce986317c5a865dd67caf1bb2f489 SHA1 e57ad56650cbc80de3b8abfe58127a0ded0f0be5 SHA256 a8409922b14d1690f3a0f58a7961371944f1c96798f5e5f85ee8247ea1bab20d
 AUX quakeforge-0.5.5-gcc46.patch 6321 RMD160 29243f6ce925e6865b652aa51266d6a2bb6d0466 SHA1 c92c406c32326ce1df084e50a12c741dfe0da562 SHA256 5e20ff5cb997788d9ba43183990b30d14b0a8eda2bf7aa765f4d9f2f5d453b9f
 AUX quakeforge-0.5.5-keys.patch 2732 RMD160 e12fe9e7738294130b2efc6f47287e9c0d05b6d1 SHA1 1af9524474c8c4cf00d327c5d741f1c8ec133975 SHA256 4e43f001fdb31822d6c97fb7414f1515c1d1b5f3f92231405df46e7c9bc05acb
+AUX quakeforge-0.5.5-libc.patch 535 RMD160 156bac8c55f3992f1104a5ef8cb2324b8ba2d390 SHA1 1b3965e34f2243a64ca1c2041383ab7b0502f39e SHA256 817dc9a6b47bf2793e08792fe517c58dcad952058219d53532bc720dfa9f5f7c
 AUX quakeforge-0.5.5-no-page-size.patch 354 RMD160 6e2fc49b4282b3ffe9038dba77eb35be2e461560 SHA1 929c4a27fb9e645bf09f40885abb5b2a8e278d07 SHA256 8ff7557e497cf5e691e9e3707b3615f32111e770e57baf362cec5bed16aba7ab
 AUX quakeforge-0.5.5-noWerror.patch 2413 RMD160 17580a3df00b1464985b79f8609bddcd2cf67839 SHA1 8f40571bd8969cce1edf49b88242ec738d2c9566 SHA256 ade037928aa9a58f99e2e62b4df461365336c595be712cc6697337b20d39258e
+AUX quakeforge-0.5.5-zlib-1.2.6.patch 389 RMD160 20b25ccd17c67b567096cad968166c6de9c63c37 SHA1 054179859cfed078a841a4eee7f000d55068dedd SHA256 a47f14b0184f308c8927923bce14f24ee5ad43dd206f5770ac7c2c29047864f0
 DIST quakeforge-0.5.5.tar.bz2 1954072 RMD160 1caf8d7b272c9e588708ac39841d46aac2c5df79 SHA1 680e47a189de508f8cc7c5c525537f0aa2dafb05 SHA256 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a
-EBUILD quakeforge-0.5.5-r2.ebuild 3951 RMD160 2cec2a0153d344b4e62fd287ade17bfded9108d3 SHA1 0ccc6336a8aaafbd4faf4759f0a5f9b11c27cdf2 SHA256 fd073a6b8d1eb48d01b65c91e56881e877a79a6bce614ceb66771a410af0e7b4
+EBUILD quakeforge-0.5.5-r2.ebuild 4020 RMD160 50ae1b945792c72823097b81c341df3bb3c30aa4 SHA1 82564b33d0a7688e06333c65bb468f8e7d82f169 SHA256 00250b33c458a5b5e3f022d9bbd5389e427124d5a5cc776b6472cb1c8ef6fabd
 EBUILD quakeforge-0.5.5.ebuild 3766 RMD160 0a839102c8c1bc8f9f701ba63b330f974c47bdc1 SHA1 da0c3d4df9db5ddf8c6e863dbb1501b6dcf7f14e SHA256 fd2442c2bb0d74ad49c3bbb20c5eff324845116f0445b86e5b9187d44f5b51dd
-MISC ChangeLog 4804 RMD160 a7fa476d1cc19c4fd313cc8d6ca4db92ca22555a SHA1 7f2cb13ea2459a643d96256bac4f3398939724da SHA256 a63fcce02d58f845b3116afce6bb737f1a58d1791acf833a5b379eab5d52b55a
+MISC ChangeLog 5063 RMD160 34c1a5c864abf47317f78fe39ed51c7bc32127ad SHA1 1722c7b52a211be09f12778f57f253379c9211d0 SHA256 e10111bc893119f9a02ca897c527d01a38c8780dc18aab43aa73c39a80a800b1
 MISC metadata.xml 1396 RMD160 b7e31184f0351596c32f9014e0c0b6b9a31ad4f1 SHA1 2ff09d93c6d3c1a1f5947ad4039d9160d9b0df48 SHA256 21be4035c9338cf0635afcaf8b23e1a0e98affcabbddd47f6a7663b2afa0d2bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP3b5gAAoJEEdUh39IaPFN/rwH/j6N2ZpVAjebDk0ZYSb4/ASW
+6PhY0RsoE4nX5T1MZxA1kck7SxywpNyF4Oh0H7SNX3/mhZ3RH4eG9Z79y8RMC5X1
+9r6+1Hr8IAir7Gz1rFFq4aY1mP/FM14OPwivJNyCCXjdYAtgWF6hGd802IvNES/i
+8DT5xHJ55RxZnleCg+ydZeLE7DQok+prfpvF9vs08Cfk5Xtm15Wfsl7Fl0U4ewvu
+WApNchh77Utufp3vIYzXMyA2HDITIF/rmpmPQsuFkwtfkqxS33O40tC++TSv7yu4
+GrU7JIOT1aJ4GCSANlEzbyOH11AlU7tSr98o7I253G+THug45DChXbOUyG6lyGg=
+=yWdF
+-----END PGP SIGNATURE-----
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch
new file mode 100644
index 000000000000..0161c606c891
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.5.5-libc.patch
@@ -0,0 +1,17 @@
+http://quake.git.sourceforge.net/git/gitweb.cgi?p=quake/quakeforge;a=commit;h=cdf5ef256583dea6caa34464f6a82222cc43d2fd
+
+--- libs/net/nc/net_udp6.c
++++ libs/net/nc/net_udp6.c
+@@ -111,10 +111,10 @@ static __attribute__ ((used)) const char rcsid[] =
+ # define MAXHOSTNAMELEN	512
+ #endif
+ 
+-#ifdef __GLIBC__						// glibc macro
++#if defined(__GLIBC__) && !defined(s6_addr32)	// glibc macro
+ # define s6_addr32 in6_u.u6_addr32
+ # if ! __GLIBC_PREREQ (2,2)
+-# define ss_family __ss_family
++#  define ss_family __ss_family
+ # endif
+ #endif
+ 
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch
new file mode 100644
index 000000000000..eae1e1e44785
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.5.5-zlib-1.2.6.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/421547
+http://quake.git.sourceforge.net/git/gitweb.cgi?p=quake/quakeforge;a=commit;h=d8a37bc7910366904ef4559bef3b13feec378113
+
+--- libs/util/quakeio.c
++++ libs/util/quakeio.c
+@@ -80,7 +80,7 @@ static __attribute__ ((used)) const char rcsid[] =
+ struct QFile_s {
+ 	FILE *file;
+ #ifdef HAVE_ZLIB
+-	gzFile *gzfile;
++	gzFile gzfile;
+ #endif
+ 	off_t size;
+ 	off_t start;
diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
index 9a658b50748f..aa96e102db37 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.9 2011/05/03 21:15:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.10 2012/06/17 11:28:36 ssuominen Exp $
 
 EAPI=2
 inherit base eutils autotools games
@@ -47,6 +47,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-amd64.patch
 	"${FILESDIR}"/${P}-noWerror.patch
 	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-zlib-1.2.6.patch
+	"${FILESDIR}"/${P}-libc.patch
 )
 
 src_prepare() {