Fix compilation with gcc-4.3, bug #211670

Package-Manager: portage-2.1.5_rc2

4 files changed, 106 insertions, 8 deletions

diff --git a/net-nntp/pan/ChangeLog b/net-nntp/pan/ChangeLog
index 7af0612ef8cb..e1b22b3e93a9 100644
--- a/net-nntp/pan/ChangeLog
+++ b/net-nntp/pan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/pan
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.56 2008/04/13 10:43:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.57 2008/04/13 10:55:27 eva Exp $
+
+  13 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/pan-0.132-gcc43-fixes.patch, pan-0.132-r2.ebuild:
+  Fix compilation with gcc-4.3, bug #211670
 
 *pan-0.132-r2 (13 Apr 2008)
 
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index eaf7c075bef3..0b1973dbe99c 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX load-pixbuf-in-1024-byte-chunks.diff 914 RMD160 fab3b1ec861d92d90f9899304229a6e741dbb5c8 SHA1 371e9376db3808a0d0b98f04699a3afe43cb9ed8 SHA256 e76d46ad9b26fd6737d760c7a2d22bf082d3b52fcde81a142abb13302371fc5a
+AUX pan-0.132-gcc43-fixes.patch 2065 RMD160 7c89f27fd7b4ff8bceed97ce953276769d910b2b SHA1 8d272ca74f6527c80f53f3ba6d73a2ea4af387ca SHA256 a09a3d7851dd22444503d9298e1403a7243560d868a8f5c38a73914f105ef449
 AUX pan-0.132-glib-compat.patch 25299 RMD160 b4244ccfe242b40bdb1e9b90584c9afb70e3fea2 SHA1 a8488a3ca10470c2bf7c394481521b05513cd50c SHA256 67a63bc9f4e945e2a123c33694a5052c47a9173e05206dfb30e7df4007b3af2e
 AUX pan-0.14.2-update-desktop-file.patch 1028 RMD160 12a05a7a1050b9d10d0ece9a117ecec930e4f6c2 SHA1 c2f41ecbccf27f440d61414b535b8112b13aff7b SHA256 ee4b8d882baf52c19ac5b2897fbaa05dfd6efd6b066fc65eea7b4d53d7d99606
 AUX pan-0.14.2.91-gcc4-2.patch 698 RMD160 cca70799a8507af85b2c60857bade4618f7fa75d SHA1 7c9014647cb44469ba343579525fed35a33763e9 SHA256 fd2ecb4b72c8046d30ef9dec43c088d5d346690c332a7b7dd9b66076b3ff7538
@@ -9,16 +10,16 @@ DIST pan-0.132.tar.bz2 1466359 RMD160 8e9bd2b2851cf1794b975ed31317e9ce837a2851 S
 DIST pan-0.14.2.91.tar.bz2 1919099 RMD160 372012f9f23ef1654125977ff4dee193021fb733 SHA1 1a321bd7425350a1991e6802b05bcea8b744f923 SHA256 1658c22fbe29ac0b88d2ae8e487247bad40618809719819297ecf0b7ae69a9ab
 DIST pan-0.14.2.tar.bz2 1834784 RMD160 0dff24b1d83b6fabfb9cc38a7dea5f9e99513009 SHA1 39c0128906d389524e24d55691e017cf509516a0 SHA256 d864907d3179cde5bdd7afa02c8a2bd00f1d23ce6053f704f64e7814c7f6aba4
 EBUILD pan-0.132-r1.ebuild 1075 RMD160 5379333fe24d16446f0e6e7a02ec10d7256c1abd SHA1 261cc02c5c072adc1a3ed013001922a32e6dcce5 SHA256 e20d6354f0193a1cd372168ab0970774668e6c34ddee1073da5a1ac6315c0da4
-EBUILD pan-0.132-r2.ebuild 1174 RMD160 5d5c3910637b2c7ffa037249a3afa8568564032b SHA1 2f8b56f6850fb6150a1061f07545df3d53531e6a SHA256 4ae0a06195afdd53a7cd5c2845d5b27ca9d9758627a7d8e06b26526c54bbf2dd
+EBUILD pan-0.132-r2.ebuild 1260 RMD160 d6abb2aa577ae7156d9b5ef55ce1bd969904bfa8 SHA1 c082f68783a48e65ec6fd29a27a4962cba5f3a7d SHA256 50408f150ce7380d7922ec0488ba34106a83fabcdb87645f0d79d146ddc62f96
 EBUILD pan-0.14.2.91-r2.ebuild 1491 RMD160 4dfe6c23fe4e3223dfe0305f0abcc1288a43a1a3 SHA1 77a8a7c0234fa8b64bdd961198ee2b497519f86f SHA256 2f3da49aab71628d1f16351c2bc20b499087ae28b43aba4a856e5495ca3cd314
 EBUILD pan-0.14.2.91-r3.ebuild 1596 RMD160 437145972c0077551de052271098dc7e98835f52 SHA1 e6ab1a778b03cb7ad91fe5c459eee2479edf32c0 SHA256 85f19b7afbe537c6f232f765fc9e40026aa998fdff9bbafb7ffe802b11bb82be
 EBUILD pan-0.14.2.ebuild 1428 RMD160 41f6e981fda0f4b5759a35965811674b6cf1b4b9 SHA1 0f8a043b484362e083666396a6f753a8ed3150ba SHA256 7372d3323f32d5668acde7e57964f355fa1bcdb2a6a9c42693531fd7d66d8a24
