summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2008-04-21 17:44:10 +0000
committerWulf Krueger <philantrop@gentoo.org>2008-04-21 17:44:10 +0000
commit2a515e41c134dbe37919f9559f74fab861cc1f8f (patch)
tree15b7435e73de1366afa8b9e39a88675421958833 /kde-misc
parentMarked ~hppa too. (diff)
downloadhistorical-2a515e41c134dbe37919f9559f74fab861cc1f8f.tar.gz
historical-2a515e41c134dbe37919f9559f74fab861cc1f8f.tar.bz2
historical-2a515e41c134dbe37919f9559f74fab861cc1f8f.zip
Added a patch for gcc 4.3 compatibility as kindly provided by Peter Alfredsen on bug 218690.
Package-Manager: portage-2.1.5_rc4
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kaptain/ChangeLog9
-rw-r--r--kde-misc/kaptain/Manifest5
-rw-r--r--kde-misc/kaptain/files/kaptain-0.72-gcc43.patch19
-rw-r--r--kde-misc/kaptain/kaptain-0.72.ebuild11
4 files changed, 36 insertions, 8 deletions
diff --git a/kde-misc/kaptain/ChangeLog b/kde-misc/kaptain/ChangeLog
index d59a1714cad9..92c0d979c6a4 100644
--- a/kde-misc/kaptain/ChangeLog
+++ b/kde-misc/kaptain/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-misc/kaptain
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/ChangeLog,v 1.10 2006/10/22 01:38:20 tcort Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/ChangeLog,v 1.11 2008/04/21 17:44:09 philantrop Exp $
+
+ 21 Apr 2008; Wulf C. Krueger <philantrop@gentoo.org>
+ +files/kaptain-0.72-gcc43.patch, kaptain-0.72.ebuild:
+ Added a patch for gcc 4.3 compatibility as kindly provided by Peter
+ Alfredsen on bug 218690.
22 Oct 2006; Thomas Cort <tcort@gentoo.org> kaptain-0.72.ebuild:
Added ~amd64 keyword wrt Bug #147089.
diff --git a/kde-misc/kaptain/Manifest b/kde-misc/kaptain/Manifest
index a6becb1ff79d..c3ea65d61758 100644
--- a/kde-misc/kaptain/Manifest
+++ b/kde-misc/kaptain/Manifest
@@ -1,5 +1,6 @@
+AUX kaptain-0.72-gcc43.patch 467 RMD160 715c159b8d44f8bbbd526eebf4edcfb4bc1c378d SHA1 fcca38afb64d5c42b93471855b809d83b5bb61ce SHA256 df2c84c7022ee4719a63ae95548743a17447bdac3175d2dcddbd594a660669b9
AUX kaptain-0.72-ggc4.patch 252 RMD160 0966e265a54e65c184ca97940e64ab86882c2aee SHA1 543d5ac00b839b5356882282e38111094458b6be SHA256 630fb17503aef9644c32041abfd67bc8124d5e0d9e5ea0a92532447cd1b84c46
DIST kaptain-0.72.tar.gz 1057252 RMD160 71e8711834df8f53929c11626617db17c58bd80e SHA1 12de8b21b58d7ef197bfd39576bff9d66e2b8b45 SHA256 d086592c6cb081e7681c19ab557569d66c0d1f1fda702a15b54fb308d6a37120
-EBUILD kaptain-0.72.ebuild 663 RMD160 1e049bc959a86e18bed59e49d1344dc401c0d1a7 SHA1 d8bd352cd012dca8a54375e09598b753bd83e527 SHA256 dcf3c4ac659f4023d2c92d6c2e69d046183e8839f77371a6222ddbd9ea7df978
-MISC ChangeLog 1377 RMD160 9d08115dba9f8dd6fac3da778f6e8167da7c9ceb SHA1 789e8730b084069c024532a28c0045f1a88b75b8 SHA256 1169cb5acd3c9cba7c4a77ea8b21f13f7562c9fadf3a6071773b5ef1d57a9ba2
+EBUILD kaptain-0.72.ebuild 765 RMD160 9f51231842706ab5b4e3b3659544e2f878be7ca9 SHA1 24fd5bf233a07fdbfc31c2ad524dc166682f5a36 SHA256 b03c5cc9191bcf6ee695f3b3e1a2b515b976f31eb3708bb15ccfbd2c426f6c89
+MISC ChangeLog 1591 RMD160 1030a499ac52161fe795c5c6949a599eb55bff3c SHA1 8fd3a7fd2cb456cf9725a528705981e3eaf3ed01 SHA256 4f6ae91a69451c522c3930f91fa063f9c171733413f71582425029ebf57cfc9c
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/kaptain/files/kaptain-0.72-gcc43.patch b/kde-misc/kaptain/files/kaptain-0.72-gcc43.patch
new file mode 100644
index 000000000000..dff520c6eff8
--- /dev/null
+++ b/kde-misc/kaptain/files/kaptain-0.72-gcc43.patch
@@ -0,0 +1,19 @@
+--- kaptain-0.72.orig/kaptain/communication.cpp
++++ kaptain-0.72/kaptain/communication.cpp
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
+--- kaptain-0.72.orig/kaptain/kaptain.h
++++ kaptain-0.72/kaptain/kaptain.h
+@@ -8,7 +8,7 @@
+ #include <qlineedit.h>
+ #include <qtabwidget.h>
+ #include <qlayout.h>
+-#include <qlist.h>
++#include <qptrlist.h>
+ #include <qcombobox.h>
+ #include <qlistbox.h>
+ #include <qpushbutton.h>
+
diff --git a/kde-misc/kaptain/kaptain-0.72.ebuild b/kde-misc/kaptain/kaptain-0.72.ebuild
index 257a9fd8d196..e25bda37d380 100644
--- a/kde-misc/kaptain/kaptain-0.72.ebuild
+++ b/kde-misc/kaptain/kaptain-0.72.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/kaptain-0.72.ebuild,v 1.5 2006/10/22 01:38:20 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/kaptain-0.72.ebuild,v 1.6 2008/04/21 17:44:09 philantrop Exp $
inherit kde-functions eutils
@@ -20,9 +20,12 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-ggc4.patch
+
+ # Fixes bug 218690.
+ epatch "${FILESDIR}"/${P}-gcc43.patch
}
src_install() {
- make DESTDIR=${D} install || die
- dodoc AUTHORS ChangeLog README TODO
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog README TODO || die "installing docs failed."
}