Add upstream patch to build on gcc-4.7. #422761

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

4 files changed, 83 insertions, 8 deletions

diff --git a/dev-cpp/pficommon/ChangeLog b/dev-cpp/pficommon/ChangeLog
index 73eac1ddb2c2..a1b246b934fd 100644
--- a/dev-cpp/pficommon/ChangeLog
+++ b/dev-cpp/pficommon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/pficommon
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pficommon/ChangeLog,v 1.1 2011/11/12 23:55:49 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pficommon/ChangeLog,v 1.2 2012/07/08 19:56:24 naota Exp $
+
+  08 Jul 2012; Naohiro Aota <naota@gentoo.org>
+  +files/pficommon-1.3.1.0-gcc-4.7.patch, pficommon-1.3.1.0.ebuild:
+  Add upstream patch to build on gcc-4.7. #422761
 
 *pficommon-1.3.1.0 (12 Nov 2011)
 
@@ -9,4 +13,3 @@
   +files/pficommon-1.3.1.0-postgresql.patch,
   +files/pficommon-1.3.1.0-soname.patch, +metadata.xml:
   New package dev-cpp/pficommon. ebuild written by me.
-
diff --git a/dev-cpp/pficommon/Manifest b/dev-cpp/pficommon/Manifest
index a11e9583761b..b9cf2be339c3 100644
--- a/dev-cpp/pficommon/Manifest
+++ b/dev-cpp/pficommon/Manifest
@@ -1,7 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pficommon-1.3.1.0-gcc-4.7.patch 1265 SHA256 3c07461c1dece98c2b86613c62b72691ebed6152d5963c32c0bb76dc50620349 SHA512 9bb02df4886683be46ccc162d2ba9ed975d30ed64f1c32223b3180ae27dae9f5685e27e2ac978939dd9521f94a304275077889a88941e733c237a95235c082cd WHIRLPOOL 89358a27d1dc428df680a810e6d8463ca346dc03a96923d4eb56a5b677f432c9c51b03ac0440a0891944d933c19ae0aa6fe665ac7cbf9906580d17ea1333731d
 AUX pficommon-1.3.1.0-libdir.patch 1171 SHA256 f087be6c7fed08894d2ceccb6c9058017275c5eea414c87a732337850e79ee10 SHA512 bac09b89992bc171e30607c4c3a59467d780d151b8135217bdaa76d852988adeed10cda7506b876b6481261193d5a9c0a80e7405ba4073786577b423f5c3e0dc WHIRLPOOL c250dc465eafbc0e0399be3cd9c2b48dd9e585382575e0c11abd642ac359b6a5dbb649535e2d084929f97a74f03b4844d4fad9e27ef4ca5dfa4a604e481e38b2
 AUX pficommon-1.3.1.0-postgresql.patch 613 SHA256 a5ba8f00172d66fd5a5769af651f4eb1f7ef53276d0cb874bbbb1a5a4ca4d03e SHA512 9fe2f56f076d9b04fbfed4964d2e5884f793c2b1a3b6e0f37391a34eaf40a0274fdd0243c93fc9a44c6be6d0071b4381fca0dc6cd19546234f36f649d1c6357f WHIRLPOOL 91246185b4acbfc25417ae192becbb4c2a71cb0a020407f28c8f6b4cec2f6c5c9925a4ae7c04299af8fae31666c42c972da56b9bcea88cc04d7bcd630b16d2df
 AUX pficommon-1.3.1.0-soname.patch 6221 SHA256 f809eb7db7a6ebe18cfe48bfb24945e52aaf07658276227018cdc10e7e537ec2 SHA512 36b9a3dc3b081fc7f85e4275532deb377963b5e70ce92027c3c013465a96b2da6b228ba79e8d87bd2c93d1efeb183185562e27656da4a4f05fbf15219adb568a WHIRLPOOL 9c67e17d498691a33068334942675bc0c716c68d3bc7b2187c0167eafcc522eca7c72909c0e6e2a0f7ce275a1bb34595aff2c7737ee1f91c87e34b874b02e11b
 DIST pficommon-1.3.1.0.tar.gz 441406 SHA256 4b644f38825f939e3c9e3649af4a35fee00ea7343dd7711770c6ec713be859c0 SHA512 95ef445c2f004c0921bdcae7ee50fc3a744d4960f9bc76c13254394c4ae41fad11ea200002b9fde3e099ef509ffe9ba9ea21d69ba1123699ab3338d7afbcf420 WHIRLPOOL 00d8c92c1a8bd4ee80167eb0032e97b327ee40bad41b18e6567da90a1462f431c22e75a0b02568bac6686e693a954ef2ff5628225f81b88397727e789395c4fc
