diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-06-28 15:07:39 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-06-28 15:07:39 +0000 |
| commit | b65469a03c0aa717f2c8f493a045453e91dfa60a (patch) | |
| tree | 128f6936354359093ca7d90ac1e72aedf7277d05 /net-im/kmess | |
| parent | old (diff) | |
| download | gentoo-2-b65469a03c0aa717f2c8f493a045453e91dfa60a.tar.gz gentoo-2-b65469a03c0aa717f2c8f493a045453e91dfa60a.tar.bz2 gentoo-2-b65469a03c0aa717f2c8f493a045453e91dfa60a.zip | |
Fix for gcc43, bug #229787
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'net-im/kmess')
| -rw-r--r-- | net-im/kmess/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/kmess/files/kmess-1.5.1-gcc43.patch | 32 | ||||
| -rw-r--r-- | net-im/kmess/kmess-1.5.1.ebuild | 4 |
3 files changed, 40 insertions, 2 deletions
diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog index 2686fd221811..09222963f7b6 100644 --- a/net-im/kmess/ChangeLog +++ b/net-im/kmess/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/kmess # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.38 2008/05/12 16:36:50 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.39 2008/06/28 15:07:39 loki_val Exp $ + + 28 Jun 2008; Peter Alfredsen <loki_val@gentoo.org> + +files/kmess-1.5.1-gcc43.patch, kmess-1.5.1.ebuild: + Fix for gcc43, bug #229787 12 May 2008; Markus Meier <maekke@gentoo.org> kmess-1.5.ebuild: amd64 stable, bug #219619 diff --git a/net-im/kmess/files/kmess-1.5.1-gcc43.patch b/net-im/kmess/files/kmess-1.5.1-gcc43.patch new file mode 100644 index 000000000000..d0a841fcfdf1 --- /dev/null +++ b/net-im/kmess/files/kmess-1.5.1-gcc43.patch @@ -0,0 +1,32 @@ +diff -NrU5 kmess-1.5.1.orig/kmess/crypt/sha1.cpp kmess-1.5.1/kmess/crypt/sha1.cpp +--- kmess-1.5.1.orig/kmess/crypt/sha1.cpp 2008-06-28 17:01:11.000000000 +0200 ++++ kmess-1.5.1/kmess/crypt/sha1.cpp 2008-06-28 16:44:42.000000000 +0200 +@@ -36,10 +36,12 @@ + #include "bithelp.h" + + #include <stdio.h> + #include <sys/stat.h> + ++#include <cstring> ++ + Sha1::Sha1() + { + context = new SHA1_CONTEXT; + } + +diff -NrU5 kmess-1.5.1.orig/kmess/notification/passivepopupview.h kmess-1.5.1/kmess/notification/passivepopupview.h +--- kmess-1.5.1.orig/kmess/notification/passivepopupview.h 2008-06-28 17:02:28.000000000 +0200 ++++ kmess-1.5.1/kmess/notification/passivepopupview.h 2008-06-28 16:44:43.000000000 +0200 +@@ -41,11 +41,11 @@ + { + Q_OBJECT + + public: // Public methods + // Class constructor +- PassivePopupView( QWidget *parent, QString icon, QString message, QString icon = QString::null ); ++ PassivePopupView( QWidget *parent, QString icon, QString message, QString status = QString::null ); + // Changes the popup icon + void changeIcon( QString icon ); + // Changes the popup status icon + void changeStatusIcon( QString status ); + // Changes the popup message diff --git a/net-im/kmess/kmess-1.5.1.ebuild b/net-im/kmess/kmess-1.5.1.ebuild index 7324b701d9ec..a32654fa8327 100644 --- a/net-im/kmess/kmess-1.5.1.ebuild +++ b/net-im/kmess/kmess-1.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-1.5.1.ebuild,v 1.1 2008/05/04 19:21:31 deathwing00 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-1.5.1.ebuild,v 1.2 2008/06/28 15:07:39 loki_val Exp $ inherit kde eutils @@ -16,6 +16,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="" +PATCHES=( "${FILESDIR}/${P}-gcc43.patch" ) + LANGS="de" for X in ${LANGS} ; do |