summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2006-04-04 23:42:10 +0000
committerCarsten Lohrke <carlo@gentoo.org>2006-04-04 23:42:10 +0000
commitbf41dac6f01a50594fc076056fb85398cacca50c (patch)
tree1b5e5f95288de519f5261333ab5b917c8ddb03bd /dev-util
parentRevision bump for 0.86.2 to disable setuptools (install with setuptools prese... (diff)
downloadgentoo-2-bf41dac6f01a50594fc076056fb85398cacca50c.tar.gz
gentoo-2-bf41dac6f01a50594fc076056fb85398cacca50c.tar.bz2
gentoo-2-bf41dac6f01a50594fc076056fb85398cacca50c.zip
gcc 4.1 fix, thanks to Matteo Azzali, bug #126526.
(Portage version: 2.0.54)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/lincvs/ChangeLog6
-rw-r--r--dev-util/lincvs/files/lincvs-1.4.4-gcc-4.1.diff11
-rw-r--r--dev-util/lincvs/lincvs-1.4.4.ebuild10
3 files changed, 24 insertions, 3 deletions
diff --git a/dev-util/lincvs/ChangeLog b/dev-util/lincvs/ChangeLog
index 1a52949da675..b6c6b8bafcd0 100644
--- a/dev-util/lincvs/ChangeLog
+++ b/dev-util/lincvs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/lincvs
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/ChangeLog,v 1.48 2006/02/06 04:14:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/ChangeLog,v 1.49 2006/04/04 23:42:10 carlo Exp $
+
+ 04 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+ +files/lincvs-1.4.4-gcc-4.1.diff, lincvs-1.4.4.ebuild:
+ gcc 4.1 fix, thanks to Matteo Azzali, bug #126526.
06 Feb 2006; Aron Griffis <agriffis@gentoo.org> lincvs-1.4.4.ebuild:
Mark 1.4.4 stable on alpha
diff --git a/dev-util/lincvs/files/lincvs-1.4.4-gcc-4.1.diff b/dev-util/lincvs/files/lincvs-1.4.4-gcc-4.1.diff
new file mode 100644
index 000000000000..0fb5c7349901
--- /dev/null
+++ b/dev-util/lincvs/files/lincvs-1.4.4-gcc-4.1.diff
@@ -0,0 +1,11 @@
+--- src/PixmapTimer.h.orig 2006-03-17 14:47:15.000000000 +0100
++++ src/PixmapTimer.h 2006-03-17 14:49:28.000000000 +0100
+@@ -84,7 +84,7 @@
+
+ public:
+ CPixmapTimer(QObject * parent = 0, const char * name = 0);
+- CPixmapTimer::~CPixmapTimer();
++ ~CPixmapTimer();
+
+ signals:
+ void signalTimeout(const QPixmap &);
diff --git a/dev-util/lincvs/lincvs-1.4.4.ebuild b/dev-util/lincvs/lincvs-1.4.4.ebuild
index 687d26331650..552108a899a8 100644
--- a/dev-util/lincvs/lincvs-1.4.4.ebuild
+++ b/dev-util/lincvs/lincvs-1.4.4.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-1.4.4.ebuild,v 1.3 2006/02/06 04:14:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-1.4.4.ebuild,v 1.4 2006/04/04 23:42:10 carlo Exp $
-inherit kde-functions
+inherit kde-functions eutils
MY_P="${P/_/-}-0-generic-src"
S="${WORKDIR}/${P/_/-}"
@@ -21,6 +21,12 @@ RDEPEND="${DEPEND}
dev-util/cvs"
need-qt 3
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/lincvs-1.4.4-gcc-4.1.diff
+}
+
src_compile() {
${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o Makefile lincvs.pro
sed -i -e "s/^\tstrip/#\tstrip/" \