-EBUILD pficommon-1.3.1.0.ebuild 1320 SHA256 c20945ba7ebed28f5808beecbcdeab6609ed156c8de94819f6d9774842e820f5 SHA512 3d9e43c10a5e5a268e4fe88618a4897ea806b0cea99dd4d7f9b90e55898f1198b565f7ba2d747a8a9a68db7b01bb41cc54ed9311f6c6f68535ceaff2026cb0d3 WHIRLPOOL eff20971b113612458c96d02a1f4b2e9f08de83d786287772d8173ac2b9156517ef14e7acb4dbad517665aedb3914062498c320138412c39bec699ccb01d3b2e
-MISC ChangeLog 512 SHA256 00f41553938254e802d689383d6ab6a1fe5d2a19bc2e99b50d90d81d173e820d SHA512 5e797c76fe91d3c482e6815cd5e155c66ed0fc8afdd2beaf548db2ac662d370ef2f133e1651702ebf4c3d21ffc64af8cd19389d1ff1ebdd927306dfdcea91172 WHIRLPOOL fce1f7e3d5d3c574e28d044166bb8555a33bdba0200172a955c5edecdc8c0ffc76d69fff44ee026141a5ecdffa6f9c673b828e00accecef5a8f3a136310a103e
+EBUILD pficommon-1.3.1.0.ebuild 1357 SHA256 a16697b6a2ee16cb41b17c1371af1aacd745339d3db72c27cb838226f296edbb SHA512 2acdf6ffa301f762409a9a41bbb943c72de359d52bf200dcf1524e438993dd62f1951aec05e6c5ea2876fe5c3065c479e57b06c03a0b3aa4feec2858c2a344a8 WHIRLPOOL 350441490cbecb55940c5e3455fd398f0a3361a3efc704490c088eef4d7984cbd9030694ba3bae58fb0a99302dcc0bd0bbcd1ce6c5145c76b30935023b7cb130
+MISC ChangeLog 677 SHA256 804115d434355a81758dfcf3e63a6fc29e6df3a8261793d95e77836e1193b34f SHA512 d0f7e5102480107973fa752f84070f2fa9744252e707436c230f1c0ad835f169551bb44cb1b868172c992725fe8388a17dc2402a4a075bd1bd8131e43a205d0c WHIRLPOOL b58d43afb5ae5fa8a06c87475e4b251788dadd38af9cfcc64c4f6aa683826ae908d7fbf684d266cbdad1260da1f9aa113a392f60dcf9000db0006b6276aed6c5
 MISC metadata.xml 317 SHA256 9c18e73374552d0083bf90cf4322d16a30b65cdd7bf1c4d516d726c35faf3e32 SHA512 47e41b8298a93abb986c7e9c5b92169d1b0cb99c6d2c6a38b9bd39b70035359608025c8043411f7cff279eb447e0ffcc2a994c3f60bb12906aa2669db6bfe3b0 WHIRLPOOL 8b29e2829bfbee9e71bfa505275cdbf500b2596a355f9698cfe545be20e155f25b62931fea6a44e6af83625c4ff36f09a07553dc2bdc5136588adf7d8c4f790c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJP+eXcAAoJEDYO1FT4VRUUi7EP/AsgcHZ1BFtKU0WZBmMouyqa
