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
commitce52a6844d434fc458330a0ebb017da56347145f (patch)
tree5d63f4ab84f4c14176923e9157bfdf7cf32beba6 /app-text
parentFixed compilation with gcc 4.3, thanks to Peter Alfredsen (bug #227503). (diff)
downloadhistorical-ce52a6844d434fc458330a0ebb017da56347145f.tar.gz
historical-ce52a6844d434fc458330a0ebb017da56347145f.tar.bz2
historical-ce52a6844d434fc458330a0ebb017da56347145f.zip
Fix gcc-4.3 compatibility. Thanks to Jeremy Olexa <darkside@gentoo.org> in bug 227325 for the patch.
Package-Manager: portage-2.1.5.5
Diffstat (limited to 'app-text')
-rw-r--r--app-text/tuxcards/ChangeLog7
-rw-r--r--app-text/tuxcards/Manifest15
-rw-r--r--app-text/tuxcards/files/tuxcards-1.2-gcc43.patch10
-rw-r--r--app-text/tuxcards/tuxcards-1.2.ebuild14
4 files changed, 25 insertions, 21 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/Manifest b/app-text/tuxcards/Manifest
index 819698ed86e0..c47d6b6bd422 100644
--- a/app-text/tuxcards/Manifest
+++ b/app-text/tuxcards/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tuxcards-1.2-gcc43.patch 338 RMD160 18080d43ff76d83b5ed2cd8006015a498f7557a5 SHA1 31b090bde65994c7d03f1c739cbed69b53ad8b1f SHA256 e52b49fb68c0659e3658bb52ef0810da463dc21587bdaaeb8ab0c8cf853ec886
DIST tuxcards-1.2.tar.gz 203129 RMD160 91badd8f14808c89d76f002adbb55bdb9eefa5e0 SHA1 aa2ec47bd094eee884631af3d8608a7610ae54a0 SHA256 0ec17333370a5ca2e2d798f29fbe9b5127cf4956ec8ac091c14cd2b974c21aee
-EBUILD tuxcards-1.2.ebuild 1287 RMD160 2a7992e81c7c36b73c714ee672c2032f8145900c SHA1 ce80509c0be9bcbcae97eae445568478276da61d SHA256 1280c554845721bd320d8fcf5332bf98a85f57c600f1a4817ce38e3f631ecfff
-MISC ChangeLog 2667 RMD160 f2fc7df896524dc04456fde7942c2cc14e615893 SHA1 7297813da2127a7b1f88059305c21a5fc0a57d01 SHA256 9bfd169a6ba51a29346f90ffabc1ad805ae2dcb784b8fe660f4ca58febb21f80
+EBUILD tuxcards-1.2.ebuild 1219 RMD160 7e691dd6a042d21c89f9686bde91360b94c69e43 SHA1 21b3bce0ff2b4c9647e74ef15ecb66fedb070842 SHA256 98d492596d70a453ffcb49ac296d64f8b79c28f0bd576e5eb247914b5528442b
+MISC ChangeLog 2884 RMD160 573e4b81c55ca2ca9765d3b612e4d88018a0249b SHA1 8fe97f2c28958fa4018f6574d24e4fd1bfb74ca9 SHA256 1709dc3f0611a0a7edec087833c141fd5d11ec9a4bc3abb105d1bae06a44138c
MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg/n6MACgkQyuNVb5qfaOZS3wCdFOLbLENyaX3hFAj0BRY/jtIb
-4bsAoLI+RhbBUQPqYFVa28PwIaBsJWnx
-=sOCU
------END PGP SIGNATURE-----
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' \