Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Justin Lecher" <jlec@g.o>
Subject: proj/sci:master commit in: sci-chemistry/mgltools-qslimlib/files/, sci-chemistry/mgltools-qslimlib/
Date: Fri, 8 Jun 2012 12:51:46 +0000 (UTC)
commit:     c37784200792e83b4ff898eb8972fe5d60fc9d35
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  5 06:44:42 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 08:43:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c3778420

sci-chemistry/mgltools-qslimlib: Fix for gcc-4.7

(Portage version: 2.2.0_alpha109/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/mgltools-qslimlib/ChangeLog          |    4 ++
 .../mgltools-qslimlib/files/1.5.4-gcc4.7.patch     |   30 ++++++++++++++++++++
 .../mgltools-qslimlib-1.5.6_rc2.ebuild             |    4 ++-
 3 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/mgltools-qslimlib/ChangeLog b/sci-chemistry/mgltools-qslimlib/ChangeLog
index 6e6a045..76cb23c 100644
--- a/sci-chemistry/mgltools-qslimlib/ChangeLog
+++ b/sci-chemistry/mgltools-qslimlib/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jun 2012; Justin Lecher <jlec@g.o> +files/1.5.4-gcc4.7.patch,
+  mgltools-qslimlib-1.5.6_rc2.ebuild:
+  Fix for gcc-4.7
+
   27 Apr 2012; Justin Lecher <jlec@g.o>
   mgltools-qslimlib-1.5.4-r1.ebuild, mgltools-qslimlib-1.5.6_rc2.ebuild:
   Add 2.7-pypy-* to RESTRICT_PYTHON_ABIS

diff --git a/sci-chemistry/mgltools-qslimlib/files/1.5.4-gcc4.7.patch b/sci-chemistry/mgltools-qslimlib/files/1.5.4-gcc4.7.patch
new file mode 100644
index 0000000..5e94b74
--- /dev/null
+++ b/sci-chemistry/mgltools-qslimlib/files/1.5.4-gcc4.7.patch
@@ -0,0 +1,30 @@
+ src/mixkit/MxDynBlock.h |    2 +-
+ src/mixkit/MxStack.h    |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/mixkit/MxDynBlock.h b/src/mixkit/MxDynBlock.h
+index 51cc89b..4e313d2 100644
+--- a/src/mixkit/MxDynBlock.h
++++ b/src/mixkit/MxDynBlock.h
+@@ -41,7 +41,7 @@ public:
+ 
+     T& add()
+     {
+-	if( length()==total_space() )  resize(total_space() * 2);
++	if( length()==total_space() )  this->resize(total_space() * 2);
+ 	fill++;
+ 	return last();
+     }
+diff --git a/src/mixkit/MxStack.h b/src/mixkit/MxStack.h
+index 9ed9a05..1275ddd 100644
+--- a/src/mixkit/MxStack.h
++++ b/src/mixkit/MxStack.h
+@@ -33,7 +33,7 @@ public:
+ 
+     T& pop() { return this->drop(); }
+ 
+-    void push(const T& val) { add(val); }
++    void push(const T& val) { this->add(val); }
+     //
+     // NOTE: In this code, it is *crucial* that we do the add() and
+     //       assignment in separate steps.  The obvious alternative

diff --git a/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6_rc2.ebuild b/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6_rc2.ebuild
index 37ecc7e..c454708 100644
--- a/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6_rc2.ebuild
+++ b/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6_rc2.ebuild
@@ -45,6 +45,8 @@ src_prepare() {
 		-e 's:^.*LICENSE:#&1:g' \
 		-i "${S}"/MANIFEST.in || die
 
-	epatch "${FILESDIR}"/1.5.4-gcc4.3.patch
+	epatch \
+		"${FILESDIR}"/1.5.4-gcc4.3.patch \
+		"${FILESDIR}"/1.5.4-gcc4.7.patch
 	distutils_src_prepare
 }


Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in x11-libs/qt-core: ChangeLog qt-core-4.8.1-r2.ebuild
Next by thread:
proj/sci:master commit in: sys-devel/gdebugger/
Previous by date:
proj/sci:master commit in: licenses/
Next by date:
proj/sci:master commit in: sci-biology/cluster/


Updated Jun 24, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.