+NeXcyg2jG8q5Y6038f4VpzBnaTW7JQZyNhWeNKhQ/o70E+3B5RGDxk7+ydtQm043
+96JOrI4Pd4ksJLtzauS3zf1yLXHfTI39mGRtYxflBNV1XL5atz9KsIXe4aFND57k
+VGuFeK9u09PS988v0fwhTpDw/CVDpQSrWPGyZgkMHLmbwuquZYK259PmIGMGZfEC
+ldv8jaDrX+3HpVNkgR103/RUzvBTyij0S36fMvBIaGBkpc4rRAQEjF8zHFrX9cBU
+eyhx54SWBiS6H6r3ls5oEqt+SFSBZGDcEW0mjNqtLe1RxN31BXv3/qbPF74QVOoq
+PYmu/s9+hpiGQd3mMkYL8f6dFYakAvJHNwPuGXdGmLnGNGymyfLo4r1bym9goV7n
+pI58vIYqFPjrqbBUh8GYk/4xYeLBZwqk6bkLGsDCjNfgXT83Vm+lTNd5SJhgsxbB
+OENd0YkgeFva67atexKItktIYRzApJyPrwTMOy49v5fnmpcEeLae1vaco20dDz7E
+lL1Y03C7nzLtjjtjVpyBMAMcl34eo3A6YnavdPpGVRrmsD61sgr4l+4oVB0B/Zig
+vejmftsX/el37vxa3TqGLYF4SSMbB0v0mn6PqvQfX0SalFCRo3WUf+YQfdYzMRAc
+/oa+USUbwOhT6PVUksbr
+=7xEo
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch
new file mode 100644
index 000000000000..283ef2d7da90
--- /dev/null
+++ b/dev-cpp/pficommon/files/pficommon-1.3.1.0-gcc-4.7.patch
@@ -0,0 +1,50 @@
+From 5669e7ea665323ee774eda9c77206102fa499453 Mon Sep 17 00:00:00 2001
+From: Hideyuki Tanaka <tanaka.hideyuki@gmail.com>
+Date: Mon, 21 May 2012 17:21:34 +0900
+Subject: [PATCH] add include <unistd.h> (for gcc-4.7.0)
+
+---
+ src/network/socket.cpp |    1 +
+ src/system/mmapper.cpp |    1 +
+ tools/genrpc/main.cpp  |    1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/network/socket.cpp b/src/network/socket.cpp
+index b5c50e4..1fba6e6 100644
+--- a/src/network/socket.cpp
++++ b/src/network/socket.cpp
+@@ -40,6 +40,7 @@
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
++#include <unistd.h>
+ 
+ #include "dns.h"
+ #include "../system/syscall.h"
+diff --git a/src/system/mmapper.cpp b/src/system/mmapper.cpp
+index 90eb7b8..e963fd8 100644
+--- a/src/system/mmapper.cpp
++++ b/src/system/mmapper.cpp
+@@ -35,6 +35,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <unistd.h>
+ 
+ #include "syscall.h"
+ 
+diff --git a/tools/genrpc/main.cpp b/tools/genrpc/main.cpp
+index 100ea4e..3e5ef16 100644
+--- a/tools/genrpc/main.cpp
++++ b/tools/genrpc/main.cpp
+@@ -4,6 +4,7 @@
+ #include <cctype>
+ #include <cstring>
+ #include <cstdio>
++#include <unistd.h>
+ using namespace std;
+ 
+ #include "../../src/lang/shared_ptr.h"
+-- 
+1.7.10
+
diff --git a/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild b/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild
index d7f74377b5db..f63e5c2d02a8 100644
--- a/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild
+++ b/dev-cpp/pficommon/pficommon-1.3.1.0.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/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild,v 1.1 2011/11/12 23:55:49 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild,v 1.2 2012/07/08 19:56:24 naota Exp $
 
 EAPI=4
 
@@ -36,7 +36,8 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libdir.patch \
 		"${FILESDIR}"/${P}-soname.patch \
-		"${FILESDIR}"/${P}-postgresql.patch
+		"${FILESDIR}"/${P}-postgresql.patch \
+		"${FILESDIR}"/${P}-gcc-4.7.patch
 }
 
 src_configure() {