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 | f75a9cd3d50aeaeadc2e5071c749c9f1c8bb9eb7 (patch) | |
tree | 89a85c6029836e61a34ec08804500c587909ee66 /net-im/kmess | |
parent | old (diff) | |
download | historical-f75a9cd3d50aeaeadc2e5071c749c9f1c8bb9eb7.tar.gz historical-f75a9cd3d50aeaeadc2e5071c749c9f1c8bb9eb7.tar.bz2 historical-f75a9cd3d50aeaeadc2e5071c749c9f1c8bb9eb7.zip |
Fix for gcc43, bug #229787
Package-Manager: portage-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/Manifest | 15 | ||||
-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 |
4 files changed, 43 insertions, 14 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/Manifest b/net-im/kmess/Manifest index 07058cf38fb4..d8006377ceb1 100644 --- a/net-im/kmess/Manifest +++ b/net-im/kmess/Manifest @@ -1,8 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX kmess-1.3-compilation-fix.patch 1673 RMD160 edb583da3515550d04883f9844578d2a9ba80d95 SHA1 8260397ef04ed12dd9e448d1bf1f1bf6d29c4422 SHA256 658517f44139aed20743505dd830e09a3c6b26a38123840baa5476ba96f8cfbf AUX kmess-1.4.2-balloonbase.patch 830 RMD160 c1348bc98ec5aee4846738652c044d2a0d4df4dc SHA1 4a6b508d47d5ebbc5207f3e23eee64caba4d6fc6 SHA256 2bd1bd5a0d09981c11b93f187676c6f170cd6b4dedf360445a810b0f82c65765 +AUX kmess-1.5.1-gcc43.patch 1187 RMD160 42753c754c218cbbab8e3b1b39ecb101a1097f3c SHA1 68bb4d047947341c194c7557fb0b2d895ad1ecf5 SHA256 f17166e66de71292059be23c80bbbed38cdf4456c8d2aacdc7747e0b0314ee45 DIST kmess-1.3.tar.gz 1597249 RMD160 3a8db4b7e37f43525bf38c28f9fbb3999347b0f0 SHA1 69614d354280d7a86121c0d93f85ce3890330a5e SHA256 e794aa73d65b33cab032784a20e50b0ca9cfbc09209f5494bdddb064284cd30b DIST kmess-1.4.1.tar.gz 2286544 RMD160 836d8e26f0f9a5a9e6661048f628c49eccd46931 SHA1 9e021789998c210c194c7a06c059a24ca636e790 SHA256 34e0a826409322a2c0b586b609dbe77e32a6b8ca3d2f13f452903a39be680454 DIST kmess-1.4.2.tar.gz 2336147 RMD160 e19bd29fb29e18bdf28d45a7028f2233628b6aad SHA1 d07f17352f8704cd345a38216f32c15cdf3e5309 SHA256 864dae86f5fc4a2d40698b382b4f6642c5d0e3d111a3c4732374dc7226f942d6 @@ -13,14 +11,7 @@ EBUILD kmess-1.3.ebuild 586 RMD160 cac0ce7ec5a0ec3581ca005c48b92926b9e789f0 SHA1 EBUILD kmess-1.4.1.ebuild 438 RMD160 4b68977ddfc96630ba053e940f43e3d7b31322de SHA1 513abe97e61535799ab2bc4e84a7b1c4b8da3a5f SHA256 8d41f06d0dad5dbf51fe06346dedaf3a77b083eeb88943ed81a38d444171da4a EBUILD kmess-1.4.2.ebuild 492 RMD160 5e759884338d4129ba228f8594ee700b175884aa SHA1 7950f2cca4904e722b1c50ec4041af19936816e2 SHA256 9448968006754bb7cde8222e0f8a86208570e392988169a936e15f5f5c051a33 EBUILD kmess-1.4.3.ebuild 439 RMD160 21b138320b87543a288b52e12eb55a16f46db9fe SHA1 7261d9ad3c0b8a656db4d780bc4c6b57c2ac0548 SHA256 3dc46b63412b6c3e65ef47e2241719050ee882e9ff72509c9f6cae6859cf9e9a -EBUILD kmess-1.5.1.ebuild 911 RMD160 62a0e0598003da3b3bc7cfbceee1fa39d201f27b SHA1 b55005a67bc8efc6bb329a0cc30ac680aa09620f SHA256 a7f649468f3d58fccebe77254b246060469308a151e5eaaa42c70719bd08ec5d +EBUILD kmess-1.5.1.ebuild 952 RMD160 097799734059d99a0c0ae831eddf6ac029146edd SHA1 795099f9f99d27a6b31bfc7876e1f64faa814bd8 SHA256 6bee9b2b2155a0dc2827b73e26c5d05bbd2fb4a439c3b93ffa86b531dbd2571a EBUILD kmess-1.5.ebuild 901 RMD160 0dcfc418a1f830b6039d5e75d76e6905fdc664e3 SHA1 682256cdd3252f4c51a167b5906d21ea9d33e94d SHA256 c95d4d69a8bd4a80d20bd855c145dd16b4cb6a068d19f9805b9fb964a1385721 -MISC ChangeLog 5841 RMD160 b6f52608c480891d672aebd6e71202313d672f51 SHA1 510792f2f429b7160765074dc4ca6bead964d064 SHA256 175281606dbbf4f6200c8b10df0fbe6d1789e24eabc2a516c7d005efd5196e05 +MISC ChangeLog 5980 RMD160 8fc4d308843950444a12e9fb4a9dcc4e7315ef87 SHA1 6cf66f2bddb9c2e2327a73177830a67a5d427472 SHA256 fad38b3281ed54c716a6cf997c09262bfbd9655188158ef4cc07d22a74e9377a MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkgoclIACgkQkKaRLQcq0GKJLwCdG9hFwAbI1NijmTXuEY6tHQ7L -SEAAn2p488xXoNKiWSpJ0uTPs5z7e4IU -=SvEB ------END PGP SIGNATURE----- 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 |