diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-06-29 11:39:38 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-06-29 11:39:38 +0000 |
commit | 0be7aba4356d92df1baff206a38e91727843efc9 (patch) | |
tree | c69165f8dab483ba8368705bc3dcb3ffecb13cd2 /net-im | |
parent | fix tabs (diff) | |
download | historical-0be7aba4356d92df1baff206a38e91727843efc9.tar.gz historical-0be7aba4356d92df1baff206a38e91727843efc9.tar.bz2 historical-0be7aba4356d92df1baff206a38e91727843efc9.zip |
Compile fixes for gcc-3.3
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/gabber/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/gabber/Manifest | 5 | ||||
-rw-r--r-- | net-im/gabber/files/gabber-0.8.8-gcc33.patch | 27 | ||||
-rw-r--r-- | net-im/gabber/gabber-0.8.8.ebuild | 14 |
4 files changed, 45 insertions, 7 deletions
diff --git a/net-im/gabber/ChangeLog b/net-im/gabber/ChangeLog index da4c5883c0c4..261d8493dc0d 100644 --- a/net-im/gabber/ChangeLog +++ b/net-im/gabber/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/gabber # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/ChangeLog,v 1.16 2003/06/21 00:07:00 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/ChangeLog,v 1.17 2003/06/29 11:36:53 azarah Exp $ + + 29 Jun 2003; Martin Schlemmer <azarah@gentoo.org> gabber-0.8.8.ebuild, + files/gabber-0.8.8-gcc33.patch: + Compile fixes for gcc-3.3. 21 Jun 2003; Alastair Tse <liquidx@gentoo.org> gabber-0.8.7-r3.ebuild, gabber-0.8.7.12.ebuild, gabber-0.8.8.ebuild: diff --git a/net-im/gabber/Manifest b/net-im/gabber/Manifest index 49f41bcec1d7..73b729fc2b44 100644 --- a/net-im/gabber/Manifest +++ b/net-im/gabber/Manifest @@ -1,8 +1,9 @@ -MD5 79a96b0cd52c075994499e9bf93eae7a ChangeLog 2717 -MD5 9c0df619456d31c0346f813db860ae00 gabber-0.8.8.ebuild 1386 +MD5 db0d723bac64e20ce449970910d22aaa ChangeLog 2853 MD5 49a2328b7cf61839fe0b0e70c22080a2 gabber-0.8.7-r3.ebuild 1517 MD5 671c1e31f463d06a708dcb86c376dbba gabber-0.8.7.12.ebuild 1453 +MD5 3a6c6667c875068d4e9b8fe42375af43 gabber-0.8.8.ebuild 1519 MD5 3c26fdd6bd493036699f43145aad0613 files/TCPtransmitter.cc-gcc3-gentoo.patch 584 MD5 2305451d3c724090f81f2cf91551a581 files/digest-gabber-0.8.7.12 68 MD5 13fd2ef7cc09c0d0e358f639c31f687e files/digest-gabber-0.8.7-r3 65 MD5 0a38010d37d90d61bd8189dc33986ffa files/digest-gabber-0.8.8 65 +MD5 3bd1e42ac50363c50d3184e3b8607df1 files/gabber-0.8.8-gcc33.patch 964 diff --git a/net-im/gabber/files/gabber-0.8.8-gcc33.patch b/net-im/gabber/files/gabber-0.8.8-gcc33.patch new file mode 100644 index 000000000000..c60b8080010e --- /dev/null +++ b/net-im/gabber/files/gabber-0.8.8-gcc33.patch @@ -0,0 +1,27 @@ +--- 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.8.ebuild b/net-im/gabber/gabber-0.8.8.ebuild index b248493fca95..9b6eccb3f42b 100644 --- a/net-im/gabber/gabber-0.8.8.ebuild +++ b/net-im/gabber/gabber-0.8.8.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # 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.4 2003/06/21 00:07:00 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.8.ebuild,v 1.5 2003/06/29 11:36:53 azarah Exp $ -inherit flag-o-matic +inherit flag-o-matic gcc -S=${WORKDIR}/${P} +S="${WORKDIR}/${P}" DESCRIPTION="The GNOME Jabber Client" SRC_URI="mirror://sourceforge/gabber/${P}.tar.gz" HOMEPAGE="http://gabber.sourceforge.net" @@ -29,8 +29,14 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} + 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 } src_compile() { @@ -38,7 +44,7 @@ src_compile() { CFLAGS="${CFLAGS} -I/usr/include" - local myconf + local myconf= use ssl \ && myconf="${myconf} --with-ssl-dir=/usr" \ |