diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2006-12-28 05:50:32 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2006-12-28 05:50:32 +0000 |
| commit | 6fd508cd685cd6a481477569f0a7d00acf030f8b (patch) | |
| tree | 1d7fa3ead9321c71ab457d78398918fd08039acf /net-im/kadu | |
| parent | Fixed dependencies, see bug #130573. (diff) | |
| download | gentoo-2-6fd508cd685cd6a481477569f0a7d00acf030f8b.tar.gz gentoo-2-6fd508cd685cd6a481477569f0a7d00acf030f8b.tar.bz2 gentoo-2-6fd508cd685cd6a481477569f0a7d00acf030f8b.zip | |
Fix building with GCC 4 and tcltk. Thanks to Marcin Slusarz in bug #146125.
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'net-im/kadu')
| -rw-r--r-- | net-im/kadu/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch | 14 | ||||
| -rw-r--r-- | net-im/kadu/kadu-0.4.3.ebuild | 7 |
3 files changed, 23 insertions, 4 deletions
diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog index 12423442a569..5923d5640e2c 100644 --- a/net-im/kadu/ChangeLog +++ b/net-im/kadu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/kadu # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.50 2006/11/13 15:08:04 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.51 2006/12/28 05:50:32 dirtyepic Exp $ + + 28 Dec 2006; Ryan Hill <dirtyepic@gentoo.org> + +files/kadu-0.4.3-tcltk-gcc4.patch, kadu-0.4.3.ebuild: + Fix building with GCC 4 and tcltk. Thanks to Marcin Slusarz in bug #146125. 13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> kadu-0.4.1.ebuild, kadu-0.4.1-r1.ebuild, kadu-0.4.2.ebuild, kadu-0.4.3.ebuild, diff --git a/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch b/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch new file mode 100644 index 000000000000..086fd663e0bc --- /dev/null +++ b/net-im/kadu/files/kadu-0.4.3-tcltk-gcc4.patch @@ -0,0 +1,14 @@ +diff -Naurp kadu-orig/modules/tcl_scripting/tcl_scripting.h kadu/modules/tcl_scripting/tcl_scripting.h +--- kadu-orig/modules/tcl_scripting/tcl_scripting.h 2006-12-27 23:36:24.000000000 -0600 ++++ kadu/modules/tcl_scripting/tcl_scripting.h 2006-12-27 23:37:34.000000000 -0600 +@@ -65,8 +65,8 @@ class TclSession : public QObject + bool allowErrors; + + public: +- TclSession::TclSession(bool main = FALSE); +- TclSession::~TclSession(); ++ TclSession(bool main = FALSE); ++ ~TclSession(); + void addMenu(); + void delMenu(); + void menuItemSetEnabled(int idx, bool enabled); diff --git a/net-im/kadu/kadu-0.4.3.ebuild b/net-im/kadu/kadu-0.4.3.ebuild index 2d18df642b99..0b04e931093e 100644 --- a/net-im/kadu/kadu-0.4.3.ebuild +++ b/net-im/kadu/kadu-0.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.3.ebuild,v 1.5 2006/11/13 15:08:04 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.4.3.ebuild,v 1.6 2006/12/28 05:50:32 dirtyepic Exp $ inherit flag-o-matic eutils @@ -143,9 +143,10 @@ src_unpack() { enable_module extramodules osdhints_notify # put some patches - epatch ${FILESDIR}/kadu-toolbar_toggle-gentoo.diff + epatch "${FILESDIR}"/kadu-toolbar_toggle-gentoo.diff + epatch "${FILESDIR}"/${P}-tcltk-gcc4.patch # use tcltk && epatch ${FILESDIR}/${P}-tcltk.patch - use xosd && epatch ${FILESDIR}/xosd-gentoo.patch + use xosd && epatch "${FILESDIR}"/xosd-gentoo.patch } src_compile() { |