summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-09 16:40:09 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-09 16:40:09 +0000
commitfd96acfe7c71b96f1d726b1146047c60dd750316 (patch)
treee67b895641231529c4cf19338373b2611e2e8fca /sci-electronics
parentMasking media-libs/libmovtar for QA removal. (diff)
downloadhistorical-fd96acfe7c71b96f1d726b1146047c60dd750316.tar.gz
historical-fd96acfe7c71b96f1d726b1146047c60dd750316.tar.bz2
historical-fd96acfe7c71b96f1d726b1146047c60dd750316.zip
Fix building with GLIBC 2.10+ wrt #277796.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/klogic/ChangeLog8
-rw-r--r--sci-electronics/klogic/Manifest5
-rw-r--r--sci-electronics/klogic/files/klogic-1.63-glibc-2.10.patch39
-rw-r--r--sci-electronics/klogic/klogic-1.63.ebuild6
4 files changed, 52 insertions, 6 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/Manifest b/sci-electronics/klogic/Manifest
index 2c19295f2cda..b8626b58162f 100644
--- a/sci-electronics/klogic/Manifest
+++ b/sci-electronics/klogic/Manifest
@@ -1,6 +1,7 @@
+AUX klogic-1.63-glibc-2.10.patch 1374 RMD160 e7495b8417fb75d1b125e323ce87581d9fe91d1f SHA1 45cceab704457a56872e944d60fa26a7166f0915 SHA256 44abd3c54136947a9e3b2673c7df5c234ec6bb2791ac812ced80f62aaff22cd5
DIST klogic-1.61.tar.gz 1182514 RMD160 e4b08f951b7fa7bedbb0fc04270e99c92c31b066 SHA1 8920cb9c7dd06f4fbfbbcdba233c70de10bdd27b SHA256 afdcf1a0c693c9c957bc7a22fc8a7799f1e43023a67f9a2449ff21e732f4b2a7
DIST klogic-1.63.tar.gz 1270084 RMD160 153bf7868d68d5caa9601ca1f99990d9f5ecf289 SHA1 24eedc860fc74bdb74d86fb6d0abef804ca8053c SHA256 cb68cb0d0e5b551bdcf1afd73dd5f1869ad9d7b6cf079b4af47232184fd096d5
EBUILD klogic-1.61.ebuild 498 RMD160 fd1eda8cb37fd3265055d2cd4722005b52aa6715 SHA1 b6cf77122d4279671988a33e949e780777dd0f3b SHA256 66731f6f13e9d37e97ee2288cf55d676d73adad9dc4565ae4f10361b2a49d054
-EBUILD klogic-1.63.ebuild 495 RMD160 288151d6af198fdc0ae9c3416511b77334aa448d SHA1 6293cc017868309e51b83bda32a6818be4089a20 SHA256 991ae14073e89bbe05531e65889c7993ce4627ee8b7ba3ac14690a4b93e7ef77
-MISC ChangeLog 2446 RMD160 4fbba6d6286bd392ec92ebb45bc70719cf1465a8 SHA1 13e44e4ff625aa6515f00b1a6515db4615c41a59 SHA256 09921676f5c361093bb8fad2ecfca0f61d13801769d7c48ba3b223fa4263dba9
+EBUILD klogic-1.63.ebuild 548 RMD160 d0bf53bbd36ad5fbd215e6f0c0c4289634f3daf4 SHA1 c717121c5330d3b3d0f709eefbe26a0b86329a2b SHA256 e91e48929b1c1c3d9ab5a5760eb463228f965c06e0f8f57800664fd2d2427ff4
+MISC ChangeLog 2609 RMD160 d7345136d33aa5cfa42a822fab34d42be9072799 SHA1 c25cd9340822a5b6b9e2c95b2dfc015b037c3e3d SHA256 de40e9c6f5ed1e61770bb26ffe8eb3ed7634bc6b5cbdef17e8f385a2b9a5bc1e
MISC metadata.xml 521 RMD160 5565d5cfadb3bd09c1fdff4b839bb1af54e48523 SHA1 67fc760df32d9779b5c36daef86aa8325e999ab1 SHA256 c84c2eb0c05d9f5ea8772f8693fb9d442e304ac944085ca383f83fb3e3b6a40a
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" )