added a new patch to make compilation with gcc34 possible, merged the gcc33 patch into that one. fixes #82314

(Portage version: 2.0.51.19)

9 files changed, 97 insertions, 62 deletions

diff --git a/net-im/gabber/ChangeLog b/net-im/gabber/ChangeLog
index 7b6e72c9cbf2..bb7b2d525235 100644
--- a/net-im/gabber/ChangeLog
+++ b/net-im/gabber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gabber
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/ChangeLog,v 1.29 2004/10/08 21:29:15 humpback Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/ChangeLog,v 1.30 2005/03/30 07:23:45 luckyduck Exp $
+
+  30 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/gabber-0.8.8-gcc.patch, -files/gabber-0.8.8-gcc33.patch,
+  gabber-0.8.8.ebuild:
+  added a new patch to make compilation with gcc34 possible, merged the gcc33
+  patch into that one. fixes #82314
 
   08 Oct 2004; Gustavo Felisberto <humpback@gentoo.org>; :
   Fixing bad digest closes bug 66584 thanks to Nicolas Pouillon.
diff --git a/net-im/gabber/Manifest b/net-im/gabber/Manifest
index 3c6ee0a21cc4..03aa323c7eb6 100644
--- a/net-im/gabber/Manifest
+++ b/net-im/gabber/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6b476e552c536cff900ff20638e35ab9 ChangeLog 4317
-MD5 d1d2978c04ce02f23b59ff15222c78cd gabber-0.8.7-r3.ebuild 1492
-MD5 b43b5e1a32c27165e22c09432ba34261 gabber-0.8.7.12.ebuild 1433
-MD5 30ff0b3fbb7ca23b02edd62cd7613129 gabber-0.8.8.ebuild 1562
-MD5 bae038d85f83d6b7ac099c1d1ca84e68 gabber-1.9.3.ebuild 1232
+MD5 ef054eebda07881aaa9bb32f75d3f7cf gabber-0.8.7-r3.ebuild 1492
+MD5 7bc81e2c83ab2010abcb3c8ce046b3fe gabber-1.9.4.ebuild 1232
+MD5 d8b1889e9ea4241412a8603b80a8e0dd gabber-0.8.8.ebuild 1482
+MD5 e7b10f063890863d0865b6999171d0eb gabber-0.8.7.12.ebuild 1433
+MD5 1edddf6f06de1c3e8e7f0ec59c80e5ad gabber-1.9.3.ebuild 1232
+MD5 5eeac18aee4791b46cd9dfdff786e903 ChangeLog 4573
 MD5 e70c297e90595ae6039448e27b7cada3 metadata.xml 434
-MD5 e3cfd61d77da9b2c60a7fc5d68b35908 gabber-1.9.4.ebuild 1232
-MD5 3c26fdd6bd493036699f43145aad0613 files/TCPtransmitter.cc-gcc3-gentoo.patch 584
-MD5 13fd2ef7cc09c0d0e358f639c31f687e files/digest-gabber-0.8.7-r3 65
+MD5 385ac29899eadd0b8da4bebf2455efae files/gabber-0.8.8-gcc.patch 3732
 MD5 2305451d3c724090f81f2cf91551a581 files/digest-gabber-0.8.7.12 68
+MD5 13fd2ef7cc09c0d0e358f639c31f687e files/digest-gabber-0.8.7-r3 65
+MD5 3c26fdd6bd493036699f43145aad0613 files/TCPtransmitter.cc-gcc3-gentoo.patch 584
 MD5 0a38010d37d90d61bd8189dc33986ffa files/digest-gabber-0.8.8 65
 MD5 7b501a37a16efd3cbc0903c924105f30 files/digest-gabber-1.9.3 64
-MD5 3bd1e42ac50363c50d3184e3b8607df1 files/gabber-0.8.8-gcc33.patch 964
 MD5 b78005cf0d1a439bbe1d94ef54eb4712 files/digest-gabber-1.9.4 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBZwa4KSoOBZY9iUIRAjadAJwOadyUMu4Gyh8w8+YtjuhHZ3TSnACgi9pm