-MISC ChangeLog 13947 RMD160 439c0b84221c3f8dfc8c01e00186156a66ae08a9 SHA1 5727bcd8a0c6c96d46295fdc5bc0ce3a1a49cbcc SHA256 fbfb479ca7fd95f41e75593026f282a9854c23e19304de044bc057ccf580f7af
+MISC ChangeLog 14105 RMD160 ffb385943ee6a76ae3ac112228649ca77e491a0e SHA1 cc3bfe7bd398873566451d3bd34281355b58971b SHA256 b32a76181aeda346e802f3441e7ad1874f7af6687b81f000d80e69ad026c31b5
 MISC metadata.xml 180 RMD160 797b69d3fd6f36d441bda500c1310c91837720a4 SHA1 e2e177f18436d4250aadeadfd6ec27639861290e SHA256 1bb112215f4f710d26b79a43b61ec93003963663cfdec7b3b7173cfdbf85f52c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgB49wACgkQ1fmVwcYIWAaZLwCgkJL/2w+t0CSqjor7pdOGTaKu
-fD8AnAlsJaye/2v51Y9sT7p9/o4/cN8+
-=Imyo
+iEYEARECAAYFAkgB5qYACgkQ1fmVwcYIWAYf0wCgnCG3jQ+SqNxO5eCqKPWu3S6p
+UsMAoKtkogienuIHWOg8rtQNlpISxDPQ
+=8R+4
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/pan/files/pan-0.132-gcc43-fixes.patch b/net-nntp/pan/files/pan-0.132-gcc43-fixes.patch
new file mode 100644
index 000000000000..a6f366c90b23
--- /dev/null
+++ b/net-nntp/pan/files/pan-0.132-gcc43-fixes.patch
@@ -0,0 +1,90 @@
+--- pan-0.132/pan/general/file-util.cc
++++ pan-0.132/pan/general/file-util.cc
+@@ -19,6 +19,7 @@
+ 
+ #include <config.h>
+ 
++#include <algorithm>
+ #include <cassert>
+ #include <cerrno>
+ #include <cctype>
+--- pan-0.132/pan/general/line-reader.cc
++++ pan-0.132/pan/general/line-reader.cc
+@@ -1,5 +1,6 @@
+ #include <config.h>
+ #include <cstdio>
++#include <cstdlib>
+ extern "C"{ 
+   #include <glib/gi18n.h>
+ }
+--- pan-0.132/pan/general/string-view.h
++++ pan-0.132/pan/general/string-view.h
+@@ -22,6 +22,7 @@
+ 
+ #include <iosfwd>
+ #include <string>
++#include <cstring>
+ 
+ namespace pan
+ {
+--- pan-0.132/pan/gui/prefs.cc
++++ pan-0.132/pan/gui/prefs.cc
+@@ -22,6 +22,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <string>
++#include <cstdlib>
+ extern "C" {
+   #include <glib.h>
+   #include <glib/gi18n.h>
+--- pan-0.132/pan/tasks/nntp.cc
++++ pan-0.132/pan/tasks/nntp.cc
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #include <cassert>
+ #include <cstdarg>
++#include <cstdlib>
+ extern "C" {
+   #include <glib.h>
+   #include <glib/gi18n.h>
+--- pan-0.132/pan/tasks/socket-impl-scripted.cc
++++ pan-0.132/pan/tasks/socket-impl-scripted.cc
+@@ -19,6 +19,7 @@
+ 
+ #include <config.h>
+ #include <cassert>
++#include <cstdlib>
+ #include <pan/general/debug.h>
+ #include <pan/general/messages.h>
+ #include <pan/general/string-view.h>
+--- pan-0.132/pan/usenet-utils/gnksa-test.cc
++++ pan-0.132/pan/usenet-utils/gnksa-test.cc
+@@ -1,6 +1,7 @@
+ #include <config.h>
+ #include <iostream>
+ #include <string>
++#include <climits>
+ #include <pan/general/string-view.h>
+ #include <pan/general/test.h>
+ #include "gnksa.h"
+--- pan-0.132/pan/usenet-utils/numbers.cc
++++ pan-0.132/pan/usenet-utils/numbers.cc
+@@ -19,6 +19,7 @@
+ 
+ #include <config.h>
+ #include <cctype>
++#include <algorithm>
+ #include <pan/general/string-view.h>
+ #include "numbers.h"
+ 
+--- pan-0.132/pan/usenet-utils/scorefile.cc
++++ pan-0.132/pan/usenet-utils/scorefile.cc
+@@ -21,6 +21,8 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <algorithm>
++#include <cstdlib>
+ extern "C" {
+   #include <glib/gi18n.h>
+ }
diff --git a/net-nntp/pan/pan-0.132-r2.ebuild b/net-nntp/pan/pan-0.132-r2.ebuild
index d6373af3d9f5..29b8555d8de4 100644
--- a/net-nntp/pan/pan-0.132-r2.ebuild
+++ b/net-nntp/pan/pan-0.132-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.132-r2.ebuild,v 1.1 2008/04/13 10:43:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.132-r2.ebuild,v 1.2 2008/04/13 10:55:27 eva Exp $
 
 inherit eutils
 
@@ -31,7 +31,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/load-pixbuf-in-1024-byte-chunks.diff
 
 	# Fix compilation with >=glib-2.16, bug #214446
-	epatch "${FILESDIR}/pan-0.132-glib-compat.patch"
+	epatch "${FILESDIR}/${P}-glib-compat.patch"
+
+	# Fix compilation with gcc-4.3, bug #211670
+	epatch "${FILESDIR}/${P}-gcc43-fixes.patch"
 }
 
 src_compile() {