Fix building with GCC 4.4 and GLIBC 2.10+ wrt #277175.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 69 insertions, 5 deletions

diff --git a/sys-process/incron/ChangeLog b/sys-process/incron/ChangeLog
index 0ff758e7579f..e804ac855a64 100644
--- a/sys-process/incron/ChangeLog
+++ b/sys-process/incron/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/incron
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/ChangeLog,v 1.6 2009/07/26 20:10:29 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/ChangeLog,v 1.7 2009/07/30 11:40:58 ssuominen Exp $
+
+  30 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> incron-0.5.8.ebuild,
+  +files/incron-0.5.8-gcc44.patch:
+  Fix building with GCC 4.4 and GLIBC 2.10+ wrt #277175.
 
   26 Jul 2009; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd> tag
diff --git a/sys-process/incron/Manifest b/sys-process/incron/Manifest
index 30edaf44bed1..85f165d3f7a5 100644
--- a/sys-process/incron/Manifest
+++ b/sys-process/incron/Manifest
@@ -1,9 +1,10 @@
 AUX incron-0.5.7-gcc43.patch 836 RMD160 848409c26d0e2548ddd5d9a3d05037ff2676cbc4 SHA1 0efd2cc0d00bb304e2bd885496257fe87c572d46 SHA256 dcaa0cbbff465fa0d571614216523c12dedd8e13baf518a7657b4ff20c073523
 AUX incron-0.5.7-gentoo.patch 6076 RMD160 644e25e864f8a8b92b18f70b616b2579686708d8 SHA1 5c7b90c238fbf1136c5958a51202c07131983a73 SHA256 ccabc447f49e9a69ae8594e716a222e1298273239d9eadf3aa82598f35cfc69c
+AUX incron-0.5.8-gcc44.patch 1614 RMD160 30ec2a6161a3a317d2c359d6ac1dda7bbf143b82 SHA1 9dc6c9c25ae0234d9f77782b96554bcd532cbf3b SHA256 77842f88bba283e773446b08696ebf65800df775686fd9feab8629ac7b4ac8ee
 AUX incron-0.5.8-gentoo.patch 4100 RMD160 aba846fa138db6539881b80f84f6c32c04949ebc SHA1 c6bf094091d9ed355dc3641bfdfe3d1f0e298b32 SHA256 eda824666d7b25a96799daf1d8d9cfff02602fc722f92ce741db9b924bebe508
 DIST incron-0.5.7.tar.gz 177659 RMD160 b82d91f3e7bd75ac91aa3e07284df281e0695e3f SHA1 63d32a5d82b733c435fd3616bba7ff4c7029e3f1 SHA256 68c724a2d56b9341b0433e00be767676f61cb3b2eb68a51351238e117385ecd6
 DIST incron-0.5.8.tar.gz 172865 RMD160 f73b209be7eb638b20c5db76e1aed716d7244bf0 SHA1 b31e39326052534c87d2d703edfb84d4e284cf59 SHA256 761df34cba81ca8d26bdac4fce197829da053c9c30784b8285cce2aaf77c25bf
 EBUILD incron-0.5.7.ebuild 873 RMD160 669fee6f941a2290d9c477f44336715a087d1206 SHA1 be961a594c8853553b8d46dadf845b3f12dfb8e1 SHA256 f91a35f3e0842a15ec94bb7793fb0f3d02a43ef253082ff663340b4b8fa68e43
