summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-06-20 20:43:20 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-06-20 20:43:20 +0000
commit0f873041b917819b5f14cc7bbc82040e04b81f6e (patch)
treedc82fe388fda77de8cbea5a9a5f0524f46cda79a /app-text
parentFixed compilation with gcc 4.3, thanks to Peter Alfredsen (bug #227503). (diff)
downloadgentoo-2-0f873041b917819b5f14cc7bbc82040e04b81f6e.tar.gz
gentoo-2-0f873041b917819b5f14cc7bbc82040e04b81f6e.tar.bz2
gentoo-2-0f873041b917819b5f14cc7bbc82040e04b81f6e.zip
Fix gcc-4.3 compatibility. Thanks to Jeremy Olexa <darkside@gentoo.org> in bug 227325 for the patch.
(Portage version: 2.1.5.5)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/tuxcards/ChangeLog7
-rw-r--r--app-text/tuxcards/files/tuxcards-1.2-gcc43.patch10
-rw-r--r--app-text/tuxcards/tuxcards-1.2.ebuild14
3 files changed, 22 insertions, 9 deletions
diff --git a/app-text/tuxcards/ChangeLog b/app-text/tuxcards/ChangeLog
index 196a9240ee6b..4ae9d0191fae 100644
--- a/app-text/tuxcards/ChangeLog
+++ b/app-text/tuxcards/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/tuxcards
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tuxcards/ChangeLog,v 1.18 2008/05/30 06:33:02 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tuxcards/ChangeLog,v 1.19 2008/06/20 20:43:19 loki_val Exp $
+
+ 20 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+ +files/tuxcards-1.2-gcc43.patch, tuxcards-1.2.ebuild:
+ Fix gcc-4.3 compatibility. Thanks to Jeremy Olexa <darkside@gentoo.org> in
+ bug 227325 for the patch.
30 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing Andrej Kacian (Ticho) from metadata.xml (as per #59986). Assigning
diff --git a/app-text/tuxcards/files/tuxcards-1.2-gcc43.patch b/app-text/tuxcards/files/tuxcards-1.2-gcc43.patch
new file mode 100644
index 000000000000..50c3cd7872b6
--- /dev/null
+++ b/app-text/tuxcards/files/tuxcards-1.2-gcc43.patch
@@ -0,0 +1,10 @@
+--- src/commandlineoptions.cpp.orig 2008-06-17 19:54:54.000000000 -0500
++++ src/commandlineoptions.cpp 2008-06-17 19:54:33.000000000 -0500
+@@ -18,6 +18,7 @@
+ #include <qapplication.h>
+ #include "commandlineoptions.h"
+ #include <iostream>
++#include <cstdlib>
+
+ #include "CTuxCardsConfiguration.h"
+ #include "./information/xmlpersister.h"
diff --git a/app-text/tuxcards/tuxcards-1.2.ebuild b/app-text/tuxcards/tuxcards-1.2.ebuild
index 30c51ceffaf8..e7a218f684b8 100644
--- a/app-text/tuxcards/tuxcards-1.2.ebuild
+++ b/app-text/tuxcards/tuxcards-1.2.ebuild
@@ -1,8 +1,8 @@
-# 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/app-text/tuxcards/tuxcards-1.2.ebuild,v 1.16 2006/10/21 23:50:38 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tuxcards/tuxcards-1.2.ebuild,v 1.17 2008/06/20 20:43:19 loki_val Exp $
-inherit kde-functions
+inherit base
DESCRIPTION="A hierarchical text editor"
HOMEPAGE="http://www.tuxcards.de"
@@ -14,12 +14,10 @@ SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
IUSE=""
-DEPEND="${DEPEND}
- =x11-libs/qt-3*
- sys-apps/sed"
+DEPEND="=x11-libs/qt-3*
+ sys-apps/sed"
-# This implies >=qt-3, thus qt4 as well - we don't build with qt4 (bug #96201)
-#need-qt 3.1
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
src_compile() {
sed -i -e 's:/usr/local:/usr:g' \