diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 16:40:09 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 16:40:09 +0000 |
| commit | cdd47b0c67969734f2550ccbca3749192f7e3229 (patch) | |
| tree | f16bd2567c8d4ea8d95003647acec5af854bc8e1 /sci-electronics | |
| parent | alpha/arm/ia64/s390/sh/sparc stable wrt #278978 (diff) | |
| download | gentoo-2-cdd47b0c67969734f2550ccbca3749192f7e3229.tar.gz gentoo-2-cdd47b0c67969734f2550ccbca3749192f7e3229.tar.bz2 gentoo-2-cdd47b0c67969734f2550ccbca3749192f7e3229.zip | |
Fix building with GLIBC 2.10+ wrt #277796.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/klogic/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-electronics/klogic/files/klogic-1.63-glibc-2.10.patch | 39 | ||||
| -rw-r--r-- | sci-electronics/klogic/klogic-1.63.ebuild | 6 |
3 files changed, 49 insertions, 4 deletions
diff --git a/sci-electronics/klogic/ChangeLog b/sci-electronics/klogic/ChangeLog index 9607c8d45354..c0b792ea42d3 100644 --- a/sci-electronics/klogic/ChangeLog +++ b/sci-electronics/klogic/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-electronics/klogic -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klogic/ChangeLog,v 1.12 2007/07/18 01:53:55 cryos Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klogic/ChangeLog,v 1.13 2009/08/09 16:40:09 ssuominen Exp $ + + 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> klogic-1.63.ebuild, + +files/klogic-1.63-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #277796. 18 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org> -klogic-1.62.ebuild, klogic-1.63.ebuild: diff --git a/sci-electronics/klogic/files/klogic-1.63-glibc-2.10.patch b/sci-electronics/klogic/files/klogic-1.63-glibc-2.10.patch new file mode 100644 index 000000000000..48d2ebff42b2 --- /dev/null +++ b/sci-electronics/klogic/files/klogic-1.63-glibc-2.10.patch @@ -0,0 +1,39 @@ +diff -ur klogic-1.63.orig/klogic/dlgEqu.cpp klogic-1.63/klogic/dlgEqu.cpp +--- klogic-1.63.orig/klogic/dlgEqu.cpp 2003-12-26 15:26:54.000000000 +0200 ++++ klogic-1.63/klogic/dlgEqu.cpp 2009-08-09 19:40:41.000000000 +0300 +@@ -404,11 +404,11 @@ + } + + // remove pre- and suffixes from the output name +- search = strstr(buf, TYPE_INTERN); ++ search = const_cast<char*> (strstr(buf, TYPE_INTERN)); + if (!search) { +- search = strstr(buf, TYPE_FINAL); ++ search = const_cast<char*> (strstr(buf, TYPE_FINAL)); + if (!search) { +- search = strstr(buf, " = "); ++ search = const_cast<char*> (strstr(buf, " = ")); + } + } + if (!search) { +diff -ur klogic-1.63.orig/klogic/symbolicCalc.cpp klogic-1.63/klogic/symbolicCalc.cpp +--- klogic-1.63.orig/klogic/symbolicCalc.cpp 2004-06-21 10:39:12.000000000 +0300 ++++ klogic-1.63/klogic/symbolicCalc.cpp 2009-08-09 19:30:43.000000000 +0300 +@@ -346,7 +346,7 @@ + // assumes that there are no parenthesis errors! + int SymbolicCalc::needsParenthesis(const char * eq, char op) + { +- char *par = strchr(eq, '('); ++ char *par = const_cast<char*> (strchr(eq, '(')); + if (!par) { + switch (op) { + case Operator::NOT: +@@ -369,7 +369,7 @@ + break; + } + } +- char * deq = strrchr(eq, ')'); ++ char * deq = const_cast<char*> (strrchr(eq, ')')); + if (!deq) fatal("fatal parenthesis error in class SymbolicCalc!\n"); + *par = 0; + switch (op) { diff --git a/sci-electronics/klogic/klogic-1.63.ebuild b/sci-electronics/klogic/klogic-1.63.ebuild index 4b751d767493..6825c3ff89e5 100644 --- a/sci-electronics/klogic/klogic-1.63.ebuild +++ b/sci-electronics/klogic/klogic-1.63.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klogic/klogic-1.63.ebuild,v 1.3 2007/07/18 01:53:55 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klogic/klogic-1.63.ebuild,v 1.4 2009/08/09 16:40:09 ssuominen Exp $ inherit kde @@ -12,3 +12,5 @@ SRC_URI="http://www.a-rostin.de/klogic/Version/${P}.tar.gz" LICENSE="GPL-2" need-kde 3 + +PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" ) |