Closes bug #135360

(Portage version: 2.1.1_pre2-r6)

4 files changed, 92 insertions, 3 deletions

diff --git a/net-im/gabber/ChangeLog b/net-im/gabber/ChangeLog
index bc199edf2a4e..cb8056d4e4ac 100644
--- a/net-im/gabber/ChangeLog
+++ b/net-im/gabber/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gabber
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/ChangeLog,v 1.34 2005/09/16 00:20:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/ChangeLog,v 1.35 2006/07/13 00:25:19 pvdabeel Exp $
+
+  13 Jul 2005; Pieter Van den Abeele <pvdabeel@gentoo.org> gabber-0.8.8.ebuild:
+  gcc-4.1 patch - closes bug #135360
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gabber-0.8.8.ebuild:
   Mark 0.8.8 stable on alpha
diff --git a/net-im/gabber/files/digest-gabber-0.8.8 b/net-im/gabber/files/digest-gabber-0.8.8
index 46f8f300e198..e9d7fc4c1fe1 100644
--- a/net-im/gabber/files/digest-gabber-0.8.8
+++ b/net-im/gabber/files/digest-gabber-0.8.8
@@ -1 +1,3 @@
 MD5 e0748960c47982c1d6d17525c42efe41 gabber-0.8.8.tar.gz 2206079
+RMD160 ccd1f4ebe774eeca531791c4ab786f5f147d91ac gabber-0.8.8.tar.gz 2206079
+SHA256 0f5c8f8a411a15794e441a4eaa7a7a65adada8bb813e2fe1a06246f1a1418f35 gabber-0.8.8.tar.gz 2206079
diff --git a/net-im/gabber/files/gcc-4.1.patch b/net-im/gabber/files/gcc-4.1.patch
new file mode 100644
index 000000000000..9193ab2fa21a
--- /dev/null
+++ b/net-im/gabber/files/gcc-4.1.patch
@@ -0,0 +1,83 @@
+diff -urN gabber-0.8.8.orig/jabberoo/include/jabberoo.hh gabber-0.8.8/jabberoo/include/jabberoo.hh
+--- gabber-0.8.8.orig/jabberoo/include/jabberoo.hh	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/jabberoo/include/jabberoo.hh	2006-06-03 09:27:43.000000000 +0200
+@@ -357,7 +357,7 @@
+ 		* be generated and sent.
+ 		* @return The delivered message event which should be sent.
+ 		*/
+-	       Message Message::delivered() const;
++	       Message delivered() const;
+ 
+ 	       /**
+ 		* Create a message event stating that this Message has been displayed.
+@@ -365,7 +365,7 @@
+ 		* be generated and sent.
+ 		* @return The displayed message event which should be sent.
+ 		*/	       
+-	       Message Message::displayed() const;
++	       Message displayed() const;
+ 
+ 	       /**
+ 		* Create a message event stating that this Message is being replied to.
+@@ -373,7 +373,7 @@
+ 		* be generated and sent.
+ 		* @return The composing message event which should be sent.
+ 		*/
+-	       Message Message::composing() const;
++	       Message composing() const;
+ 
+ 	       // Static class methods
+ 	       /**
+diff -urN gabber-0.8.8.orig/jabberoo/libjudo/src/judo.hpp gabber-0.8.8/jabberoo/libjudo/src/judo.hpp
+--- gabber-0.8.8.orig/jabberoo/libjudo/src/judo.hpp	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/jabberoo/libjudo/src/judo.hpp	2006-06-03 09:27:16.000000000 +0200
+@@ -317,7 +317,7 @@
+ 	   Delete the child Node designated by the supplied iterator.
+ 	   @param it Iterator pointing to the child Node 
+ 	*/
+-	void Element::erase(Element::iterator it)
++	void erase(Element::iterator it)
+ 	    { delete *it; _children.erase(it); }
+ 
+ 	Element* findElement(const std::string& name);
+diff -urN gabber-0.8.8.orig/src/AutoAway.hh gabber-0.8.8/src/AutoAway.hh
+--- gabber-0.8.8.orig/src/AutoAway.hh	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/src/AutoAway.hh	2006-06-03 09:29:39.000000000 +0200
+@@ -44,7 +44,7 @@
+      void on_session_disconnected();
+      void on_session_last(string &idletime);
+      gint auto_away_timer();
+-     void AutoAway::update_statusbar_aatime_msg(unsigned long idle_time);
++     void update_statusbar_aatime_msg(unsigned long idle_time);
+ 
+      void set_away(jabberoo::Presence::Show show);
+      void set_back();
+diff -urN gabber-0.8.8.orig/src/GabberApp.hh gabber-0.8.8/src/GabberApp.hh
+--- gabber-0.8.8.orig/src/GabberApp.hh	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/src/GabberApp.hh	2006-06-03 09:28:47.000000000 +0200
+@@ -87,7 +87,7 @@
+      void on_session_roster(const judo::Element& t);
+      void on_session_disconnected();
+      void on_session_version(string& name, string& version, string& os);
+-     void GabberApp::on_session_time(string& UTF8Time, string& UTF8TimeZone);
++     void on_session_time(string& UTF8Time, string& UTF8TimeZone);
+      void on_session_presence(const jabberoo::Presence& p, jabberoo::Presence::Type prev);
+      void on_session_my_presence(const jabberoo::Presence& p);
+ 
+diff -urN gabber-0.8.8.orig/src/GabberUtility.hh gabber-0.8.8/src/GabberUtility.hh
+--- gabber-0.8.8.orig/src/GabberUtility.hh	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/src/GabberUtility.hh	2006-06-03 09:29:17.000000000 +0200
+@@ -118,10 +118,10 @@
+      : public SigC::Object
+ {
+ public:
+-     FileSel::FileSel(const string& filename, const string& title, const string& log);
++     FileSel(const string& filename, const string& title, const string& log);
+ protected:
+-     void FileSel::on_ok_clicked();
+-     void FileSel::on_cancel_clicked();
++     void on_ok_clicked();
++     void on_cancel_clicked();
+ private:
+      const string& _log;
+      Gtk::FileSelection* _fileSel;
diff --git a/net-im/gabber/gabber-0.8.8.ebuild b/net-im/gabber/gabber-0.8.8.ebuild
index 0680ff7b5faf..15f40cff81e1 100644
--- a/net-im/gabber/gabber-0.8.8.ebuild
+++ b/net-im/gabber/gabber-0.8.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.8.ebuild,v 1.21 2005/09/16 00:20:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.8.ebuild,v 1.22 2006/07/13 00:25:19 pvdabeel Exp $
 
 inherit flag-o-matic eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	sed -i -e "s/-scrollkeeper-update.*//" Makefile.in
 
 	cd ${S}; epatch ${FILESDIR}/${P}-gcc.patch
+	epatch ${FILESDIR}/gcc-4.1.patch
 }
 
 src_compile() {