-lWDXlHqRbQRXObXzHRBRjb8=
-=aWFp
------END PGP SIGNATURE-----
diff --git a/net-im/gabber/files/gabber-0.8.8-gcc.patch b/net-im/gabber/files/gabber-0.8.8-gcc.patch
new file mode 100644
index 000000000000..c8a8acd816ef
--- /dev/null
+++ b/net-im/gabber/files/gabber-0.8.8-gcc.patch
@@ -0,0 +1,69 @@
+diff -uprN src.orig/GabberWin.cc src/GabberWin.cc
+--- src.orig/GabberWin.cc	2005-03-30 08:56:09.798050368 +0200
++++ src/GabberWin.cc	2005-03-30 09:16:24.030458984 +0200
+@@ -291,19 +291,19 @@ void GabberWin::init_menus()
+      _menuToolbar = static_cast<Gtk::Menu*>(_baseTB->get_this_widget());
+      _menuToolbar->accelerate(*_thisWindow);
+      // * MENUBAR *
+-     _mtb_Menubar = _baseTB->template getWidget<Gtk::CheckMenuItem>("Toolbar_Menubar_item");
++     _mtb_Menubar = _baseTB->getWidget<Gtk::CheckMenuItem>("Toolbar_Menubar_item");
+      _mtb_Menubar->set_active(G_App->getCfg().toolbars.menubar);
+      _mtb_Menubar->activate.connect(slot(this, &GabberWin::on_Toolbar_activate));
+      // * TOOLBAR *
+-     _mtb_Toolbar = _baseTB->template getWidget<Gtk::CheckMenuItem>("Toolbar_Toolbar_item");
++     _mtb_Toolbar = _baseTB->getWidget<Gtk::CheckMenuItem>("Toolbar_Toolbar_item");
+      _mtb_Toolbar->set_active(G_App->getCfg().toolbars.toolbar);
+      _mtb_Toolbar->activate.connect(slot(this, &GabberWin::on_Toolbar_activate));
+      // * PRESENCE BAR *
+-     _mtb_Presence = _baseTB->template getWidget<Gtk::CheckMenuItem>("Toolbar_Presence_item");
++     _mtb_Presence = _baseTB->getWidget<Gtk::CheckMenuItem>("Toolbar_Presence_item");
+      _mtb_Presence->set_active(G_App->getCfg().toolbars.presence);
+      _mtb_Presence->activate.connect(slot(this, &GabberWin::on_Toolbar_activate));
+      // * MESSAGE QUEUE *
+-     _mtb_Status = _baseTB->template getWidget<Gtk::CheckMenuItem>("Toolbar_Status_item");
++     _mtb_Status = _baseTB->getWidget<Gtk::CheckMenuItem>("Toolbar_Status_item");
+      _mtb_Status->set_active(G_App->getCfg().toolbars.status);
+      _mtb_Status->activate.connect(slot(this, &GabberWin::on_Toolbar_activate));
+ 
+diff -uprN src.orig/GladeHelper.hh src/GladeHelper.hh
+--- src.orig/GladeHelper.hh	2005-03-30 08:56:09.850042464 +0200
++++ src/GladeHelper.hh	2005-03-30 09:09:02.134637360 +0200
+@@ -25,12 +25,14 @@
+ #include <gtk/gtkobject.h>
+ #include <gtk--/base.h>
+ 
++#include <iostream>
++
+ template<class T> T* getWidgetPtr(GladeXML* g, const char* name)
+ {
+      T* result = static_cast<T*>(Gtk::wrap_auto((GtkObject*)glade_xml_get_widget(g, name)));
+      if (result == NULL)
+      {
+-	  cerr << "** ERROR **: unable to load widget: " << name << endl;
++	  std::cerr << "** ERROR **: unable to load widget: " << name << std::endl;
+ 	  g_assert(result != NULL);
+      }
+      return result;
+@@ -41,7 +43,7 @@ template<class T> T* getWidgetPtr_GTK(Gl
+      T* result = (T*)glade_xml_get_widget(g, name);
+      if (result == NULL)
+      {
+-	  cerr << "** ERROR **: unable to load widget: " << name << endl;
++	  std::cerr << "** ERROR **: unable to load widget: " << name << std::endl;
+ 	  g_assert(result != NULL);
+      }
+      return result;     
+diff -uprN src.orig/GroupsInterface.cc src/GroupsInterface.cc
+--- src.orig/GroupsInterface.cc	2005-03-30 08:56:09.792051280 +0200
++++ src/GroupsInterface.cc	2005-03-30 09:16:49.369606848 +0200
+@@ -44,8 +44,8 @@ GroupsEditor::GroupsEditor(BaseGabberWin
+ {
+       // Grab pointers
+      _entName        = _base->getEntry(string(base_string + "_NewGroup_ent").c_str());
+-     _clCurrent      = _base->template getWidget<Gtk::CList>(string(base_string + "_Current_clist").c_str());
+-     _clAvailable    = _base->template getWidget<Gtk::CList>(string(base_string + "_Available_clist").c_str());
++     _clCurrent      = _base->getWidget<Gtk::CList>(string(base_string + "_Current_clist").c_str());
++     _clAvailable    = _base->getWidget<Gtk::CList>(string(base_string + "_Available_clist").c_str());
+ 
+      // Connect buttons
+      _base->getButton(string(base_string + "_Add_btn").c_str())->clicked.connect(slot(this, &GroupsEditor::on_add_clicked));
diff --git a/net-im/gabber/files/gabber-0.8.8-gcc33.patch b/net-im/gabber/files/gabber-0.8.8-gcc33.patch
deleted file mode 100644
index c60b8080010e..000000000000
--- a/net-im/gabber/files/gabber-0.8.8-gcc33.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- gabber-0.8.8/src/GladeHelper.hh.orig	2003-06-29 13:04:51.000000000 +0200
-+++ gabber-0.8.8/src/GladeHelper.hh	2003-06-29 13:12:56.000000000 +0200
-@@ -25,12 +25,14 @@
- #include <gtk/gtkobject.h>
- #include <gtk--/base.h>
- 
-+#include <iostream>
-+
- template<class T> T* getWidgetPtr(GladeXML* g, const char* name)
- {
-      T* result = static_cast<T*>(Gtk::wrap_auto((GtkObject*)glade_xml_get_widget(g, name)));
-      if (result == NULL)
-      {
--	  cerr << "** ERROR **: unable to load widget: " << name << endl;
-+	  std::cerr << "** ERROR **: unable to load widget: " << name << std::endl;
- 	  g_assert(result != NULL);
-      }
-      return result;
-@@ -41,7 +43,7 @@
-      T* result = (T*)glade_xml_get_widget(g, name);
-      if (result == NULL)
-      {
--	  cerr << "** ERROR **: unable to load widget: " << name << endl;
-+	  std::cerr << "** ERROR **: unable to load widget: " << name << std::endl;
- 	  g_assert(result != NULL);
-      }
-      return result;     
diff --git a/net-im/gabber/gabber-0.8.7-r3.ebuild b/net-im/gabber/gabber-0.8.7-r3.ebuild
index d9b376a285f3..3ee0be48127c 100644
--- a/net-im/gabber/gabber-0.8.7-r3.ebuild
+++ b/net-im/gabber/gabber-0.8.7-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.7-r3.ebuild,v 1.14 2004/07/15 00:08:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.7-r3.ebuild,v 1.15 2005/03/30 07:23:45 luckyduck Exp $
 
 inherit eutils
 
diff --git a/net-im/gabber/gabber-0.8.7.12.ebuild b/net-im/gabber/gabber-0.8.7.12.ebuild
index 873064e5d4cf..7ac669bdd7e1 100644
--- a/net-im/gabber/gabber-0.8.7.12.ebuild
+++ b/net-im/gabber/gabber-0.8.7.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.7.12.ebuild,v 1.14 2004/07/15 00:08:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.7.12.ebuild,v 1.15 2005/03/30 07:23:45 luckyduck Exp $
 
 inherit flag-o-matic
 
diff --git a/net-im/gabber/gabber-0.8.8.ebuild b/net-im/gabber/gabber-0.8.8.ebuild
index b68f49f2b26c..6f5bd7cc0b1f 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-2004 Gentoo Foundation
+# Copyright 1999-2005 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.16 2004/06/24 22:51:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.8.ebuild,v 1.17 2005/03/30 07:23:45 luckyduck Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -32,10 +32,7 @@ src_unpack() {
 	cd ${S}/omf-install
 	sed -i -e "s/-scrollkeeper-update.*//" Makefile.in
 
-	if [ "`gcc-major-version`" -eq 3 -a "`gcc-minor-version`" -ge 3 ]
-	then
-		cd ${S}; epatch ${FILESDIR}/${P}-gcc33.patch
-	fi
+	cd ${S}; epatch ${FILESDIR}/${P}-gcc.patch
 }
 
 src_compile() {
diff --git a/net-im/gabber/gabber-1.9.3.ebuild b/net-im/gabber/gabber-1.9.3.ebuild
index 2f58fdcf021c..5f75582da6f8 100644
--- a/net-im/gabber/gabber-1.9.3.ebuild
+++ b/net-im/gabber/gabber-1.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-1.9.3.ebuild,v 1.7 2004/07/15 00:08:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-1.9.3.ebuild,v 1.8 2005/03/30 07:23:45 luckyduck Exp $
 
 inherit gnome2
 
diff --git a/net-im/gabber/gabber-1.9.4.ebuild b/net-im/gabber/gabber-1.9.4.ebuild
index 133521347704..0fdd7f0be2f2 100644
--- a/net-im/gabber/gabber-1.9.4.ebuild
+++ b/net-im/gabber/gabber-1.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-1.9.4.ebuild,v 1.4 2004/07/15 00:08:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-1.9.4.ebuild,v 1.5 2005/03/30 07:23:45 luckyduck Exp $
 
 inherit gnome2