-EBUILD incron-0.5.8.ebuild 821 RMD160 7f59c8e37be27e191b6e92b0e8e1a93decb31c50 SHA1 969eeaad577d9dc7225bc3117c3e1b27a0552a57 SHA256 cf02c075525bf726eb09a5d3a0d61d5ed31966d4507dd3942934bf00d8e7fd41
-MISC ChangeLog 968 RMD160 23c0c09c7cfff445ab7e308df11d2c2352106de3 SHA1 50443a7e55faabd94c80ed3719d868b7cb841019 SHA256 4d1296f6bbf07e265a4d94eb9256e144c05f098407abcc3ecd70bd19d14cfe13
+EBUILD incron-0.5.8.ebuild 859 RMD160 3508c7f68e49c9c79e4d7861139453d369ae4bf0 SHA1 2c17d3d86315d028f2e2a77c147656a8f5979192 SHA256 0684b30d6f0d5516014da1e39119aaad95fc32012e90b012564d51074b101241
+MISC ChangeLog 1138 RMD160 05ee9453bbbeecb446e38593f32120064fe950fd SHA1 54800e71493a596f43bf98fb670dba9c1ae59769 SHA256 4e8e350fbd041d0de7905b810e3e0ed2a0716c279a6ded6c665e54c83f0ad8d2
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
diff --git a/sys-process/incron/files/incron-0.5.8-gcc44.patch b/sys-process/incron/files/incron-0.5.8-gcc44.patch
new file mode 100644
index 000000000000..b46b54d391e4
--- /dev/null
+++ b/sys-process/incron/files/incron-0.5.8-gcc44.patch
@@ -0,0 +1,58 @@
+diff -ur incron-0.5.8.orig/appargs.cpp incron-0.5.8/appargs.cpp
+--- incron-0.5.8.orig/appargs.cpp	2008-12-29 18:31:09.000000000 +0200
++++ incron-0.5.8/appargs.cpp	2009-07-30 14:40:39.000000000 +0300
+@@ -19,6 +19,7 @@
+  * 
+  */
+ 
++#include <stdio.h>
+ 
+ #include <cstring>
+ 
+diff -ur incron-0.5.8.orig/icd-main.cpp incron-0.5.8/icd-main.cpp
+--- incron-0.5.8.orig/icd-main.cpp	2008-12-29 18:31:09.000000000 +0200
++++ incron-0.5.8/icd-main.cpp	2009-07-30 14:38:36.000000000 +0300
+@@ -13,6 +13,7 @@
+  *  
+  */
+ 
++#include <stdio.h>
+ #include <map>
+ #include <signal.h>
+ #include <wait.h>
+diff -ur incron-0.5.8.orig/incroncfg.cpp incron-0.5.8/incroncfg.cpp
+--- incron-0.5.8.orig/incroncfg.cpp	2008-12-29 18:31:09.000000000 +0200
++++ incron-0.5.8/incroncfg.cpp	2009-07-30 14:41:31.000000000 +0300
+@@ -181,7 +181,7 @@
+ 
+ bool IncronCfg::IsComment(const char* s)
+ {
+-  char* sx = strchr(s, '#');
++  const char* sx = strchr(s, '#');
+   if (sx == NULL)
+     return false;
+     
+diff -ur incron-0.5.8.orig/inotify-cxx.cpp incron-0.5.8/inotify-cxx.cpp
+--- incron-0.5.8.orig/inotify-cxx.cpp	2008-12-29 18:31:09.000000000 +0200
++++ incron-0.5.8/inotify-cxx.cpp	2009-07-30 14:39:06.000000000 +0300
+@@ -19,7 +19,7 @@
+  * 
+  */
+  
+-
++#include <stdio.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+diff -ur incron-0.5.8.orig/usertable.cpp incron-0.5.8/usertable.cpp
+--- incron-0.5.8.orig/usertable.cpp	2008-12-29 18:31:09.000000000 +0200
++++ incron-0.5.8/usertable.cpp	2009-07-30 14:38:50.000000000 +0300
+@@ -16,7 +16,7 @@
+  * 
+  */
+ 
+-
++#include <stdio.h>
+ #include <pwd.h>
+ #include <syslog.h>
+ #include <errno.h>
diff --git a/sys-process/incron/incron-0.5.8.ebuild b/sys-process/incron/incron-0.5.8.ebuild
index 31ed53b0b653..28efbf927963 100644
--- a/sys-process/incron/incron-0.5.8.ebuild
+++ b/sys-process/incron/incron-0.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/incron-0.5.8.ebuild,v 1.1 2009/03/24 09:10:08 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/incron-0.5.8.ebuild,v 1.2 2009/07/30 11:40:58 ssuominen Exp $
 
 EAPI="2"
 
@@ -22,7 +22,8 @@ CONFIG_CHECK="INOTIFY"
 ERROR_INOTIFY="Recompile your kernel with inotify support - CONFIG_INOTIFY"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_compile() {