Fix for gcc-4.3, bug #228755.

(Portage version: 2.2_rc3/cvs/Linux 2.6.25.8 i686)

3 files changed, 148 insertions, 4 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index 7b6ce2f655d5..6c020816d123 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/barry
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.4 2007/12/20 17:15:20 gregkh Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.5 2008/07/27 11:36:31 loki_val Exp $
+
+  27 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/barry-0.11-gcc43.patch, barry-0.11.ebuild:
+  Fix for gcc-4.3, bug #228755.
 
 *barry-0.11 (20 Dec 2007)
 
diff --git a/app-pda/barry/barry-0.11.ebuild b/app-pda/barry/barry-0.11.ebuild
index 795183e52c95..ca9cf172be92 100644
--- a/app-pda/barry/barry-0.11.ebuild
+++ b/app-pda/barry/barry-0.11.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.11.ebuild,v 1.1 2007/12/20 17:15:20 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.11.ebuild,v 1.2 2008/07/27 11:36:31 loki_val Exp $
+
+inherit base
 
 DESCRIPTION="Barry is an Open Source Linux application that will allow
 synchronization, backup, restore, program management, and charging for BlackBerry devices"
@@ -15,6 +17,8 @@ IUSE=""
 DEPEND="dev-libs/libusb
 	dev-libs/openssl"
 
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc README NEWS
diff --git a/app-pda/barry/files/barry-0.11-gcc43.patch b/app-pda/barry/files/barry-0.11-gcc43.patch
new file mode 100644
index 000000000000..1a2a5096a540
--- /dev/null
+++ b/app-pda/barry/files/barry-0.11-gcc43.patch
@@ -0,0 +1,136 @@
+diff -ur barry-0.12.orig/examples/addcalendar.cc barry-0.12/examples/addcalendar.cc
+--- barry-0.12.orig/examples/addcalendar.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/examples/addcalendar.cc	2008-06-24 15:55:57.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <barry/barry.h>
+ #include <iostream>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace Barry;
+diff -ur barry-0.12.orig/src/controller.cc barry-0.12/src/controller.cc
+--- barry-0.12.orig/src/controller.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/controller.cc	2008-06-24 15:52:17.000000000 -0400
+@@ -29,14 +29,13 @@
+ #include "builder.h"
+ #include "endian.h"
+ #include "packet.h"
++#include <sstream>
++#include <iomanip>
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+ 
+-#include <sstream>
+-
+-#include <iomanip>
+-
+ namespace Barry {
+ 
+ //
+diff -ur barry-0.12.orig/src/data.cc barry-0.12/src/data.cc
+--- barry-0.12.orig/src/data.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/data.cc	2008-06-24 15:48:25.000000000 -0400
+@@ -25,6 +25,8 @@
+ #include <iomanip>
+ #include <string>
+ #include <stdexcept>
++#include <cstring>
++#include <cstdlib>
+ 
+ //#define __DEBUG_MODE__
+ #include "debug.h"
+Only in barry-0.12.orig/src: data.loT
+diff -ur barry-0.12.orig/src/ldif.cc barry-0.12/src/ldif.cc
+--- barry-0.12.orig/src/ldif.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/ldif.cc	2008-06-24 15:48:51.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <stdexcept>
+ #include <iostream>
+ #include <iomanip>
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+diff -ur barry-0.12.orig/src/packet.cc barry-0.12/src/packet.cc
+--- barry-0.12.orig/src/packet.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/packet.cc	2008-06-24 15:51:39.000000000 -0400
+@@ -30,6 +30,7 @@
+ #include "parser.h"
+ #include "builder.h"
+ #include "error.h"
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+diff -ur barry-0.12.orig/src/r_calendar.cc barry-0.12/src/r_calendar.cc
+--- barry-0.12.orig/src/r_calendar.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/r_calendar.cc	2008-06-24 15:50:20.000000000 -0400
+@@ -31,6 +31,7 @@
+ #include <iomanip>
+ #include <time.h>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+diff -ur barry-0.12.orig/src/r_task.cc barry-0.12/src/r_task.cc
+--- barry-0.12.orig/src/r_task.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/r_task.cc	2008-06-24 15:51:04.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include "debug.h"
+ #include <ostream>
+ #include <iomanip>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace Barry::Protocol;
+diff -ur barry-0.12.orig/src/record.cc barry-0.12/src/record.cc
+--- barry-0.12.orig/src/record.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/record.cc	2008-06-24 15:50:00.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include <iomanip>
+ #include <time.h>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #define __DEBUG_MODE__
+ #include "debug.h"
+diff -ur barry-0.12.orig/src/socket.cc barry-0.12/src/socket.cc
+--- barry-0.12.orig/src/socket.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/src/socket.cc	2008-06-24 15:49:14.000000000 -0400
+@@ -30,7 +30,7 @@
+ #include "endian.h"
+ #include <openssl/sha.h>
+ #include <sstream>
+-
++#include <cstring>
+ 
+ using namespace Usb;
+ 
+diff -ur barry-0.12.orig/tools/btool.cc barry-0.12/tools/btool.cc
+--- barry-0.12.orig/tools/btool.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/tools/btool.cc	2008-06-24 15:53:09.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <vector>
+ #include <string>
+ #include <getopt.h>
++#include <memory>
+ 
+ 
+ using namespace std;
+diff -ur barry-0.12.orig/tools/btranslate.cc barry-0.12/tools/btranslate.cc
+--- barry-0.12.orig/tools/btranslate.cc	2008-06-24 15:47:55.000000000 -0400
++++ barry-0.12/tools/btranslate.cc	2008-06-24 15:55:23.000000000 -0400
+@@ -17,6 +17,9 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <sstream>
++#include <cstdlib>
++#include <cstring>
++#include <climits>
+ 
+ using namespace std;
+